diff --git a/nix-darwin/flake.lock b/nix-darwin/flake.lock index d61f8b66..2bf096a7 100644 --- a/nix-darwin/flake.lock +++ b/nix-darwin/flake.lock @@ -44,11 +44,11 @@ "nuscht-search": "nuscht-search" }, "locked": { - "lastModified": 1735399522, - "narHash": "sha256-1lIjMEBvtxJH3V7c66D8pN/pPp4xsFGz6PjcOYX/Niw=", + "lastModified": 1735895235, + "narHash": "sha256-MtsfkMikkPjnZUMqsqXQ29cHzlRD2lMe27jXua28cHU=", "owner": "catppuccin", "repo": "nix", - "rev": "8b6baed3d010416da6295805012b12cfa05c09f7", + "rev": "b326f48f17023fc0060590ba299d55f7da8350a5", "type": "github" }, "original": { @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1735427049, - "narHash": "sha256-rTpBl3xmKYDQTRWF8CRk/r1FoKPDVwqLHGoU7tfECvY=", + "lastModified": 1735685839, + "narHash": "sha256-62xAPSs5VRZoPH7eRanUn5S5vZEd+8vM4bD5I+zxokc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "53a0c2fe6ed46ab33fc4a221c9f907a7b4c8a91c", + "rev": "6a1fdb2a1204c0de038847b601cff5012e162b5e", "type": "github" }, "original": { @@ -113,11 +113,11 @@ ] }, "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "lastModified": 1735644329, + "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", "owner": "numtide", "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", "type": "github" }, "original": { @@ -135,11 +135,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1735202720, - "narHash": "sha256-7aEdACqT2B7nZNFjn2Y66Qucfl1AHHVFKxm4yvO0O10=", + "lastModified": 1735926627, + "narHash": "sha256-L8uuPK8ieuNJLbYsZ3nhBZ0+6btvbCqRm9wG51tbOdE=", "owner": "rycee", "repo": "nur-expressions", - "rev": "fe816609e68ee1887ee89e43c9ca1aad75362477", + "rev": "a3943ec69fff6fb80227e62acca22adc016ada63", "type": "gitlab" }, "original": { @@ -203,11 +203,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1735774679, + "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", "type": "github" }, "original": { @@ -277,18 +277,14 @@ "nixpkgs": [ "nixvim", "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" ] }, "locked": { - "lastModified": 1734797603, - "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "type": "github" }, "original": { @@ -391,11 +387,11 @@ ] }, "locked": { - "lastModified": 1735381016, - "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", + "lastModified": 1735925111, + "narHash": "sha256-/NptDI4njO5hH0ZVQ2yzbvTXmBOabZaGYkjhnMJ37TY=", "owner": "nix-community", "repo": "home-manager", - "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", + "rev": "ef64efdbaca99f9960f75efab991e4c49e79a5f1", "type": "github" }, "original": { @@ -412,11 +408,11 @@ ] }, "locked": { - "lastModified": 1734862405, - "narHash": "sha256-bXZJvUMJ2A6sIpYcCUAGjYCD5UDzmpmQCdmJSkPhleU=", + "lastModified": 1735900408, + "narHash": "sha256-U+oZBQ3f5fF2hHsupKQH4ihgTKLHgcJh6jEmKDg+W10=", "owner": "nix-community", "repo": "home-manager", - "rev": "cb27edb5221d2f2920a03155f8becc502cf60e35", + "rev": "1c8d4c8d592e8fab4cff4397db5529ec6f078cf9", "type": "github" }, "original": { @@ -432,11 +428,11 @@ ] }, "locked": { - "lastModified": 1735342807, - "narHash": "sha256-bBQu5n/rMT8bEsBMmv3CtGUZ/ybCTuDw5E2GYZI5woU=", + "lastModified": 1735681195, + "narHash": "sha256-kfrRE2j3s27LbG3/6c5PuYmhg1l7A/Nz/peF6/+3dYw=", "owner": "StevenBlack", "repo": "hosts", - "rev": "8c7de597e3007ce646a42ac604956d9ce4876b6a", + "rev": "6c0d88a14e32a1e3820458728194cc89319aeb68", "type": "github" }, "original": { @@ -521,11 +517,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1735394862, - "narHash": "sha256-6/4VTVdtg8/DJUy/FsOk+bSoqAeYwZGFnCexmNaPWk0=", + "lastModified": 1735908454, + "narHash": "sha256-BfS6oIqF6x7URohd9+RgB5o7FUzAcENiioLf1nDJA+o=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "2b01a5bcf62956a5d641a3367edcd35e103edfcd", + "rev": "b0cd9972e8158bbda2ee3933668ce727e8a9ae5c", "type": "github" }, "original": { @@ -546,11 +542,11 @@ ] }, "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", + "lastModified": 1735734474, + "narHash": "sha256-9OV4lOqrEJVLdOrpNN/9msNwAhI6FQTu4N7fufilG08=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", + "rev": "271df559dd30e4bc5ec6af02d017ac0aaabd63a7", "type": "github" }, "original": { @@ -753,11 +749,11 @@ ] }, "locked": { - "lastModified": 1733570843, - "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", + "lastModified": 1735685839, + "narHash": "sha256-62xAPSs5VRZoPH7eRanUn5S5vZEd+8vM4bD5I+zxokc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a35b08d09efda83625bef267eb24347b446c80b8", + "rev": "6a1fdb2a1204c0de038847b601cff5012e162b5e", "type": "github" }, "original": { @@ -816,11 +812,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -845,11 +841,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735378670, - "narHash": "sha256-A8aQA+YhJfA8mUpzXOZdlXNnKiZg2EcpCn1srgtBjTs=", + "lastModified": 1735934899, + "narHash": "sha256-Q7on5+6ozUmS8LXY401h1wetLBJHb+/VeWHG+4zhK/w=", "owner": "nix-community", "repo": "nixvim", - "rev": "f4b0b81ef9eb4e37e75f32caf1f02d5501594811", + "rev": "6c93c52dc1958a2e17313480e2fc68601bcbb0a6", "type": "github" }, "original": { @@ -891,11 +887,11 @@ ] }, "locked": { - "lastModified": 1733773348, - "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", + "lastModified": 1735854821, + "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", "owner": "NuschtOS", "repo": "search", - "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", + "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", "type": "github" }, "original": { @@ -972,11 +968,11 @@ ] }, "locked": { - "lastModified": 1734546875, - "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=", + "lastModified": 1735844895, + "narHash": "sha256-CIRlqX9tBK2awJkmVu2cKuap/0QziDXStQZ/u/+e8Z4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d", + "rev": "24d89184adf76d7ccc99e659dc5f3838efb5ee32", "type": "github" }, "original": { @@ -993,11 +989,11 @@ ] }, "locked": { - "lastModified": 1735359308, - "narHash": "sha256-wxsff5tL6UpQ4gzh+ul4iF1UkVFZTV71AfXM0k8k/zc=", + "lastModified": 1735877772, + "narHash": "sha256-6OT4xYCwZTJ9qK28NNM98ibFZinwrJK/sRlg+dDqdJs=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "26f2e859974b87aa946655a058ec7c3e9c94e25d", + "rev": "0227d83d2eb29189b8ed8d180e2442ada633dd0d", "type": "github" }, "original": { @@ -1089,11 +1085,11 @@ ] }, "locked": { - "lastModified": 1734704479, - "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", + "lastModified": 1735905407, + "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", + "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8", "type": "github" }, "original": { diff --git a/nix-darwin/home-modules/programs/alacritty.nix b/nix-darwin/home-modules/programs/alacritty.nix index 0583b134..d066a0f1 100644 --- a/nix-darwin/home-modules/programs/alacritty.nix +++ b/nix-darwin/home-modules/programs/alacritty.nix @@ -14,8 +14,6 @@ }; config = lib.mkIf config.alacritty.enable { - # C-r history - # C-l clear home = { sessionVariables = { TERMINAL = "alacritty"; @@ -24,15 +22,8 @@ programs = { alacritty = { enable = true; - catppuccin.enable = true; - shellIntegration.enableFishIntegration = true; - shellIntegration.enableZshIntegration = true; - font = { - size = 16; - name = "JetBrainsMono"; - package = pkgs.nerd-fonts.jetbrains-mono; - }; }; }; + catppuccin.alacritty.enable = true; }; } diff --git a/nix-darwin/home-modules/programs/bat.nix b/nix-darwin/home-modules/programs/bat.nix index e16287bc..327ed0e3 100644 --- a/nix-darwin/home-modules/programs/bat.nix +++ b/nix-darwin/home-modules/programs/bat.nix @@ -16,7 +16,7 @@ config = lib.mkIf config.bat.enable { programs.bat = { enable = true; - catppuccin.enable = true; }; + catppuccin.bat.enable = true; }; } diff --git a/nix-darwin/home-modules/programs/btop.nix b/nix-darwin/home-modules/programs/btop.nix index 8dbda809..d8d885e6 100644 --- a/nix-darwin/home-modules/programs/btop.nix +++ b/nix-darwin/home-modules/programs/btop.nix @@ -16,10 +16,10 @@ config = lib.mkIf config.btop.enable { programs.btop = { enable = true; - catppuccin.enable = true; settings = { theme_background = true; }; }; + catppuccin.btop.enable = true; }; } diff --git a/nix-darwin/home-modules/programs/default.nix b/nix-darwin/home-modules/programs/default.nix index ca0b08c0..40056deb 100644 --- a/nix-darwin/home-modules/programs/default.nix +++ b/nix-darwin/home-modules/programs/default.nix @@ -13,6 +13,7 @@ ./flameshot.nix ./fuzzel.nix ./fzf.nix + ./ghostty.nix ./git.nix ./k9s.nix ./keychain.nix diff --git a/nix-darwin/home-modules/programs/fish.nix b/nix-darwin/home-modules/programs/fish.nix index be535050..c75e7bae 100644 --- a/nix-darwin/home-modules/programs/fish.nix +++ b/nix-darwin/home-modules/programs/fish.nix @@ -20,7 +20,6 @@ programs.fish = { plugins = [ ]; enable = true; - # catppuccin.enable = true; shellInit = '' # set -x PATH $PATH $HOME/.npm-global/bin set ENTERPRISE_REPO_PATH ~/knak @@ -110,5 +109,6 @@ top = "btop"; }; }; + catppuccin.fish.enable = true; }; } diff --git a/nix-darwin/home-modules/programs/fzf.nix b/nix-darwin/home-modules/programs/fzf.nix index 4d0a70d0..f00f6fb0 100644 --- a/nix-darwin/home-modules/programs/fzf.nix +++ b/nix-darwin/home-modules/programs/fzf.nix @@ -17,8 +17,8 @@ programs = { fzf = { enable = true; - catppuccin.enable = true; }; }; + catppuccin.fzf.enable = true; }; } diff --git a/nix-darwin/home-modules/programs/ghostty.nix b/nix-darwin/home-modules/programs/ghostty.nix new file mode 100644 index 00000000..b4ce785f --- /dev/null +++ b/nix-darwin/home-modules/programs/ghostty.nix @@ -0,0 +1,34 @@ +{ + pkgs, + lib, + config, + ... +}: +{ + options = { + ghostty.enable = lib.mkOption { + type = lib.types.bool; + description = "Enables ghostty shell"; + default = true; + }; + }; + + config = lib.mkIf config.ghostty.enable { + home = { + sessionVariables = { + # TERMINAL = "kitty"; + }; + }; + programs = { + ghostty = { + enable = true; + enableFishIntegration = true; + enableZshIntegration = true; + settings = { + font-size = 16; + font-family = "JetBrainsMono"; + }; + }; + }; + }; +} diff --git a/nix-darwin/home-modules/programs/k9s.nix b/nix-darwin/home-modules/programs/k9s.nix index c951846a..0dcf9f92 100644 --- a/nix-darwin/home-modules/programs/k9s.nix +++ b/nix-darwin/home-modules/programs/k9s.nix @@ -8,7 +8,7 @@ config = lib.mkIf config.kubernetes.enable { programs.k9s = { enable = true; - catppuccin.enable = true; }; + catppuccin.k9s.enable = true; }; } diff --git a/nix-darwin/home-modules/programs/kitty.nix b/nix-darwin/home-modules/programs/kitty.nix index 9fdf0494..b850ce81 100644 --- a/nix-darwin/home-modules/programs/kitty.nix +++ b/nix-darwin/home-modules/programs/kitty.nix @@ -24,7 +24,6 @@ programs = { kitty = { enable = true; - catppuccin.enable = true; shellIntegration.enableFishIntegration = true; shellIntegration.enableZshIntegration = true; settings = { @@ -39,5 +38,6 @@ }; }; }; + catppuccin.kitty.enable = true; }; } diff --git a/nix-darwin/home-modules/programs/lazygit.nix b/nix-darwin/home-modules/programs/lazygit.nix index a271ed94..5a862874 100644 --- a/nix-darwin/home-modules/programs/lazygit.nix +++ b/nix-darwin/home-modules/programs/lazygit.nix @@ -8,7 +8,7 @@ config = lib.mkIf config.git.enable { programs.lazygit = { enable = true; - catppuccin.enable = true; }; + catppuccin.lazygit.enable = true; }; } diff --git a/nix-darwin/home-modules/programs/starship.nix b/nix-darwin/home-modules/programs/starship.nix index d54cd6ad..f5eff2ae 100644 --- a/nix-darwin/home-modules/programs/starship.nix +++ b/nix-darwin/home-modules/programs/starship.nix @@ -16,7 +16,6 @@ config = lib.mkIf config.starship.enable { programs.starship = { enable = true; - catppuccin.enable = true; enableFishIntegration = true; enableZshIntegration = true; enableNushellIntegration = true; @@ -50,5 +49,6 @@ format = "$all"; # Remove this line to disable the default prompt format }; }; + catppuccin.starship.enable = true; }; } diff --git a/nix-darwin/home-modules/programs/zsh.nix b/nix-darwin/home-modules/programs/zsh.nix index dcca22bd..c1e8508c 100644 --- a/nix-darwin/home-modules/programs/zsh.nix +++ b/nix-darwin/home-modules/programs/zsh.nix @@ -23,7 +23,6 @@ ''; autosuggestion.enable = true; syntaxHighlighting.enable = true; - syntaxHighlighting.catppuccin.enable = true; oh-my-zsh.enable = false; shellAliases = { ls = "eza -al"; @@ -32,5 +31,6 @@ "...." = "cd ../../.."; }; }; + catppuccin.zsh-syntax-highlighting.enable = true; }; } diff --git a/nix-darwin/users/henri.vandersleyen/home.nix b/nix-darwin/users/henri.vandersleyen/home.nix index 5609c002..955107f2 100644 --- a/nix-darwin/users/henri.vandersleyen/home.nix +++ b/nix-darwin/users/henri.vandersleyen/home.nix @@ -16,6 +16,7 @@ ../../home-modules/programs/lazygit.nix ../../home-modules/programs/modern_unix.nix ../../home-modules/programs/fzf.nix + # ../../home-modules/programs/ghostty.nix # INFO:broken ../../home-modules/programs/btop.nix ../../home-modules/programs/fish.nix ../../home-modules/programs/zsh.nix diff --git a/nix-darwin/users/henri.vandersleyen/secrets/secrets.yaml b/nix-darwin/users/henri.vandersleyen/secrets/secrets.yaml new file mode 100644 index 00000000..e69de29b diff --git a/nix-darwin/users/henri.vandersleyen/sops.nix b/nix-darwin/users/henri.vandersleyen/sops.nix new file mode 100644 index 00000000..e69de29b