diff --git a/flake.lock b/flake.lock index 6a18788..13cdcc4 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1758805352, - "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=", + "lastModified": 1760338583, + "narHash": "sha256-IGwy02SH5K2hzIFrKMRsCmyvwOwWxrcquiv4DbKL1S4=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c", + "rev": "9a9ab01072f78823ca627ae5e895e40d493c3ecf", "type": "github" }, "original": { @@ -135,11 +135,11 @@ ] }, "locked": { - "lastModified": 1759853171, - "narHash": "sha256-uqbhyXtqMbYIiMqVqUhNdSuh9AEEkiasoK3mIPIVRhk=", + "lastModified": 1760662441, + "narHash": "sha256-mlDqR1Ntgs9uYYEAUR1IhamKBO0lxoNS4zGLzEZaY0A=", "owner": "nix-community", "repo": "home-manager", - "rev": "1a09eb84fa9e33748432a5253102d01251f72d6d", + "rev": "722792af097dff5790f1a66d271a47759f477755", "type": "github" }, "original": { @@ -151,11 +151,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1759997506, - "narHash": "sha256-dqWvB1CJI7ksD3ldqPwWjqM3WTTCEuqyGG8XumN8V5c=", + "lastModified": 1760703225, + "narHash": "sha256-q9alpWmedZqTO5nl2S5GuNEm8SbjuibvBnT3kt4zIKI=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "1ca8a5fabd35f99eb93af95f76320205cc99be01", + "rev": "d9a53b2c8bb0b4095a9e0be2998cefcc0b3a3aa1", "type": "github" }, "original": { @@ -167,11 +167,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1759987268, - "narHash": "sha256-SfR2OvP6Qu+G4u8Omo1jw4pWZhXeevRq86+2nliCuPo=", + "lastModified": 1760707405, + "narHash": "sha256-ovFp9eWROR7hICGgKjYeE8ZylfzP+KZonJEHKwDJ2tU=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "950458f1c06229ddb0aaaf57108ad125cf23f5f4", + "rev": "8e3618364deca5dbe5d8cd13041fb4607987b9a0", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759997385, - "narHash": "sha256-wRxqHCD0iW+jsWa2hE1HinF90iz7+dfL/T9SA3hoH/E=", + "lastModified": 1760707603, + "narHash": "sha256-0DCv7QkS2MwvFmGKVy7EsCT6dhZ1ZIWinc0ZhIGDbC4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f16815c7683f77a7cd8f204d9d1aca84f5908f6f", + "rev": "f16557b212ea1ecc9f32e06a523fa03b2a51e165", "type": "github" }, "original": { @@ -297,11 +297,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1759927289, - "narHash": "sha256-EWdwR9l+JG466rPuNmjjzDPvQAuh37lmhgWa2xeaMdk=", + "lastModified": 1760616351, + "narHash": "sha256-z6+MKQBXfeZTdUK+PXbmBydaUuJK+k3iFnTanRvdkXg=", "owner": "nix-community", "repo": "nixvim", - "rev": "57006a3ace4a3c889ab61b70fd5d8b197de8314e", + "rev": "5275e258bf89e4947409ba36e362031ca491c67c", "type": "github" }, "original": { @@ -375,11 +375,11 @@ ] }, "locked": { - "lastModified": 1759635238, - "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=", + "lastModified": 1760393368, + "narHash": "sha256-8mN3kqyqa2PKY0wwZ2UmMEYMcxvNTwLaOrrDsw6Qi4E=", "owner": "Mic92", "repo": "sops-nix", - "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133", + "rev": "ab8d56e85b8be14cff9d93735951e30c3e86a437", "type": "github" }, "original": { diff --git a/modules/darwin/home/ghostty.nix b/modules/darwin/home/ghostty.nix index 1652680..e3ea233 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 Mocha"; + theme = "Catppuccin Latte"; 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 e3a6bdf..1a05450 100644 --- a/modules/home/bat.nix +++ b/modules/home/bat.nix @@ -2,18 +2,18 @@ programs.bat = { enable = true; config = { - theme = "Catppuccin Mocha"; + theme = "Catppuccin Latte"; pager = "ov"; }; themes = { - "Catppuccin Mocha" = { + "Catppuccin Latte" = { src = pkgs.fetchFromGitHub { owner = "catppuccin"; repo = "bat"; rev = "6810349b28055dce54076712fc05fc68da4b8ec0"; sha256 = "lJapSgRVENTrbmpVyn+UQabC9fpV1G1e+CdlJ090uvg="; }; - file = "themes/Catppuccin Mocha.tmTheme"; + file = "themes/Catppuccin Latte.tmTheme"; }; }; }; diff --git a/modules/home/fish.nix b/modules/home/fish.nix index 6b100f6..b5f1dc2 100644 --- a/modules/home/fish.nix +++ b/modules/home/fish.nix @@ -13,38 +13,38 @@ interactiveShellInit = '' set fish_greeting - set fish_color_normal cdd6f4 - set fish_color_command 89b4fa - set fish_color_param f2cdcd - set fish_color_keyword f38ba8 - set fish_color_quote a6e3a1 - set fish_color_redirection f5c2e7 - set fish_color_end fab387 - set fish_color_comment 7f849c - set fish_color_error f38ba8 - set fish_color_gray 6c7086 - set fish_color_selection --background=313244 - set fish_color_search_match --background=313244 - set fish_color_option a6e3a1 - set fish_color_operator f5c2e7 - set fish_color_escape eba0ac - set fish_color_autosuggestion 6c7086 - set fish_color_cancel f38ba8 - set fish_color_cwd f9e2af - set fish_color_user 94e2d5 - set fish_color_host 89b4fa - set fish_color_host_remote a6e3a1 - set fish_color_status f38ba8 - set fish_pager_color_progress 6c7086 - set fish_pager_color_prefix f5c2e7 - set fish_pager_color_completion cdd6f4 - set fish_pager_color_description 6c7086 + set fish_color_normal 4c4f69 + set fish_color_command 1e66f5 + set fish_color_param dd7878 + set fish_color_keyword d20f39 + set fish_color_quote 40a02b + set fish_color_redirection ea76cb + set fish_color_end fe640b + set fish_color_comment 8c8fa1 + set fish_color_error d20f39 + set fish_color_gray 9ca0b0 + set fish_color_selection --background=ccd0da + set fish_color_search_match --background=ccd0da + set fish_color_option 40a02b + set fish_color_operator ea76cb + set fish_color_escape e64553 + set fish_color_autosuggestion 9ca0b0 + set fish_color_cancel d20f39 + set fish_color_cwd df8e1d + set fish_color_user 179299 + set fish_color_host 1e66f5 + set fish_color_host_remote 40a02b + set fish_color_status d20f39 + set fish_pager_color_progress 9ca0b0 + set fish_pager_color_prefix ea76cb + set fish_pager_color_completion 4c4f69 + set fish_pager_color_description 9ca0b0 - set -gx LS_COLORS "$(vivid generate catppuccin-mocha)" + set -gx LS_COLORS "$(vivid generate catppuccin-latte)" set -gx COLORTERM truecolor set -gx COLORFGBG "15;0" - set -gx TERM_BACKGROUND dark + set -gx TERM_BACKGROUND light for mode in default insert bind --mode $mode \cp open_project diff --git a/modules/home/lazygit.nix b/modules/home/lazygit.nix index e2d8fe3..0816891 100644 --- a/modules/home/lazygit.nix +++ b/modules/home/lazygit.nix @@ -6,42 +6,42 @@ commit.signOff = true; paging = { colorArg = "always"; - pager = "DELTA_FEATURES=decorations delta --dark --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format=\"lazygit-edit://{path}:{line}\""; + pager = "DELTA_FEATURES=decorations delta --light --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format=\"lazygit-edit://{path}:{line}\""; }; }; gui = { authorColors = { - "*" = "#b4befe"; + "*" = "#7287fd"; }; theme = { activeBorderColor = [ - "#cba6f7" + "#8839ef" "bold" ]; inactiveBorderColor = [ - "#a6adc8" + "#6c6f85" ]; optionsTextColor = [ - "#89b4fa" + "#1e66f5" ]; selectedLineBgColor = [ - "#313244" + "#ccd0da" ]; cherryPickedCommitBgColor = [ - "#45475a" + "#bcc0cc" ]; cherryPickedCommitFgColor = [ - "#cba6f7" + "#8839ef" ]; defaultFgColor = [ - "#cdd6f4" + "#4c4f69" ]; searchingActiveBorderColor = [ - "#f9e2af" + "#df8e1d" ]; unstagedChangesColor = [ - "#f38ba8" + "#d20f39" ]; }; }; diff --git a/modules/home/neovim/default.nix b/modules/home/neovim/default.nix index dc030b5..e199c5a 100644 --- a/modules/home/neovim/default.nix +++ b/modules/home/neovim/default.nix @@ -24,7 +24,7 @@ colorschemes.catppuccin = { enable = true; settings = { - flavour = "mocha"; + flavour = "latte"; }; }; extraConfigLua = '' diff --git a/modules/home/starship.nix b/modules/home/starship.nix index 85c4e27..cf9dde5 100644 --- a/modules/home/starship.nix +++ b/modules/home/starship.nix @@ -7,8 +7,8 @@ command_timeout = 200; format = "$directory$git_branch$git_commit$git_status$git_state$git_metrics\n$character"; character = { - error_symbol = "[✗ ](bold #e64553)"; - success_symbol = "[❯](bold #40a02b)[❯](bold #df8e1d)[❯](bold #dc8a78)"; + error_symbol = "[✗ ](bold #d20f39)"; + success_symbol = "[❯](bold #40a02b)[❯](bold #df8e1d)[❯](bold #179299)"; }; directory = { truncation_length = 2; @@ -19,7 +19,7 @@ git_branch = { format = " @[$branch(:$remote_branch)]($style)"; symbol = ""; - style = "bold #a6e3a1"; + style = "bold #40a02b"; truncation_length = 28; }; git_commit = { @@ -27,11 +27,11 @@ only_detached = false; tag_disabled = true; format = " [$hash]($style)"; - style = "bold #89b4fa"; + style = "bold #1e66f5"; }; git_status = { format = " [$ahead_behind$staged$modified$renamed$deleted$typechanged$untracked$stashed$conflicted]($style)"; - style = "bold #f9e2af"; + style = "bold #df8e1d"; ahead = " a+$count"; behind = " b+$count"; diverged = " div:$ahead_count/$behind_count"; @@ -46,7 +46,7 @@ }; git_state = { format = " {$state($progress_current/$progress_total)}($style)"; - style = "bold #f38ba8"; + style = "bold #d20f39"; }; git_metrics = { disabled = false; diff --git a/modules/home/zellij.nix b/modules/home/zellij.nix index d859299..8a8b789 100644 --- a/modules/home/zellij.nix +++ b/modules/home/zellij.nix @@ -3,18 +3,21 @@ pkgs, ... }: { - programs.zellij = { - enable = true; - enableFishIntegration = lib.mkDefault false; - settings = { - theme = "catppuccin-mocha"; - default_layout = "default"; - default_shell = "${pkgs.fish}/bin/fish"; - pane_frames = false; - show_startup_tips = false; - show_release_notes = false; + programs.zellij = + { + enable = true; + settings = { + theme = "catppuccin-latte"; + default_layout = "default"; + default_shell = "${pkgs.fish}/bin/fish"; + pane_frames = false; + show_startup_tips = false; + show_release_notes = false; + }; + } + // lib.optionalAttrs pkgs.stdenv.isLinux { + enableFishIntegration = true; }; - }; xdg.configFile."zellij/layouts/default.kdl".text = '' layout { @@ -27,26 +30,26 @@ plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" { hide_frame_for_single_pane "true" - format_left "{mode}#[fg=#89b4fa,bg=#1e1e2e,bold] {session}#[bg=#1e1e2e] {tabs}" + format_left "{mode}#[fg=#1e66f5,bg=#eff1f5,bold] {session}#[bg=#eff1f5] {tabs}" format_right "{datetime}" - format_space "#[bg=#1e1e2e]" + format_space "#[bg=#eff1f5]" - mode_normal "#[fg=#1e1e2e,bg=#89b4fa] " - mode_locked "#[fg=#1e1e2e,bg=#fab387] L " - mode_tab "#[fg=#1e1e2e,bg=#a6e3a1] T " - mode_pane "#[fg=#1e1e2e,bg=#cba6f7] P " - mode_session "#[fg=#1e1e2e,bg=#94e2d5] S " - mode_resize "#[fg=#1e1e2e,bg=#f9e2af] R " - mode_move "#[fg=#1e1e2e,bg=#f5c2e7] M " - mode_search "#[fg=#1e1e2e,bg=#f38ba8] S " + mode_normal "#[fg=#eff1f5,bg=#1e66f5] " + mode_locked "#[fg=#eff1f5,bg=#fe640b] L " + mode_tab "#[fg=#eff1f5,bg=#40a02b] T " + mode_pane "#[fg=#eff1f5,bg=#8839ef] P " + mode_session "#[fg=#eff1f5,bg=#04a5e5] S " + mode_resize "#[fg=#eff1f5,bg=#df8e1d] R " + mode_move "#[fg=#eff1f5,bg=#ea76cb] M " + mode_search "#[fg=#eff1f5,bg=#d20f39] S " - tab_normal "#[fg=#6c7086,bg=#1e1e2e] {index} {name} {fullscreen_indicator}{sync_indicator}{floating_indicator}" - tab_active "#[fg=#1e1e2e,bg=#89b4fa,bold,underline] {index} {name} {fullscreen_indicator}{sync_indicator}{floating_indicator}" + tab_normal "#[fg=#acb0be,bg=#eff1f5] {index} {name} {fullscreen_indicator}{sync_indicator}{floating_indicator}" + tab_active "#[fg=#eff1f5,bg=#1e66f5,bold,underline] {index} {name} {fullscreen_indicator}{sync_indicator}{floating_indicator}" tab_fullscreen_indicator "□ " tab_sync_indicator " " tab_floating_indicator "󰉈 " - datetime "#[fg=#cdd6f4,bg=#1e1e2e] {format} " + datetime "#[fg=#4c4f69,bg=#eff1f5] {format} " datetime_format "%A, %d %b %Y %H:%M" datetime_timezone "Europe/Berlin" } diff --git a/modules/packages.nix b/modules/packages.nix index 370303f..8d12954 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -2,7 +2,6 @@ with pkgs; [ (callPackage ./bin/open-project.nix {}) age - codex amp-cli alejandra ast-grep