nico/nix-files
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tmux + catppuccin mostly

Browse Source
This commit is contained in:
nico
2025-12-19 15:22:07 +01:00
parent 93d98e3001
commit 05429407db
19 changed files with 962 additions and 768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

212
flake.lock generated
View File

@@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1763165251, "lastModified": 1764289441,
"narHash": "sha256-HqprJ5e5+tLVbk3EuWnyiBkVfKTA149eHh+u2VzUrY0=", "narHash": "sha256-ak+lgFiYE5PHByN1/BRkO5JP498hno6Ix24C1Qf/vec=",
"owner": "Aylur", "owner": "Aylur",
"repo": "ags", "repo": "ags",
"rev": "0cbca42b11d23aad8c0689fc7385e517bde94c61", "rev": "e169694390548dfd38ff40f1ef2163d6c3ffe3ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -27,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762012522, "lastModified": 1764173295,
"narHash": "sha256-ncEN4OVFM5M9VFc4oR3gOI5K8r99GcYxtU+Cf4Z8pbs=", "narHash": "sha256-Jh4VtPcK2Ov+RTcV9FtyQRsxiJmXFQGfqX6jjM7/mgc=",
"owner": "aylur", "owner": "aylur",
"repo": "astal", "repo": "astal",
"rev": "671d4229c798834190a50fb8b8d8addd19b529e9", "rev": "7d1fac8a4b2a14954843a978d2ddde86168c75ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -40,13 +40,31 @@
"type": "github" "type": "github"
} }
}, },
"catppuccin": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1765990358,
"narHash": "sha256-l8x0gU8mnYaGMl+gWrsSHKBJlZWD8KXJfHTkRlFiPI0=",
"owner": "catppuccin",
"repo": "nix",
"rev": "de1b60ca45a578f59f7d84c8d338b346017b2161",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "nix",
"type": "github"
}
},
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1762538466, "lastModified": 1765145449,
"narHash": "sha256-8zrIPl6J+wLm9MH5ksHcW7BUHo7jSNOu0/hA0ohOOaM=", "narHash": "sha256-aBVHGWWRzSpfL++LubA0CwOOQ64WNLegrYHwsVuVN7A=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "0cea393fffb39575c46b7a0318386467272182fe", "rev": "69f538cdce5955fcd47abfed4395dc6d5194c1c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -73,11 +91,11 @@
}, },
"flake-compat_2": { "flake-compat_2": {
"locked": { "locked": {
"lastModified": 1761588595, "lastModified": 1765121682,
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -114,11 +132,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1763416652, "lastModified": 1765980955,
"narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", "narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", "rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -135,11 +153,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762964643, "lastModified": 1765682243,
"narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "827f2a23373a774a8805f84ca5344654c31f354b", "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -163,13 +181,31 @@
"type": "github" "type": "github"
} }
}, },
"ndg": {
"inputs": {
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1765720983,
"narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=",
"owner": "feel-co",
"repo": "ndg",
"rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936",
"type": "github"
},
"original": {
"owner": "feel-co",
"repo": "ndg",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1761907660, "lastModified": 1763966396,
"narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -181,11 +217,27 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1763421233, "lastModified": 1763966396,
"narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5ae3b07d8d6527c42f17c876e404993199144b6a",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1765779637,
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -195,29 +247,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": {
"locked": {
"lastModified": 1761880412,
"narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1762977756, "lastModified": 1764242076,
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -229,24 +265,56 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 315532800, "lastModified": 1764081664,
"narHash": "sha256-5CwQ80ucRHiqVbMEEbTFnjz70/axSJ0aliyzSaFSkmY=", "narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=",
"rev": "f6b44b2401525650256b977063dbcf830f762369", "owner": "nixos",
"repo": "nixpkgs",
"rev": "dc205f7b4fdb04c8b7877b43edb7b73be7730081",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1765472234,
"narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1765772535,
"narHash": "sha256-I715zWsdVZ+CipmLtoCAeNG0etQywiWRE5PaWntnaYk=",
"rev": "09b8fda8959d761445f12b55f380d90375a1d6bb",
"type": "tarball", "type": "tarball",
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre891648.f6b44b240152/nixexprs.tar.xz" "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre911985.09b8fda8959d/nixexprs.tar.xz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
} }
}, },
"nixpkgs_6": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1762977756, "lastModified": 1765472234,
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -261,15 +329,16 @@
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"mnw": "mnw", "mnw": "mnw",
"nixpkgs": "nixpkgs_3", "ndg": "ndg",
"nixpkgs": "nixpkgs_5",
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1762622004, "lastModified": 1765894398,
"narHash": "sha256-NpzzgaoMK8aRHnndHWbYNKLcZN0r1y6icCoJvGoBsoE=", "narHash": "sha256-vZmKngMAaZ38mUjWeXavagrCE5f4h4s9yIShf2q75I4=",
"owner": "notashelf", "owner": "notashelf",
"repo": "nvf", "repo": "nvf",
"rev": "09470524a214ed26633ddc2b6ec0c9bf31a8b909", "rev": "cd81bbb904571b538397d72a29e4c84b98480ee1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -281,8 +350,9 @@
"root": { "root": {
"inputs": { "inputs": {
"ags": "ags", "ags": "ags",
"catppuccin": "catppuccin",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"nvf": "nvf", "nvf": "nvf",
"spicetify-nix": "spicetify-nix", "spicetify-nix": "spicetify-nix",
"zed": "zed", "zed": "zed",
@@ -297,11 +367,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762915112, "lastModified": 1765465581,
"narHash": "sha256-d9j1g8nKmYDHy+/bIOPQTh9IwjRliqaTM0QLHMV92Ic=", "narHash": "sha256-fCXT0aZXmTalM3NPCTedVs9xb0egBG5BOZkcrYo5PGE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "aa1e85921cfa04de7b6914982a94621fbec5cc02", "rev": "99cc5667eece98bb35dcf35f7e511031a8b7a125",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -312,15 +382,15 @@
}, },
"spicetify-nix": { "spicetify-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_6",
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1763267524, "lastModified": 1765687197,
"narHash": "sha256-CywB4iCpGr4CYZAD+WboFwBQ7Wnc7LdfSemFWuH/1Ro=", "narHash": "sha256-5aJgT+lEC7ypuAGE3DQLj3LzYDQ+kRG6MnkVr3ZF9RU=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "cf33e39bd1a21993a28ffee8be433e212ecf346a", "rev": "fa6a5dde9d95bf7b8f075ff5aceeb1d97fa9043a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -363,15 +433,15 @@
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_7",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1763568568, "lastModified": 1765998037,
"narHash": "sha256-PP4h13/BhOnqagvJUtILvnGIylQFm9EmIKeW6vzpWhY=", "narHash": "sha256-nTqanCMNTE+SRYW1IHY/7BoGUEQbqmNN+zWCk6ANkR0=",
"owner": "zed-industries", "owner": "zed-industries",
"repo": "zed", "repo": "zed",
"rev": "f05eef58c46be2d6617847494b444ac442780367", "rev": "fa529b2ad272881aa45c66242ad02934cb22d624",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -383,14 +453,14 @@
"zen-browser": { "zen-browser": {
"inputs": { "inputs": {
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1763521945, "lastModified": 1765946036,
"narHash": "sha256-Zcrafbe4niRJMbzaVOwg7+iedJhwBFttre2DpyCC6qA=", "narHash": "sha256-R/qaIkzqm00qBMr8onM6ZZFX49lvsQLZ79adVubqjts=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "24d7381b9231c23daceec5d372cc28e877f7785d", "rev": "7db019a64483743a8d92319baafbbe71b687d0a1",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View File

@@ -19,9 +19,10 @@
zed.url = "github:zed-industries/zed"; zed.url = "github:zed-industries/zed";
catppuccin.url = "github:catppuccin/nix";
}; };
outputs = { self, nixpkgs, nvf, zen-browser, spicetify-nix, zed, ... }@inputs: outputs = { self, nixpkgs, nvf, zen-browser, spicetify-nix, zed, catppuccin, ... }@inputs:
let system = "x86_64-linux"; in let system = "x86_64-linux"; in
{ {
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
@@ -34,6 +35,7 @@
# inputs.zen-browser.packages."${system}".default # inputs.zen-browser.packages."${system}".default
# nvf.homeManagerModules.default # nvf.homeManagerModules.default
# inputs.zed.packages."${system}".default # inputs.zed.packages."${system}".default
catppuccin.nixosModules.catppuccin
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
]; ];
}; };

9
home-nico.nix
View File

@@ -8,6 +8,7 @@
./packages ./packages
inputs.spicetify-nix.homeManagerModules.default inputs.spicetify-nix.homeManagerModules.default
inputs.zen-browser.homeModules.default inputs.zen-browser.homeModules.default
inputs.catppuccin.homeModules.catppuccin
]; ];
nixpkgs = { nixpkgs = {
@@ -23,7 +24,11 @@
programs.zen-browser.enable = true; programs.zen-browser.enable = true;
catppuccin = {
enable = true;
accent = "mauve";
flavor = "mocha";
};
home.pointerCursor = home.pointerCursor =
let let
@@ -57,7 +62,7 @@
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
in in
{ {
enable = true; enable = false;
theme = spicePkgs.themes.catppuccin; theme = spicePkgs.themes.catppuccin;
colorScheme = "mocha"; colorScheme = "mocha";

2
packages/default.nix
View File

@@ -16,7 +16,7 @@
./niri ./niri
./hyprland ./hyprland
./zed-editor ./zed-editor
# ./tmux ./tmux
# ./vscode # ./vscode
]; ];
} }

2
packages/niri/config.kdl
View File

@@ -277,7 +277,7 @@ environment {
// Additionally, clients will be informed that they are tiled, removing some client-side rounded corners. // Additionally, clients will be informed that they are tiled, removing some client-side rounded corners.
// This option will also fix border/focus ring drawing behind some semitransparent windows. // This option will also fix border/focus ring drawing behind some semitransparent windows.
// After enabling or disabling this, you need to restart the apps for this to take effect. // After enabling or disabling this, you need to restart the apps for this to take effect.
// prefer-no-csd prefer-no-csd
// You can change the path where screenshots are saved. // You can change the path where screenshots are saved.
// A ~ at the front will be expanded to the home directory. // A ~ at the front will be expanded to the home directory.

6
packages/nvim/default.nix
View File

@@ -17,7 +17,7 @@ programs.neovim = {
enable = true; enable = true;
vimAlias = true; vimAlias = true;
}; };
catppuccin.nvim.enable = false;
programs.neovim.plugins = [ programs.neovim.plugins = [
pkgs.vimPlugins.lazy-nvim pkgs.vimPlugins.lazy-nvim
@@ -59,6 +59,10 @@ programs.neovim.plugins = [
".config/nvim/lua/plugins/conform.lua".source = ./lua/plugins/conform.lua; ".config/nvim/lua/plugins/conform.lua".source = ./lua/plugins/conform.lua;
".config/nvim/lua/plugins/nvim-tree.lua".source = ./lua/plugins/nvim-tree.lua; ".config/nvim/lua/plugins/nvim-tree.lua".source = ./lua/plugins/nvim-tree.lua;
".config/nvim/lua/plugins/notify.lua".source = ./lua/plugins/notify.lua; ".config/nvim/lua/plugins/notify.lua".source = ./lua/plugins/notify.lua;
# ".config/nvim/lua/plugins/rest.lua".source = ./lua/plugins/rest.lua;
".config/nvim/lua/plugins/neominimap.lua".source = ./lua/plugins/neominimap.lua;
".config/nvim/lua/plugins/vim-tmux-navigator.lua".source = ./lua/plugins/vim-tmux-navigator.lua;
# ".config/nvim/lua/plugins/workspaces.lua".source = ./lua/plugins/workspaces.lua;
# ".config/nvim/lua/plugins/go.lua".source = ./lua/plugins/go.lua; # ".config/nvim/lua/plugins/go.lua".source = ./lua/plugins/go.lua;
# ".config/nvim/lua/plugins/typst.lua".source = ./lua/plugins/typst.lua; # ".config/nvim/lua/plugins/typst.lua".source = ./lua/plugins/typst.lua;

19
packages/nvim/init.lua
View File

@@ -46,8 +46,8 @@ end, { noremap = true, silent = true })
-- Lazy -- Lazy
require("config.lazy") require("config.lazy")
require("catppuccin").setup({}) -- require("catppuccin").setup({})
vim.cmd.colorscheme("catppuccin") -- vim.cmd.colorscheme("catppuccin")
-- css colors -- css colors
vim.opt.termguicolors = true vim.opt.termguicolors = true
@@ -57,7 +57,6 @@ require("nvim-highlight-colors").setup({})
require("lualine").setup() require("lualine").setup()
require("dapui").setup() require("dapui").setup()
require("ibl").setup() require("ibl").setup()
require("telescope").load_extension("flutter")
require("toggleterm").setup({}) require("toggleterm").setup({})
require("mini.animate").setup() require("mini.animate").setup()
require('nvim-autopairs').enable() require('nvim-autopairs').enable()
@@ -110,17 +109,17 @@ dap.configurations.cpp = dap.configurations.gdb
dap.configurations.rust = dap.configurations.gdb dap.configurations.rust = dap.configurations.gdb
-------------------------------------------- --------------------------------------------
local builtin = require("telescope.builtin") -- local builtin = require("telescope.builtin")
local conform = require("conform") local conform = require("conform")
-- Love binds -- Love binds
vim.keymap.set("n", "<leader>lr", ":LoveRun<CR>", { desc = "Love run" }) vim.keymap.set("n", "<leader>lr", ":LoveRun<CR>", { desc = "Love run" })
-- Telescope binds -- Telescope binds
vim.keymap.set("n", "<leader>ff", builtin.find_files, { desc = "Telescope find files" }) -- vim.keymap.set("n", "<leader>ff", builtin.find_files, { desc = "Telescope find files" })
vim.keymap.set("n", "<leader>fg", builtin.live_grep, { desc = "Telescope live grep" }) -- vim.keymap.set("n", "<leader>fg", builtin.live_grep, { desc = "Telescope live grep" })
vim.keymap.set("n", "<leader>fb", ":Telescope file_browser<CR>", { desc = "Telescope file_browser" }) -- vim.keymap.set("n", "<leader>fb", ":Telescope file_browser<CR>", { desc = "Telescope file_browser" })
vim.keymap.set("n", "<leader>fh", builtin.help_tags, { desc = "Telescope help tags" }) -- vim.keymap.set("n", "<leader>fh", builtin.help_tags, { desc = "Telescope help tags" })
vim.keymap.set("n", "<leader>fl", ": Telescope flutter commands<CR>", { desc = "Open Telescope flutter" }) -- vim.keymap.set("n", "<leader>fl", ": Telescope flutter commands<CR>", { desc = "Open Telescope flutter" })
vim.keymap.set("n", "<leader>fl", ":Telescope flutter commands<CR>", { desc = "Open Telescope flutter" }) -- vim.keymap.set("n", "<leader>fl", ":Telescope flutter commands<CR>", { desc = "Open Telescope flutter" })
-- Dap binds -- Dap binds
vim.keymap.set("n", "<leader>do", dapui.open, { desc = "Open debug overlay" }) vim.keymap.set("n", "<leader>do", dapui.open, { desc = "Open debug overlay" })
vim.keymap.set("n", "<leader>dc", dapui.close, { desc = "Close debug overlay" }) vim.keymap.set("n", "<leader>dc", dapui.close, { desc = "Close debug overlay" })

6
packages/nvim/lua/plugins/catppuccin.lua
View File

@@ -14,5 +14,9 @@ return {
indentscope_color = "", indentscope_color = "",
}, },
} }
} },
config = function()
require("catppuccin").setup({})
vim.cmd.colorscheme("catppuccin")
end
} }

5
packages/nvim/lua/plugins/nvim-tree.lua
View File

@@ -10,6 +10,11 @@ return {
view = { view = {
width = 30, width = 30,
}, },
renderer = {
indent_markers = {
enable = true;
}
}
}) })
end, end,
} }

10
packages/nvim/lua/plugins/rest.lua Normal file
View File

@@ -0,0 +1,10 @@
return {
"rest-nvim/rest.nvim",
dependencies = {
"nvim-treesitter/nvim-treesitter",
opts = function (_, opts)
opts.ensure_installed = opts.ensure_installed or {}
table.insert(opts.ensure_installed, "http")
end,
}
}

14
packages/nvim/lua/plugins/telescope.lua
View File

@@ -1,4 +1,16 @@
return { return {
"nvim-telescope/telescope-file-browser.nvim", "nvim-telescope/telescope-file-browser.nvim",
dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" } dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" },
config = function()
local telescope = require("telescope")
telescope.load_extension("flutter")
local builtin = require("telescope.builtin")
vim.keymap.set("n", "<leader>ff", builtin.find_files, { desc = "Telescope find files" })
vim.keymap.set("n", "<leader>fg", builtin.live_grep, { desc = "Telescope live grep" })
vim.keymap.set("n", "<leader>fb", ":Telescope file_browser<CR>", { desc = "Telescope file_browser" })
vim.keymap.set("n", "<leader>fh", builtin.help_tags, { desc = "Telescope help tags" })
vim.keymap.set("n", "<leader>fl", ": Telescope flutter commands<CR>", { desc = "Open Telescope flutter" })
vim.keymap.set("n", "<leader>fl", ":Telescope flutter commands<CR>", { desc = "Open Telescope flutter" })
end,
} }

18
packages/nvim/lua/plugins/vim-tmux-navigator.lua Normal file
View File

@@ -0,0 +1,18 @@
return {
"christoomey/vim-tmux-navigator",
cmd = {
"TmuxNavigateLeft",
"TmuxNavigateDown",
"TmuxNavigateUp",
"TmuxNavigateRight",
"TmuxNavigatePrevious",
"TmuxNavigatorProcessList",
},
keys = {
{ "<c-h>", "<cmd><C-U>TmuxNavigateLeft<cr>" },
{ "<c-j>", "<cmd><C-U>TmuxNavigateDown<cr>" },
{ "<c-k>", "<cmd><C-U>TmuxNavigateUp<cr>" },
{ "<c-l>", "<cmd><C-U>TmuxNavigateRight<cr>" },
{ "<c-\\>", "<cmd><C-U>TmuxNavigatePrevious<cr>" },
},
}

16
packages/nvim/lua/plugins/workspaces.lua Normal file
View File

@@ -0,0 +1,16 @@
return {
"natecraddock/workspaces.nvim",
dependencies = {
"nvim-telescope/telescope.nvim",
},
config = function ()
require("workspaces").setup()
require("telescope").load_extension("workspaces");
vim.keymap.set("n", "<leader>w", "", { desc = "Open telescope workspaces" })
vim.keymap.set("n", "<leader>wa", ":WorkspacesAdd ", { desc = "Add workspace" })
vim.keymap.set("n", "<leader>wo", ":Telescope workspaces<CR>", { desc = "Show workspaces" })
vim.keymap.set("n", "<leader>wd", ":WorkspacesRemove ", { desc = "Remove workspace" })
end
}

1
packages/rofi/default.nix
View File

@@ -5,6 +5,7 @@
rofi-power-menu rofi-power-menu
]; ];
catppuccin.rofi.enable = false;
programs.rofi = { programs.rofi = {
enable = true; enable = true;

1214
packages/swaync/default.nix
View File

File diff suppressed because it is too large Load Diff

24
packages/terminal/default.nix
View File

@@ -47,24 +47,40 @@ programs.zsh = {
}; };
initContent = '' initContent = ''
if [ "$TMUX" = "" ]; then exec tmux; fi
eval "$(starship init zsh)" eval "$(starship init zsh)"
export NIX_LD=$(nix eval --impure --raw --expr 'let pkgs = import <nixpkgs> {}; NIX_LD = pkgs.lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker"; in NIX_LD') export NIX_LD=$(nix eval --impure --raw --expr 'let pkgs = import <nixpkgs> {}; NIX_LD = pkgs.lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker"; in NIX_LD')
export ZVM_VI_INSERT_ESCAPE_BINDKEY=jk
function zvm_after_init() {
bindkey "^[[1;5C" forward-word && bindkey "^[[1;5D" backward-word
}
autoload -U select-word-style
select-word-style bash
''; '';
zplug = { zplug = {
enable = false; enable = false;
plugins = [ plugins = [
{ name = "zsh-users/zsh-autosuggestions"; } # Simple plugin installation { name = "jeffreytse/zsh-vi-mode"; }
]; ];
}; };
oh-my-zsh = { oh-my-zsh = {
enable = true; enable = false;
# plugins = [ "thefuck" ]; # plugins = [ "thefuck" ];
# theme = ""; # theme = "";
}; };
plugins = [
{
name = "vi-mode";
src = pkgs.zsh-vi-mode;
file = "share/zsh-vi-mode/zsh-vi-mode.plugin.zsh";
}
];
}; };
@@ -73,6 +89,8 @@ programs.ghostty = {
enable = true; enable = true;
}; };
catppuccin.ghostty.enable = false;
home.file."/home/nico/.config/ghostty/config" = { home.file."/home/nico/.config/ghostty/config" = {
source = ./ghostty-config; source = ./ghostty-config;
}; };

50
packages/terminal/ghostty-config
View File

@@ -1,24 +1,30 @@
palette = 0=#45475a # palette = 0=#45475a
palette = 1=#f38ba8 # palette = 1=#f38ba8
palette = 2=#a6e3a1 # palette = 2=#a6e3a1
palette = 3=#f9e2af # palette = 3=#f9e2af
palette = 4=#89b4fa # palette = 4=#89b4fa
palette = 5=#f5c2e7 # palette = 5=#f5c2e7
palette = 6=#94e2d5 # palette = 6=#94e2d5
palette = 7=#bac2de # palette = 7=#bac2de
palette = 8=#585b70 # palette = 8=#585b70
palette = 9=#f38ba8 # palette = 9=#f38ba8
palette = 10=#a6e3a1 # palette = 10=#a6e3a1
palette = 11=#f9e2af # palette = 11=#f9e2af
palette = 12=#89b4fa # palette = 12=#89b4fa
palette = 13=#f5c2e7 # palette = 13=#f5c2e7
palette = 14=#94e2d5 # palette = 14=#94e2d5
palette = 15=#a6adc8 # palette = 15=#a6adc8
background = 1e1e2e # background = 1e1e2e
foreground = cdd6f4 # foreground = cdd6f4
cursor-color = f5e0dc # cursor-color = f5e0dc
cursor-text = 1e1e2e # cursor-text = 1e1e2e
selection-background = 353749 # selection-background = 353749
selection-foreground = cdd6f4 # selection-foreground = cdd6f4
background-opacity = 0.8
background-opacity-cells = true
# background-blur = true
theme = Catppuccin Mocha
gtk-titlebar = false gtk-titlebar = false

113
packages/tmux/default.nix
View File

@@ -1,30 +1,66 @@
{ pkgs, config, lib,... }: { pkgs, config, lib, inputs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
]; ];
catppuccin.tmux = {
enable = true;
extraConfig = ''
set -g @catppuccin_window_status_style "rounded"
'';
flavor = "mocha";
};
programs.tmux = { programs.tmux = {
enable = true; enable = true;
terminal = "tmux-256color"; terminal = "tmux-256color";
disableConfirmationPrompt = true; disableConfirmationPrompt = true;
keyMode = "vi";
# newSession = true;
extraConfig = '' extraConfig = ''
# set-option -sa terminal-overrides ",xterm*:Tc"
# set -g @catppuccin_flavor 'mocha' unbind C-b
# set -g @catppuccin_window_status_style "rounded" set -g prefix C-Space
# set -g default-terminal "xterm-256color" bind C-Space send-prefix
# set -ga terminal-overrides ",*256col*:Tc"
# set -ga terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[ q' # vim-like pane resizing
# set-environment -g COLORTERM "truecolor" bind -r C-k resize-pane -U
# bind -r C-j resize-pane -D
# run-shell ${pkgs.tmuxPlugins.catppuccin}/share/tmux-plugins/catppuccin/catppuccin.tmux bind -r C-h resize-pane -L
bind -r C-l resize-pane -R
unbind k
unbind j
unbind h
unbind l
# vim-like pane switching
bind -r k select-pane -U
bind -r j select-pane -D
bind -r h select-pane -L
bind -r l select-pane -R
# and now unbind keys
unbind Up
unbind Down
unbind Left
unbind Right
unbind C-Up
unbind C-Down
unbind C-Left
unbind C-Right
set -g base-index 1 set -g base-index 1
set -g pane-base-index 1 set -g pane-base-index 1
set-window-option -g pane-base-index 1 set-window-option -g pane-base-index 1
set-option -g renumber-windows on set-option -g renumber-windows on
bind '"' split-window -v -c "#{pane_current_path}" unbind s
bind % split-window -h -c "#{pane_current_path}" bind s split-window -v -c "#{pane_current_path}"
unbind x
bind x split-window -h -c "#{pane_current_path}"
set -g mouse on set -g mouse on
@@ -32,45 +68,32 @@ bind -n M-H previous-window
bind -n M-L next-window bind -n M-L next-window
# set vi-mode
set-window-option -g mode-keys vi
# keybindings
bind-key -T copy-mode-vi v send-keys -X begin-selection
bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
# Smart pane switching with awareness of Vim splits.
# See: https://github.com/christoomey/vim-tmux-navigator
# decide whether we're in a Vim process
is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
| grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h' 'select-pane -L'
bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j' 'select-pane -D'
bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k' 'select-pane -U'
bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l' 'select-pane -R'
tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")'
if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \
"bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\' 'select-pane -l'"
if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \
"bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\' 'select-pane -l'"
bind-key -n 'C-Space' if-shell "$is_vim" 'send-keys C-Space' 'select-pane -t:.+'
bind-key -T copy-mode-vi 'C-h' select-pane -L
bind-key -T copy-mode-vi 'C-j' select-pane -D
bind-key -T copy-mode-vi 'C-k' select-pane -U
bind-key -T copy-mode-vi 'C-l' select-pane -R
bind-key -T copy-mode-vi 'C-\' select-pane -l
bind-key -T copy-mode-vi 'C-Space' select-pane -t:.+
''; '';
plugins = with pkgs.tmuxPlugins; [ plugins = with pkgs.tmuxPlugins; [
catppuccin { # vim-tmux-navigator {
plugin = catppuccin; # plugin = vim-tmux-navigator;
extraConfig = '' # }
set -g @plugin 'catppuccin/tmux#2.1.3' # tmux-which-key {
set -g @catppuccin_window_status_style "rounded" # plugin = tmux-which-key;
set -g @catppuccin_flavor 'mocha' # }
''; # catppuccin {
} # plugin = catppuccin;
# extraConfig = ''
# set -g @plugin 'catppuccin/tmux#2.1.3'
# set -g @catppuccin_window_status_style "rounded"
# set -g @catppuccin_flavor 'mocha'
# '';
# }
# pkgs.tmuxPlugins.vim-tmux-navigator # pkgs.tmuxPlugins.vim-tmux-navigator
]; ];
}; };

1
packages/zed-editor/default.nix
View File

@@ -4,6 +4,7 @@
home.file."/home/nico/.config/zed/settings.json" = { home.file."/home/nico/.config/zed/settings.json" = {
source = ./settings.json; source = ./settings.json;
}; };
catppuccin.zed.enable = false;
programs.zed-editor = { programs.zed-editor = {
enable = true; enable = true;
}; };