This commit is contained in:
2025-09-10 09:10:53 +00:00
parent 605ea16973
commit 34c5a4950d
7 changed files with 44 additions and 43 deletions

72
flake.lock generated
View File

@@ -39,11 +39,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757015938, "lastModified": 1757430124,
"narHash": "sha256-1qBXNK/QxEjCqIoA2DxWn5gqM8rVxt+OxKodXu1GLTY=", "narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "eaacfa1101b84225491d2ceae9549366d74dc214", "rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -79,11 +79,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1754487366, "lastModified": 1756770412,
"narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", "rev": "4524271976b625a4a605beefd893f270620fd751",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -133,11 +133,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1757075491, "lastModified": 1757475826,
"narHash": "sha256-a+NMGl5tcvm+hyfSG2DlVPa8nZLpsumuRj1FfcKb2mQ=", "narHash": "sha256-x6x30IzUOxKmOtE0KzQu9UxLrxg0HLurd5rpak62OL0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f56bf065f9abedc7bc15e1f2454aa5c8edabaacf", "rev": "a60021a8c99bf5a28919c0a9fbb6b04422a6a8da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -165,11 +165,11 @@
"homebrew-cask": { "homebrew-cask": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1757098510, "lastModified": 1757494211,
"narHash": "sha256-tHPteuZGO4VQpPWkAVHRQfmyaf9yA/X3LFjm/YEFFvI=", "narHash": "sha256-WATqtXGCqUZn6aB+C+Op6TjUAFE0HMTV7LvOAOgad14=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask", "repo": "homebrew-cask",
"rev": "5618381aa3a24f05fe86f0a1879120f6c5de4fe7", "rev": "136aa7a7b9206d0df6bf3d8fdd82cfa3efdf9a7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -181,11 +181,11 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1757096967, "lastModified": 1757494861,
"narHash": "sha256-UpVAGMHIOPIESfwxmTJk1J5gt4URGn9o1jLf7nNNXwQ=", "narHash": "sha256-DY0gzANWxACRjHhh5tC0GcaOKwIz2ynzxqnx0sDQmCs=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
"rev": "0ec71ef24a4f1fce6694b55f9a99f9be3be9a104", "rev": "c3b83be898373651f90e52a6a405f0f0f3196f69",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -242,11 +242,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1756542300, "lastModified": 1757068644,
"narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -273,11 +273,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1757099195, "lastModified": 1757493204,
"narHash": "sha256-Ov+K/DJjADr80XQ5YSZNjGNd0X70pOim7Zy4sMuyTLA=", "narHash": "sha256-bwg0O7Xo/T7aTWp0zicklTonSULI33Y1LMsqFBmTIf8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ff514addef06589377dc745eb821e83eaa909005", "rev": "f9e9d45a64c8ff4e9906260804a1679a28819b4e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -289,11 +289,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1755829505, "lastModified": 1757034884,
"narHash": "sha256-4/Jd+LkQ2ssw8luQVkqVs9spDBVE6h/u/hC/tzngsPo=", "narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f937f8ecd1c70efd7e9f90ba13dfb400cf559de4", "rev": "ca77296380960cd497a765102eeb1356eb80fed0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -327,11 +327,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1757086676, "lastModified": 1757437784,
"narHash": "sha256-q79kLb0sjIEx6bIa5xcKACR5s8rDL7avOM+6ZLYa18g=", "narHash": "sha256-GFbRW1QCBNK/0di2Dj0WZJxdN+EZgTTn6gm7af4/r9s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "4f80458d351a204e35dbc6a127b20e3f69462c7f", "rev": "51edc33c9763e486beacf6a066ae41a3c18827fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -350,11 +350,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1755555503, "lastModified": 1756738487,
"narHash": "sha256-WiOO7GUOsJ4/DoMy2IC5InnqRDSo2U11la48vCCIjjY=", "narHash": "sha256-8QX7Ab5CcICp7zktL47VQVS+QeaU4YDNAjzty7l7TQE=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "6f3efef888b92e6520f10eae15b86ff537e1d2ea", "rev": "5feeaeefb571e6ca2700888b944f436f7c05149b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -406,11 +406,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1754988908, "lastModified": 1757449901,
"narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", "narHash": "sha256-qwN8nYdSRnmmyyi+uR6m4gXnVktmy5smG1MOrSFD8PI=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", "rev": "3b4a369df9dd6ee171a7ea4448b50e2528faf850",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -472,11 +472,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1756827929, "lastModified": 1757256304,
"narHash": "sha256-HQiCt9TTEZ33lOnmXdmGr3A/hLOwk35CPa5idW95/ko=", "narHash": "sha256-qANK2Hwhi4Nbpcsy6lunncyt725gthaSX/0dLluBxtw=",
"owner": "dj95", "owner": "dj95",
"repo": "zjstatus", "repo": "zjstatus",
"rev": "16db007a56958a44dc940876b4f23824daa81809", "rev": "e2ea91819408f0b0dd7ee15249341cace6eb09cc",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -4,7 +4,7 @@
package = pkgs.ghostty-bin; package = pkgs.ghostty-bin;
settings = { settings = {
command = "${pkgs.fish}/bin/fish"; command = "${pkgs.fish}/bin/fish";
theme = "catppuccin-latte"; theme = "catppuccin-mocha";
window-padding-x = 8; window-padding-x = 8;
window-padding-y = 2; window-padding-y = 2;
window-padding-balance = true; window-padding-balance = true;

View File

@@ -2,18 +2,18 @@
programs.bat = { programs.bat = {
enable = true; enable = true;
config = { config = {
theme = "Catppuccin Latte"; theme = "Catppuccin Mocha";
pager = "ov"; pager = "ov";
}; };
themes = { themes = {
"Catppuccin Latte" = { "Catppuccin Mocha" = {
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "catppuccin"; owner = "catppuccin";
repo = "bat"; repo = "bat";
rev = "6810349b28055dce54076712fc05fc68da4b8ec0"; rev = "6810349b28055dce54076712fc05fc68da4b8ec0";
sha256 = "lJapSgRVENTrbmpVyn+UQabC9fpV1G1e+CdlJ090uvg="; sha256 = "lJapSgRVENTrbmpVyn+UQabC9fpV1G1e+CdlJ090uvg=";
}; };
file = "themes/Catppuccin Latte.tmTheme"; file = "themes/Catppuccin Mocha.tmTheme";
}; };
}; };
}; };

View File

@@ -40,7 +40,7 @@
set fish_pager_color_completion 4c4f69 set fish_pager_color_completion 4c4f69
set fish_pager_color_description 9ca0b0 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 for mode in default insert
bind --mode $mode \cp open_project bind --mode $mode \cp open_project

View File

@@ -21,7 +21,7 @@
colorschemes.catppuccin = { colorschemes.catppuccin = {
enable = true; enable = true;
settings = { settings = {
flavour = "latte"; flavour = "mocha";
}; };
}; };
extraConfigLua = '' extraConfigLua = ''

View File

@@ -7,7 +7,7 @@
enable = true; enable = true;
enableFishIntegration = lib.mkDefault false; enableFishIntegration = lib.mkDefault false;
settings = { settings = {
theme = "catppuccin-latte"; theme = "catppuccin-mocha";
default_layout = "default"; default_layout = "default";
default_shell = "${pkgs.fish}/bin/fish"; default_shell = "${pkgs.fish}/bin/fish";
pane_frames = false; pane_frames = false;

View File

@@ -2,6 +2,7 @@
with pkgs; [ with pkgs; [
(callPackage ./bin/open-project.nix {}) (callPackage ./bin/open-project.nix {})
age age
rclone
alejandra alejandra
ast-grep ast-grep
delta delta