diff --git a/flake.lock b/flake.lock index 0bf378f..795a782 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1757015938, - "narHash": "sha256-1qBXNK/QxEjCqIoA2DxWn5gqM8rVxt+OxKodXu1GLTY=", + "lastModified": 1757430124, + "narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "eaacfa1101b84225491d2ceae9549366d74dc214", + "rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196", "type": "github" }, "original": { @@ -79,11 +79,11 @@ ] }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -133,11 +133,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1757075491, - "narHash": "sha256-a+NMGl5tcvm+hyfSG2DlVPa8nZLpsumuRj1FfcKb2mQ=", + "lastModified": 1757475826, + "narHash": "sha256-x6x30IzUOxKmOtE0KzQu9UxLrxg0HLurd5rpak62OL0=", "owner": "nix-community", "repo": "home-manager", - "rev": "f56bf065f9abedc7bc15e1f2454aa5c8edabaacf", + "rev": "a60021a8c99bf5a28919c0a9fbb6b04422a6a8da", "type": "github" }, "original": { @@ -165,11 +165,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1757098510, - "narHash": "sha256-tHPteuZGO4VQpPWkAVHRQfmyaf9yA/X3LFjm/YEFFvI=", + "lastModified": 1757494211, + "narHash": "sha256-WATqtXGCqUZn6aB+C+Op6TjUAFE0HMTV7LvOAOgad14=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "5618381aa3a24f05fe86f0a1879120f6c5de4fe7", + "rev": "136aa7a7b9206d0df6bf3d8fdd82cfa3efdf9a7e", "type": "github" }, "original": { @@ -181,11 +181,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1757096967, - "narHash": "sha256-UpVAGMHIOPIESfwxmTJk1J5gt4URGn9o1jLf7nNNXwQ=", + "lastModified": 1757494861, + "narHash": "sha256-DY0gzANWxACRjHhh5tC0GcaOKwIz2ynzxqnx0sDQmCs=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "0ec71ef24a4f1fce6694b55f9a99f9be3be9a104", + "rev": "c3b83be898373651f90e52a6a405f0f0f3196f69", "type": "github" }, "original": { @@ -242,11 +242,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "type": "github" }, "original": { @@ -273,11 +273,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1757099195, - "narHash": "sha256-Ov+K/DJjADr80XQ5YSZNjGNd0X70pOim7Zy4sMuyTLA=", + "lastModified": 1757493204, + "narHash": "sha256-bwg0O7Xo/T7aTWp0zicklTonSULI33Y1LMsqFBmTIf8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ff514addef06589377dc745eb821e83eaa909005", + "rev": "f9e9d45a64c8ff4e9906260804a1679a28819b4e", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1755829505, - "narHash": "sha256-4/Jd+LkQ2ssw8luQVkqVs9spDBVE6h/u/hC/tzngsPo=", + "lastModified": 1757034884, + "narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f937f8ecd1c70efd7e9f90ba13dfb400cf559de4", + "rev": "ca77296380960cd497a765102eeb1356eb80fed0", "type": "github" }, "original": { @@ -327,11 +327,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1757086676, - "narHash": "sha256-q79kLb0sjIEx6bIa5xcKACR5s8rDL7avOM+6ZLYa18g=", + "lastModified": 1757437784, + "narHash": "sha256-GFbRW1QCBNK/0di2Dj0WZJxdN+EZgTTn6gm7af4/r9s=", "owner": "nix-community", "repo": "nixvim", - "rev": "4f80458d351a204e35dbc6a127b20e3f69462c7f", + "rev": "51edc33c9763e486beacf6a066ae41a3c18827fa", "type": "github" }, "original": { @@ -350,11 +350,11 @@ ] }, "locked": { - "lastModified": 1755555503, - "narHash": "sha256-WiOO7GUOsJ4/DoMy2IC5InnqRDSo2U11la48vCCIjjY=", + "lastModified": 1756738487, + "narHash": "sha256-8QX7Ab5CcICp7zktL47VQVS+QeaU4YDNAjzty7l7TQE=", "owner": "NuschtOS", "repo": "search", - "rev": "6f3efef888b92e6520f10eae15b86ff537e1d2ea", + "rev": "5feeaeefb571e6ca2700888b944f436f7c05149b", "type": "github" }, "original": { @@ -406,11 +406,11 @@ ] }, "locked": { - "lastModified": 1754988908, - "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", + "lastModified": 1757449901, + "narHash": "sha256-qwN8nYdSRnmmyyi+uR6m4gXnVktmy5smG1MOrSFD8PI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", + "rev": "3b4a369df9dd6ee171a7ea4448b50e2528faf850", "type": "github" }, "original": { @@ -472,11 +472,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1756827929, - "narHash": "sha256-HQiCt9TTEZ33lOnmXdmGr3A/hLOwk35CPa5idW95/ko=", + "lastModified": 1757256304, + "narHash": "sha256-qANK2Hwhi4Nbpcsy6lunncyt725gthaSX/0dLluBxtw=", "owner": "dj95", "repo": "zjstatus", - "rev": "16db007a56958a44dc940876b4f23824daa81809", + "rev": "e2ea91819408f0b0dd7ee15249341cace6eb09cc", "type": "github" }, "original": { diff --git a/modules/darwin/home/ghostty.nix b/modules/darwin/home/ghostty.nix index e5c0264..66091c8 100644 --- a/modules/darwin/home/ghostty.nix +++ b/modules/darwin/home/ghostty.nix @@ -4,7 +4,7 @@ package = pkgs.ghostty-bin; settings = { command = "${pkgs.fish}/bin/fish"; - theme = "catppuccin-latte"; + theme = "catppuccin-mocha"; window-padding-x = 8; window-padding-y = 2; window-padding-balance = true; diff --git a/modules/home/bat.nix b/modules/home/bat.nix index 1a05450..e3a6bdf 100644 --- a/modules/home/bat.nix +++ b/modules/home/bat.nix @@ -2,18 +2,18 @@ programs.bat = { enable = true; config = { - theme = "Catppuccin Latte"; + theme = "Catppuccin Mocha"; pager = "ov"; }; themes = { - "Catppuccin Latte" = { + "Catppuccin Mocha" = { src = pkgs.fetchFromGitHub { owner = "catppuccin"; repo = "bat"; rev = "6810349b28055dce54076712fc05fc68da4b8ec0"; sha256 = "lJapSgRVENTrbmpVyn+UQabC9fpV1G1e+CdlJ090uvg="; }; - file = "themes/Catppuccin Latte.tmTheme"; + file = "themes/Catppuccin Mocha.tmTheme"; }; }; }; diff --git a/modules/home/fish.nix b/modules/home/fish.nix index 0f3117a..3d9f0bb 100644 --- a/modules/home/fish.nix +++ b/modules/home/fish.nix @@ -40,7 +40,7 @@ set fish_pager_color_completion 4c4f69 set fish_pager_color_description 9ca0b0 - set -gx LS_COLORS "$(vivid generate catppuccin-latte)" + set -gx LS_COLORS "$(vivid generate catppuccin-mocha)" for mode in default insert bind --mode $mode \cp open_project diff --git a/modules/home/neovim/default.nix b/modules/home/neovim/default.nix index 21cad05..4d808f2 100644 --- a/modules/home/neovim/default.nix +++ b/modules/home/neovim/default.nix @@ -21,7 +21,7 @@ colorschemes.catppuccin = { enable = true; settings = { - flavour = "latte"; + flavour = "mocha"; }; }; extraConfigLua = '' diff --git a/modules/home/zellij.nix b/modules/home/zellij.nix index 58380a2..e6b62fd 100644 --- a/modules/home/zellij.nix +++ b/modules/home/zellij.nix @@ -7,7 +7,7 @@ enable = true; enableFishIntegration = lib.mkDefault false; settings = { - theme = "catppuccin-latte"; + theme = "catppuccin-mocha"; default_layout = "default"; default_shell = "${pkgs.fish}/bin/fish"; pane_frames = false; diff --git a/modules/packages.nix b/modules/packages.nix index a9048a6..83f7a27 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -2,6 +2,7 @@ with pkgs; [ (callPackage ./bin/open-project.nix {}) age + rclone alejandra ast-grep delta