diff options
| -rw-r--r-- | doom/.config/doom/themes/noctalia-theme.el | 128 | ||||
| -rw-r--r-- | foot/.config/foot/themes/noctalia | 42 | ||||
| -rw-r--r-- | ghostty/.config/ghostty/themes/noctalia | 44 | ||||
| -rw-r--r-- | niri/.config/niri/noctalia.kdl | 24 | ||||
| -rw-r--r-- | nixos/hosts/opus/default.nix | 8 | ||||
| -rw-r--r-- | nixos/modules/features/desktop-apps/default.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/features/dev-tools/default.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/users/default.nix | 13 | ||||
| -rw-r--r-- | starship/.config/starship.toml | 64 |
9 files changed, 167 insertions, 160 deletions
diff --git a/doom/.config/doom/themes/noctalia-theme.el b/doom/.config/doom/themes/noctalia-theme.el index 40af247..ed309c1 100644 --- a/doom/.config/doom/themes/noctalia-theme.el +++ b/doom/.config/doom/themes/noctalia-theme.el @@ -21,75 +21,75 @@ (deftheme noctalia "Theme using Template variables with quality of life improvements.") ;; Define all the color variables (replaced by template processor) -(let* ((bg "#fff8f0") - (err "#ba1a1a") - (err-container "#ffdad6") - (on-background "#1e1b13") - (on-err "#ffffff") - (on-err-container "#93000a") - (on-primary "#ffffff") - (on-primary-container "#fffbff") - (on-secondary "#ffffff") - (on-secondary-container "#706134") - (on-surface "#1e1b13") - (on-surface-variant "#4d4636") - (on-tertiary "#ffffff") - (on-tertiary-container "#faffe9") - (outline-color "#7e7664") - (outline-variant "#cfc6b0") - (primary "#6f5a00") - (primary-container "#8d7200") - (secondary "#6c5d31") - (secondary-container "#f3dea6") +(let* ((bg "#13140f") + (err "#ffb4ab") + (err-container "#93000a") + (on-background "#e4e3db") + (on-err "#690005") + (on-err-container "#ffdad6") + (on-primary "#243603") + (on-primary-container "#fffff4") + (on-secondary "#2b331c") + (on-secondary-container "#afb999") + (on-surface "#e4e3db") + (on-surface-variant "#c5c8b9") + (on-tertiary "#003826") + (on-tertiary-container "#ffffff") + (outline-color "#8f9284") + (outline-variant "#45483d") + (primary "#b7cf8b") + (primary-container "#677d42") + (secondary "#c1cbaa") + (secondary-container "#414a31") (shadow "#000000") - (surface "#fff8f0") - (surface-container "#f5ede0") - (surface-container-high "#efe7da") - (surface-container-highest "#e9e2d5") - (surface-container-low "#fbf3e5") - (surface-container-lowest "#ffffff") - (surface-variant "#ece2cb") - (tertiary "#456512") - (tertiary-container "#5d7f2a") + (surface "#13140f") + (surface-container "#1f201b") + (surface-container-high "#292a25") + (surface-container-highest "#343530") + (surface-container-low "#1b1c17") + (surface-container-lowest "#0d0f0a") + (surface-variant "#45483d") + (tertiary "#92d4b5") + (tertiary-container "#418267") ;; Map success colors to tertiary (as used in other templates) - (success "#456512") - (on-success "#ffffff") - (success-container "#5d7f2a") - (on-success-container "#faffe9") + (success "#92d4b5") + (on-success "#003826") + (success-container "#418267") + (on-success-container "#ffffff") ;; Map fixed colors to regular colors - (primary-fixed "#6f5a00") - (primary-fixed-dim "#8d7200") - (secondary-fixed "#6c5d31") - (secondary-fixed-dim "#f3dea6") - (tertiary-fixed "#456512") - (tertiary-fixed-dim "#5d7f2a") - (on-primary-fixed "#ffffff") - (on-primary-fixed-variant "#fffbff") - (on-secondary-fixed "#ffffff") - (on-secondary-fixed-variant "#706134") - (on-tertiary-fixed "#ffffff") - (on-tertiary-fixed-variant "#faffe9") + (primary-fixed "#b7cf8b") + (primary-fixed-dim "#677d42") + (secondary-fixed "#c1cbaa") + (secondary-fixed-dim "#414a31") + (tertiary-fixed "#92d4b5") + (tertiary-fixed-dim "#418267") + (on-primary-fixed "#243603") + (on-primary-fixed-variant "#fffff4") + (on-secondary-fixed "#2b331c") + (on-secondary-fixed-variant "#afb999") + (on-tertiary-fixed "#003826") + (on-tertiary-fixed-variant "#ffffff") ;; Map inverse colors to surface variants - (inverse-on-surface "#1e1b13") - (inverse-primary "#6f5a00") - (inverse-surface "#fff8f0") + (inverse-on-surface "#e4e3db") + (inverse-primary "#b7cf8b") + (inverse-surface "#13140f") ;; ANSI terminal colors - (term0 "#ece2cb") - (term1 "#ba1a1a") - (term2 "#6f5a00") - (term3 "#6c5d31") - (term4 "#456512") - (term5 "#8b7000") - (term6 "#83713e") - (term7 "#1e1b13") - (term8 "#7e7664") - (term9 "#ba1a1a") - (term10 "#6f5a00") - (term11 "#6c5d31") - (term12 "#456512") - (term13 "#8b7000") - (term14 "#83713e") - (term15 "#1e1b13")) + (term0 "#45483d") + (term1 "#ffb4ab") + (term2 "#b7cf8b") + (term3 "#c1cbaa") + (term4 "#92d4b5") + (term5 "#b7cf8b") + (term6 "#c1cbaa") + (term7 "#e4e3db") + (term8 "#8f9284") + (term9 "#ffb4ab") + (term10 "#b7cf8b") + (term11 "#c1cbaa") + (term12 "#92d4b5") + (term13 "#b7cf8b") + (term14 "#c1cbaa") + (term15 "#e4e3db")) (custom-theme-set-faces 'noctalia diff --git a/foot/.config/foot/themes/noctalia b/foot/.config/foot/themes/noctalia index 99b63ae..8917d70 100644 --- a/foot/.config/foot/themes/noctalia +++ b/foot/.config/foot/themes/noctalia @@ -1,22 +1,22 @@ [colors-dark] -foreground=1e1b13 -background=fff8f0 -regular0=ece2cb -regular1=ba1a1a -regular2=6f5a00 -regular3=6c5d31 -regular4=456512 -regular5=8b7000 -regular6=83713e -regular7=1e1b13 -bright0=7e7664 -bright1=ba1a1a -bright2=6f5a00 -bright3=6c5d31 -bright4=456512 -bright5=8b7000 -bright6=83713e -bright7=1e1b13 -selection-foreground=4d4636 -selection-background=ece2cb -cursor=fff8f0 1e1b13 +foreground=e4e3db +background=13140f +regular0=45483d +regular1=ffb4ab +regular2=b7cf8b +regular3=c1cbaa +regular4=92d4b5 +regular5=b7cf8b +regular6=c1cbaa +regular7=e4e3db +bright0=8f9284 +bright1=ffb4ab +bright2=b7cf8b +bright3=c1cbaa +bright4=92d4b5 +bright5=b7cf8b +bright6=c1cbaa +bright7=e4e3db +selection-foreground=c5c8b9 +selection-background=45483d +cursor=13140f e4e3db diff --git a/ghostty/.config/ghostty/themes/noctalia b/ghostty/.config/ghostty/themes/noctalia index 77ebbaf..4979304 100644 --- a/ghostty/.config/ghostty/themes/noctalia +++ b/ghostty/.config/ghostty/themes/noctalia @@ -1,22 +1,22 @@ -palette = 0=#ece2cb -palette = 1=#ba1a1a -palette = 2=#6f5a00 -palette = 3=#6c5d31 -palette = 4=#456512 -palette = 5=#8b7000 -palette = 6=#83713e -palette = 7=#1e1b13 -palette = 8=#7e7664 -palette = 9=#ba1a1a -palette = 10=#6f5a00 -palette = 11=#6c5d31 -palette = 12=#456512 -palette = 13=#8b7000 -palette = 14=#83713e -palette = 15=#1e1b13 -background = #fff8f0 -foreground = #1e1b13 -cursor-color = #1e1b13 -cursor-text = #fff8f0 -selection-background = #ece2cb -selection-foreground = #4d4636 +palette = 0=#45483d +palette = 1=#ffb4ab +palette = 2=#b7cf8b +palette = 3=#c1cbaa +palette = 4=#92d4b5 +palette = 5=#b7cf8b +palette = 6=#c1cbaa +palette = 7=#e4e3db +palette = 8=#8f9284 +palette = 9=#ffb4ab +palette = 10=#b7cf8b +palette = 11=#c1cbaa +palette = 12=#92d4b5 +palette = 13=#b7cf8b +palette = 14=#c1cbaa +palette = 15=#e4e3db +background = #13140f +foreground = #e4e3db +cursor-color = #e4e3db +cursor-text = #13140f +selection-background = #45483d +selection-foreground = #c5c8b9 diff --git a/niri/.config/niri/noctalia.kdl b/niri/.config/niri/noctalia.kdl index 2c6ffc5..f818300 100644 --- a/niri/.config/niri/noctalia.kdl +++ b/niri/.config/niri/noctalia.kdl @@ -1,15 +1,15 @@ layout { focus-ring { - active-color "#6f5a00" - inactive-color "#fff8f0" - urgent-color "#ba1a1a" + active-color "#b7cf8b" + inactive-color "#13140f" + urgent-color "#ffb4ab" } border { - active-color "#6f5a00" - inactive-color "#fff8f0" - urgent-color "#ba1a1a" + active-color "#b7cf8b" + inactive-color "#13140f" + urgent-color "#ffb4ab" } shadow { @@ -17,19 +17,19 @@ layout { } tab-indicator { - active-color "#6f5a00" - inactive-color "#8d7200" - urgent-color "#ba1a1a" + active-color "#b7cf8b" + inactive-color "#677d42" + urgent-color "#ffb4ab" } insert-hint { - color "#6f5a0080" + color "#b7cf8b80" } } recent-windows { highlight { - active-color "#6f5a00" - urgent-color "#ba1a1a" + active-color "#b7cf8b" + urgent-color "#ffb4ab" } } diff --git a/nixos/hosts/opus/default.nix b/nixos/hosts/opus/default.nix index 0372cb9..d1d65e0 100644 --- a/nixos/hosts/opus/default.nix +++ b/nixos/hosts/opus/default.nix @@ -43,6 +43,12 @@ ]; # ──────────────────────────────────────────────────────────────────────── + # Shell composition + # ──────────────────────────────────────────────────────────────────────── + # This properly installs ZSH, sets up vendor completions, and configures standard paths. + programs.zsh.enable = true; + + # ──────────────────────────────────────────────────────────────────────── # Desktop composition (was attrs/desktop) # Inline because this host is the only one using the full desktop stack. # ──────────────────────────────────────────────────────────────────────── @@ -60,7 +66,6 @@ }; environment.sessionVariables = { - SHELL = "${pkgs.fish}/bin/fish"; XCURSOR_THEME = "Bibata-Modern-Ice"; XCURSOR_SIZE = "20"; CC = "clang"; @@ -80,6 +85,7 @@ remotePlay.openFirewall = true; dedicatedServer.openFirewall = true; }; + programs.throne = { enable = true; tunMode.enable = true; diff --git a/nixos/modules/features/desktop-apps/default.nix b/nixos/modules/features/desktop-apps/default.nix index 527a350..385af11 100644 --- a/nixos/modules/features/desktop-apps/default.nix +++ b/nixos/modules/features/desktop-apps/default.nix @@ -19,5 +19,7 @@ obs-studio pkgs.qbittorrent pkgs.masterpdfeditor + mullvad-browser + librewolf ]; } diff --git a/nixos/modules/features/dev-tools/default.nix b/nixos/modules/features/dev-tools/default.nix index ad10afd..6b20cf7 100644 --- a/nixos/modules/features/dev-tools/default.nix +++ b/nixos/modules/features/dev-tools/default.nix @@ -11,7 +11,7 @@ gnumake nodejs pyright - python3 + (python3.withPackages (ps: with ps; [ pip ])) rust-analyzer rustc lua5_4 diff --git a/nixos/modules/system/users/default.nix b/nixos/modules/system/users/default.nix index 19c2b56..f43149d 100644 --- a/nixos/modules/system/users/default.nix +++ b/nixos/modules/system/users/default.nix @@ -4,7 +4,7 @@ users.users."seraphim" = { isNormalUser = true; description = "seraphim"; - shell = pkgs.fish; + shell = pkgs.zsh; extraGroups = [ "networkmanager" "wheel" ]; packages = with pkgs; []; }; @@ -20,11 +20,16 @@ ]; }; - programs.fish = { + programs.zsh = { enable = true; + enableCompletion = true; + autosuggestions = { + enable = true; + highlightStyle = "fg=#6c7086"; + }; interactiveShellInit = '' - set -g fish_greeting "" - fzf --fish | source + source ${pkgs.fzf}/share/fzf/key-bindings.zsh + source ${pkgs.fzf}/share/fzf/completion.zsh ''; shellAliases = { ls = "eza -al --icons=auto"; diff --git a/starship/.config/starship.toml b/starship/.config/starship.toml index 201392b..009b3fa 100644 --- a/starship/.config/starship.toml +++ b/starship/.config/starship.toml @@ -45,53 +45,47 @@ stashed = "" staged = "" renamed = "" deleted = "" + # >>> NOCTALIA STARSHIP PALETTE >>> # Noctalia Starship Palette # Generated by Noctalia - do not edit manually -[palettes.noctalia] +[palettes.noctalia] # Standard colors -blue = "#d1c2d2" +blue = "#92d4b5" red = "#ffb4ab" -green = "#bbc8d0" -yellow = "#c3c7ca" -cyan = "#c3c7ca" -magenta = "#bbc8d0" -white = "#e4e2e2" -black = "#43474a" - - +green = "#b7cf8b" +yellow = "#c1cbaa" +cyan = "#c1cbaa" +magenta = "#b7cf8b" +white = "#e4e3db" +black = "#45483d" # Extended palette (Catppuccin-compatible names) -rosewater = "#c3c7ca" +rosewater = "#c1cbaa" flamingo = "#ffb4ab" -pink = "#bbc8d0" -mauve = "#bbc8d0" +pink = "#b7cf8b" +mauve = "#b7cf8b" maroon = "#ffb4ab" -peach = "#c3c7ca" -teal = "#c3c7ca" -sky = "#c3c7ca" -sapphire = "#d1c2d2" -lavender = "#bbc8d0" +peach = "#c1cbaa" +teal = "#c1cbaa" +sky = "#c1cbaa" +sapphire = "#92d4b5" +lavender = "#b7cf8b" # Text shades -text = "#e4e2e2" -subtext1 = "#e4e2e2" -subtext0 = "#8d9194" +text = "#e4e3db" +subtext1 = "#e4e3db" +subtext0 = "#8f9284" # Surface shades -overlay2 = "#8d9194" -overlay1 = "#8d9194" -overlay0 = "#43474a" -surface2 = "#43474a" -surface1 = "#43474a" -surface0 = "#131314" -base = "#131314" -mantle = "#131314" -crust = "#131314" - +overlay2 = "#8f9284" +overlay1 = "#8f9284" +overlay0 = "#45483d" +surface2 = "#45483d" +surface1 = "#45483d" +surface0 = "#13140f" +base = "#13140f" +mantle = "#13140f" +crust = "#13140f" # <<< NOCTALIA STARSHIP PALETTE <<< - - - - |
