From 0e9fefbf640867283d47b4fd27b29a283714a7a6 Mon Sep 17 00:00:00 2001 From: death916 Date: Tue, 23 Dec 2025 01:17:12 -0800 Subject: [PATCH 01/43] flake update --- flake.lock | 78 +++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index d90a71b..ecfbc55 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1764714051, - "narHash": "sha256-AjcMlM3UoavFoLzr0YrcvsIxALShjyvwe+o7ikibpCM=", + "lastModified": 1765900596, + "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a43bedcceced5c21ad36578ed823e6099af78214", + "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace", "type": "github" }, "original": { @@ -110,11 +110,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1765490355, - "narHash": "sha256-3u7e7MDLv+BB43njIDySRjsqN+VQ4L0o84OTPM1Irk0=", + "lastModified": 1766171696, + "narHash": "sha256-A7Re9iWSDTtsRnYenr53VMgr3vMP8/PBcPgi2nbKG+k=", "owner": "flox", "repo": "flox", - "rev": "f61bb537a31f866b03533d691796c74fb95f682a", + "rev": "f4bba944fc14562fd29c5164436b61a7fbb1d88d", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1765384171, - "narHash": "sha256-FuFtkJrW1Z7u+3lhzPRau69E0CNjADku1mLQQflUORo=", + "lastModified": 1766292113, + "narHash": "sha256-sWTtmkQujRpjWYCnZc8LWdDiCzrRlSBPrGovkZpLkBI=", "owner": "nix-community", "repo": "home-manager", - "rev": "44777152652bc9eacf8876976fa72cc77ca8b9d8", + "rev": "fdec8815a86db36f42fc9c8cb2931cd8485f5aed", "type": "github" }, "original": { @@ -263,11 +263,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1765497587, - "narHash": "sha256-5y9GUuRo3mjCk3gzR73kQy9trbS8vJ5fv7d7bGBSoyE=", + "lastModified": 1766422408, + "narHash": "sha256-eWwTRcHCo2E1RwUKn4NcBrI9P8OCSEwBRhCp8/MJrbI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "8dfdcfb35385eabb821e668d327b30ea3e483ab8", + "rev": "abffe75088e2d776e14e5dbd726a835fa157df9a", "type": "github" }, "original": { @@ -309,11 +309,11 @@ ] }, "locked": { - "lastModified": 1764812575, - "narHash": "sha256-1bK1yGgaR82vajUrt6z+BSljQvFn91D74WJ/vJsydtE=", + "lastModified": 1765643131, + "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "fd321368a40c782cfa299991e5584ca338e36ebe", + "rev": "e50ae912813bdfa8372d62daf454f48d6df02297", "type": "github" }, "original": { @@ -334,11 +334,11 @@ ] }, "locked": { - "lastModified": 1759610243, - "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=", + "lastModified": 1765214753, + "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622", + "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab", "type": "github" }, "original": { @@ -440,11 +440,11 @@ ] }, "locked": { - "lastModified": 1764962281, - "narHash": "sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy+zHsfo=", + "lastModified": 1766160771, + "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "fe686486ac867a1a24f99c753bb40ffed338e4b0", + "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f", "type": "github" }, "original": { @@ -494,11 +494,11 @@ ] }, "locked": { - "lastModified": 1764872015, - "narHash": "sha256-INI9AVrQG5nJZFvGPSiUZ9FEUZJLfGdsqjF1QSak7Gc=", + "lastModified": 1766253200, + "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "7997451dcaab7b9d9d442f18985d514ec5891608", + "rev": "1079777525b30a947c8d657fac158e00ae85de9d", "type": "github" }, "original": { @@ -525,11 +525,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1765186076, - "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", + "lastModified": 1766309749, + "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", + "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", "type": "github" }, "original": { @@ -541,11 +541,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1766070988, + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", "type": "github" }, "original": { @@ -557,11 +557,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1765311797, - "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", + "lastModified": 1766201043, + "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", + "rev": "b3aad468604d3e488d627c0b43984eb60e75e782", "type": "github" }, "original": { @@ -604,11 +604,11 @@ ] }, "locked": { - "lastModified": 1765016596, - "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", + "lastModified": 1765911976, + "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", + "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", "type": "github" }, "original": { @@ -651,11 +651,11 @@ ] }, "locked": { - "lastModified": 1765507345, - "narHash": "sha256-fq34mBLvAgv93EuZjGp7cVV633pxnph9AVuB/Ql5y5Q=", + "lastModified": 1766457837, + "narHash": "sha256-aeBbkQ0HPFNOIsUeEsXmZHXbYq4bG8ipT9JRlCcKHgU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a9471b23bf656d69ceb2d5ddccdc5082d51fc0e3", + "rev": "2c7510a559416d07242621d036847152d970612b", "type": "github" }, "original": { From 0c6f2b302feea4b19e3d08103e021366ef2b8f4f Mon Sep 17 00:00:00 2001 From: death916 Date: Tue, 23 Dec 2025 01:49:02 -0800 Subject: [PATCH 02/43] cosmic unstable --- modules/nixos/laptop/desktop.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/laptop/desktop.nix b/modules/nixos/laptop/desktop.nix index a8d31b8..34ed77b 100644 --- a/modules/nixos/laptop/desktop.nix +++ b/modules/nixos/laptop/desktop.nix @@ -45,6 +45,7 @@ vim wget unstablePkgs.tailscale + unstablePkgs.cosmic-session halloy conda inputs.flox.packages.${pkgs.system}.flox From 5d8ee32bc328ec4f6ea523cff4c87788f6d83b04 Mon Sep 17 00:00:00 2001 From: death916 Date: Tue, 23 Dec 2025 02:01:08 -0800 Subject: [PATCH 03/43] sys76 scheduler --- modules/nixos/laptop/desktop.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/laptop/desktop.nix b/modules/nixos/laptop/desktop.nix index 34ed77b..1816f01 100644 --- a/modules/nixos/laptop/desktop.nix +++ b/modules/nixos/laptop/desktop.nix @@ -25,6 +25,7 @@ services.desktopManager.cosmic.enable = true; # services.displayManager.cosmic-greeter.enable = true; services.desktopManager.cosmic.xwayland.enable = true; + services.system76-scheduler.enable = true; # This is to fix clementine gui not showing up on wayland environment.variables.QT_QPA_PLATFORM = "wayland"; From 4986421b62bc3e9e2806a83fa8f6a3ffb552bd24 Mon Sep 17 00:00:00 2001 From: death916 Date: Tue, 23 Dec 2025 03:30:59 -0800 Subject: [PATCH 04/43] fedistar --- home-manager/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/home.nix b/home-manager/home.nix index c1c87fb..bdddad0 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -98,6 +98,7 @@ in kdePackages.kdeconnect-kde restic-browser cava + fedistar ]; nixpkgs.overlays = [ From ed776c781a7002cfc3f5cad89a7b44d669a58318 Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 02:29:47 -0800 Subject: [PATCH 05/43] hyper qt and yazi --- home-manager/home.nix | 1 + home-manager/hyprland.nix | 5 +++++ modules/nixos/laptop/desktop.nix | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/home-manager/home.nix b/home-manager/home.nix index bdddad0..20673e1 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -99,6 +99,7 @@ in restic-browser cava fedistar + yazi ]; nixpkgs.overlays = [ diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index 4ed8099..99f8276 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -15,6 +15,11 @@ settings = { monitor = ",1920x1080,auto,1"; + env = [ + "QT_QPA_PLATFORM,wayland" + "GDK_BACKEND,wayland,x11" + ]; + exec-once = [ "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" diff --git a/modules/nixos/laptop/desktop.nix b/modules/nixos/laptop/desktop.nix index 1816f01..7310c4e 100644 --- a/modules/nixos/laptop/desktop.nix +++ b/modules/nixos/laptop/desktop.nix @@ -36,8 +36,8 @@ enable = true; xwayland.enable = true; package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; - # portalPackage = - # inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; + portalPackage = + inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; }; environment.systemPackages = with pkgs; [ From 1d04371467289124637a2c2054e69234d9c5220a Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 02:30:12 -0800 Subject: [PATCH 06/43] lazygit --- home-manager/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/home.nix b/home-manager/home.nix index 20673e1..7083820 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -100,6 +100,7 @@ in cava fedistar yazi + lazygit ]; nixpkgs.overlays = [ From fd81cb33083587f93911d3408195dd2115ac3ab3 Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 02:56:24 -0800 Subject: [PATCH 07/43] stylix --- flake.nix | 8 ++ home-manager/home.nix | 1 + home-manager/hyprland.nix | 170 ++++---------------------------------- home-manager/theme.nix | 108 ++++++++++++++++++++++++ 4 files changed, 132 insertions(+), 155 deletions(-) create mode 100644 home-manager/theme.nix diff --git a/flake.nix b/flake.nix index ac535f6..8824b19 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,11 @@ }; flox.url = "github:flox/flox"; hyprland.url = "github:hyprwm/Hyprland"; + + stylix = { + url = "github:nix-community/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = @@ -27,6 +32,7 @@ rust-overlay, flox, hyprland, + stylix, ... }: let @@ -71,6 +77,7 @@ overlays primaryUser hyprland # Pass hyprland to specialArgs + stylix ; unstablePkgs = import nixpkgs-unstable { inherit system; }; }; @@ -96,6 +103,7 @@ home-manager.users.death916 = { imports = [ ./home-manager/home.nix + stylix.homeManagerModules.stylix ]; }; } diff --git a/home-manager/home.nix b/home-manager/home.nix index 7083820..e68980d 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -16,6 +16,7 @@ in imports = [ ../modules/home-manager/common.nix ./hyprland.nix # Add this line to import your Hyprland configuration + ./theme.nix # Import the stylix theme configuration ]; home.username = "death916"; diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index 99f8276..f9d8e57 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -25,7 +25,8 @@ "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "swww init &" "waybar &" - "swww img /home/death916/Pictures/wallpapers/jameswebb1.jpg &" + # Stylix will manage the wallpaper + # "swww img /home/death916/Pictures/wallpapers/jameswebb1.jpg &" "dunst &" "nm-applet --indicator &" "blueman-applet &" @@ -35,8 +36,9 @@ gaps_in = 5; gaps_out = 10; border_size = 2; - "col.active_border" = "rgba(cba6f7ee) rgba(1e66f5ee) 45deg"; - "col.inactive_border" = "rgba(313244aa)"; + # Stylix will manage these + # "col.active_border" = "rgba(cba6f7ee) rgba(1e66f5ee) 45deg"; + # "col.inactive_border" = "rgba(313244aa)"; layout = "dwindle"; }; @@ -287,120 +289,16 @@ }; }; }; - style = '' - @define-color rosewater #f5e0dc; - @define-color flamingo #f2cdcd; - @define-color pink #f5c2e7; - @define-color mauve #cba6f7; - @define-color red #f38ba8; - @define-color maroon #eba0ac; - @define-color peach #fab387; - @define-color yellow #f9e2af; - @define-color green #a6e3a1; - @define-color teal #94e2d5; - @define-color sky #89dceb; - @define-color sapphire #74c7ec; - @define-color blue #89b4fa; - @define-color lavender #b4befe; - - @define-color text #cdd6f4; - @define-color subtext1 #bac2de; - @define-color subtext0 #a6adc8; - @define-color overlay2 #9399b2; - @define-color overlay1 #7f849c; - @define-color overlay0 #6c7086; - @define-color surface2 #585b70; - @define-color surface1 #45475a; - @define-color surface0 #313244; - @define-color base #1e1e2e; - @define-color mantle #181825; - @define-color crust #11111b; - - * { - font-family: "JetBrainsMono Nerd Font", FontAwesome, Roboto, Helvetica, Arial, sans-serif; - font-size: 13px; - } - - window#waybar { - background-color: rgba(17, 17, 27, 0.5); - color: @text; - } - - #workspaces button { - padding: 0 5px; - background-color: transparent; - color: @overlay1; - border-radius: 0; - } - - #workspaces button.active { - color: @lavender; - border-bottom: 2px solid @lavender; - } - - #workspaces button:hover { - background-color: @surface0; - } - - #clock, #battery, #cpu, #memory, #network, #pulseaudio, #tray, #window { - padding: 0 10px; - margin: 3px 4px; - border-radius: 8px; - background-color: @mantle; - } - - #clock { - background-color: @crust; - color: @text; - } - - #battery { - background-color: @crust; - color: @text; - } - - #battery.charging, #battery.plugged { - background-color: @green; - } - - #cpu { - background-color: @crust; - color: @text; - } - - #memory { - background-color: @crust; - color: @text; - } - - #network { - background-color: @crust; - color: @text; - } - - #pulseaudio { - background-color: @crust; - color: @text; - } - - #pulseaudio.muted { - background-color: @surface1; - } - - #custom-wttrbar { - background-color: @crust; - color: @text; - } - ''; + style = config.stylix.waybar.css; }; programs.rofi = { enable = true; - theme = "arthur"; + theme = config.stylix.rofi.theme; extraConfig = { modi = "drun,run,ssh,window"; show-icons = true; - icon-theme = "Papirus-Dark"; + icon-theme = "Papirus-Dark"; # This might be overridden by stylix, but it's good to keep }; }; @@ -425,7 +323,7 @@ padding = 8; horizontal_padding = 8; frame_width = 2; - frame_color = "#cba6f7"; + frame_color = config.stylix.colors.base0C; # Blue accent separator_color = "frame"; word_wrap = true; ellipsize = "middle"; @@ -455,16 +353,16 @@ show_indicators = true; }; urgency_low = { - background = "#1e1e2e"; - foreground = "#cdd6f4"; + background = config.stylix.colors.base00; + foreground = config.stylix.colors.base05; }; urgency_normal = { - background = "#1e1e2e"; - foreground = "#cdd6f4"; + background = config.stylix.colors.base00; + foreground = config.stylix.colors.base05; }; urgency_critical = { - background = "#f38ba8"; - foreground = "#1e1e2e"; + background = config.stylix.colors.base08; # Red accent + foreground = config.stylix.colors.base00; }; }; }; @@ -473,44 +371,6 @@ enable = true; }; - gtk = { - enable = true; - gtk3 = { - extraConfig = { - gtk-application-prefer-dark-theme = 1; - }; - }; - - gtk4 = { - extraConfig = { - gtk-application-prefer-dark-theme = 1; - }; - }; - - theme = { - name = "Materia-dark"; - package = pkgs.materia-theme; - }; - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.papirus-icon-theme; - }; - cursorTheme = { - name = "Catppuccin-Mocha-Dark-Cursors"; - package = pkgs.catppuccin-cursors; - size = 24; - }; - }; - - qt = { - enable = true; - platformTheme.name = "qt5ct"; - }; - - home.sessionVariables = { - QT_STYLE_OVERRIDE = "qt5ct"; - }; - fonts.fontconfig.enable = true; home.packages = with pkgs; [ nerd-fonts.jetbrains-mono diff --git a/home-manager/theme.nix b/home-manager/theme.nix new file mode 100644 index 0000000..d00afe7 --- /dev/null +++ b/home-manager/theme.nix @@ -0,0 +1,108 @@ +{ config, pkgs, ... }: + +{ + stylix.enable = true; + + stylix.wallpaper.paths = [ "/home/death916/Pictures/wallpapers/jameswebb1.jpg" ]; + stylix.wallpaper.mode = "fill"; # Or "stretch", "zoom", "fit" + + stylix.colors = { + # Base colors (dark to light) + base00 = "#0f0f0f"; # background + base01 = "#1a1a1a"; # slightly lighter background for elements (generated) + base02 = "#706a6a"; # bright_black (for secondary elements, borders) + base03 = "#808080"; # comments/less prominent text (generated) + base04 = "#b0b0b0"; # dim foreground (generated) + base05 = "#eadccc"; # foreground + base06 = "#f0f0f0"; # brighter foreground (generated) + base07 = "#ffffff"; # white (pure white for contrast) + + # Accent colors + base08 = "#e25d6c"; # red + base09 = "#f4bb54"; # yellow + base0A = "#e8ab3b"; # cyan + base0B = "#cea37f"; # green + base0C = "#e2be8a"; # blue + base0D = "#e8ab3b"; # cyan (using cyan for purple-ish if needed, or adjust) + base0E = "#ede4c8"; # magenta (using original magenta) + base0F = "#ff8800"; # a generic amber/orange (generated, could be 'yellow') + }; + + stylix.cursor = { + package = pkgs.catppuccin-cursors; # Existing cursor + name = "Catppuccin-Mocha-Dark-Cursors"; # Existing cursor + size = 24; # Existing size + }; + + stylix.fonts = { + monospace = { + package = pkgs.nerd-fonts.jetbrains-mono; + name = "JetBrainsMono Nerd Font"; + size = 10; + }; + serif = { + package = pkgs.noto-fonts; + name = "Noto Serif"; # Placeholder + size = 10; + }; + sansSerif = { + package = pkgs.noto-fonts; + name = "Noto Sans"; # Placeholder + size = 10; + }; + emoji = { + package = pkgs.noto-fonts-color-emoji; + name = "Noto Color Emoji"; + size = 10; + }; + }; + + stylix.targets = { + desktop.enable = true; # Theme desktop environment components + gtk.enable = true; + kde.enable = true; # KDE is for QT applications + plymouth.enable = true; + plasma.enable = true; # For KDE Plasma + }; + + stylix.extraPackageModules = [ + { config, pkgs, ... }: { + programs.hyprland.settings.general.col.active_border = "rgb(${config.stylix.colors.base0C})"; # Blue + programs.hyprland.settings.general.col.inactive_border = "rgb(${config.stylix.colors.base00})"; # Background + } + ]; + + programs.waybar = { + enable = true; + settings = config.stylix.waybar.settings; # Let stylix manage waybar settings + style = config.stylix.waybar.css; # Let stylix generate the CSS + }; + + programs.rofi = { + enable = true; + theme = config.stylix.rofi.theme; # Let stylix manage rofi theme + }; + + services.dunst = { + enable = true; + settings = { + global = { + frame_color = config.stylix.colors.base0C; # Blue accent + background = config.stylix.colors.base00; + foreground = config.stylix.colors.base05; + }; + urgency_low = { + background = config.stylix.colors.base00; + foreground = config.stylix.colors.base05; + }; + urgency_normal = { + background = config.stylix.colors.base00; + foreground = config.stylix.colors.base05; + }; + urgency_critical = { + background = config.stylix.colors.base08; # Red accent + foreground = config.stylix.colors.base00; + }; + }; + }; +} From 6d81f0be8c342d255aee85ad6a9f266c7f73c8f5 Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 02:58:43 -0800 Subject: [PATCH 08/43] stylix --- flake.lock | 298 +++++++++++++++++++++++++++++++++++++- home-manager/hyprland.nix | 1 + 2 files changed, 298 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index ecfbc55..dc5238b 100644 --- a/flake.lock +++ b/flake.lock @@ -33,6 +33,74 @@ "type": "github" } }, + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "base16.nix", + "type": "github" + } + }, + "base16-fish": { + "flake": false, + "locked": { + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", + "type": "github" + }, + "original": { + "owner": "tomyun", + "repo": "base16-fish", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1732806396, + "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", + "type": "github" + } + }, "crane": { "locked": { "lastModified": 1748047550, @@ -70,6 +138,22 @@ "type": "github" } }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1764724327, + "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -102,6 +186,27 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flox": { "inputs": { "crane": "crane", @@ -123,6 +228,22 @@ "type": "github" } }, + "fromYaml": { + "flake": false, + "locked": { + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "fromYaml", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -167,6 +288,25 @@ "type": "github" } }, + "gnome-shell": { + "flake": false, + "locked": { + "host": "gitlab.gnome.org", + "lastModified": 1764524476, + "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", + "type": "gitlab" + }, + "original": { + "host": "gitlab.gnome.org", + "owner": "GNOME", + "ref": "gnome-49", + "repo": "gnome-shell", + "type": "gitlab" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -571,6 +711,31 @@ "type": "github" } }, + "nur": { + "inputs": { + "flake-parts": [ + "stylix", + "flake-parts" + ], + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1764773531, + "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", + "owner": "nix-community", + "repo": "NUR", + "rev": "1d9616689e98beded059ad0384b9951e967a17fa", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -624,7 +789,8 @@ "hyprland": "hyprland", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay", + "stylix": "stylix" } }, "rust-analyzer-src": { @@ -664,6 +830,40 @@ "type": "github" } }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-helix": "base16-helix", + "base16-vim": "base16-vim", + "firefox-gnome-theme": "firefox-gnome-theme", + "flake-parts": "flake-parts", + "gnome-shell": "gnome-shell", + "nixpkgs": [ + "nixpkgs" + ], + "nur": "nur", + "systems": "systems_2", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-schemes": "tinted-schemes", + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" + }, + "locked": { + "lastModified": 1766440186, + "narHash": "sha256-7B/dntEDan+pMB8B/sG6599f3mQaySAJL+c9NhdMP7k=", + "owner": "nix-community", + "repo": "stylix", + "rev": "844294a58ef0badb3067c4f2fe063030537eb624", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1689347949, @@ -679,6 +879,102 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "type": "github" + } + }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1763914658, + "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1764465359, + "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1764464512, + "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index f9d8e57..21f620e 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -1,4 +1,5 @@ { + config, pkgs, inputs, unstablePkgs, From 6a3ac09e0930221c39299727165ff2080c4a01f4 Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 03:01:18 -0800 Subject: [PATCH 09/43] stylix --- home-manager/theme.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/theme.nix b/home-manager/theme.nix index d00afe7..ee19565 100644 --- a/home-manager/theme.nix +++ b/home-manager/theme.nix @@ -66,10 +66,10 @@ }; stylix.extraPackageModules = [ - { config, pkgs, ... }: { + ({ config, pkgs, ... }: { programs.hyprland.settings.general.col.active_border = "rgb(${config.stylix.colors.base0C})"; # Blue programs.hyprland.settings.general.col.inactive_border = "rgb(${config.stylix.colors.base00})"; # Background - } + }) ]; programs.waybar = { From b3e9b397eaa72781752bff341edbed08dd221891 Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 03:12:17 -0800 Subject: [PATCH 10/43] stylix --- flake.nix | 2 +- home-manager/hyprland.nix | 90 +++++++++++++++++---------------- home-manager/theme.nix | 104 ++++++++++++-------------------------- 3 files changed, 79 insertions(+), 117 deletions(-) diff --git a/flake.nix b/flake.nix index 8824b19..de50944 100644 --- a/flake.nix +++ b/flake.nix @@ -103,7 +103,7 @@ home-manager.users.death916 = { imports = [ ./home-manager/home.nix - stylix.homeManagerModules.stylix + stylix.homeModules.stylix ]; }; } diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index 21f620e..dbaec90 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -183,9 +183,10 @@ xdg.portal = { enable = true; - extraPortals = with pkgs; [ - xdg-desktop-portal-gtk - ]; + extraPortals = with pkgs; + [ + xdg-desktop-portal-gtk + ]; }; programs.waybar = { @@ -290,16 +291,16 @@ }; }; }; - style = config.stylix.waybar.css; + # style = config.stylix.waybar.css; # Stylix will manage this }; programs.rofi = { enable = true; - theme = config.stylix.rofi.theme; + # theme = config.stylix.rofi.theme; # Stylix will manage this extraConfig = { modi = "drun,run,ssh,window"; show-icons = true; - icon-theme = "Papirus-Dark"; # This might be overridden by stylix, but it's good to keep + icon-theme = "Papirus-Dark"; }; }; @@ -324,7 +325,7 @@ padding = 8; horizontal_padding = 8; frame_width = 2; - frame_color = config.stylix.colors.base0C; # Blue accent + # frame_color = config.stylix.colors.base0C; # Stylix will manage this separator_color = "frame"; word_wrap = true; ellipsize = "middle"; @@ -353,18 +354,18 @@ hide_duplicate_count = false; show_indicators = true; }; - urgency_low = { - background = config.stylix.colors.base00; - foreground = config.stylix.colors.base05; - }; - urgency_normal = { - background = config.stylix.colors.base00; - foreground = config.stylix.colors.base05; - }; - urgency_critical = { - background = config.stylix.colors.base08; # Red accent - foreground = config.stylix.colors.base00; - }; + # urgency_low = { # Stylix will manage this + # background = config.stylix.colors.base00; + # foreground = config.stylix.colors.base05; + # }; + # urgency_normal = { # Stylix will manage this + # background = config.stylix.colors.base00; + # foreground = config.stylix.colors.base05; + # }; + # urgency_critical = { # Stylix will manage this + # background = config.stylix.colors.base08; + # foreground = config.stylix.colors.base00; + # }; }; }; @@ -373,29 +374,30 @@ }; fonts.fontconfig.enable = true; - home.packages = with pkgs; [ - nerd-fonts.jetbrains-mono - noto-fonts - noto-fonts-cjk-sans - noto-fonts-color-emoji - font-awesome - roboto - grim - slurp - networkmanagerapplet - blueman - waybar - kitty - libnotify - kdePackages.dolphin - catppuccin-gtk - materia-theme - rose-pine-gtk-theme - nightfox-gtk-theme - materia-kde-theme + home.packages = with pkgs; + [ + nerd-fonts.jetbrains-mono + noto-fonts + noto-fonts-cjk-sans + noto-fonts-color-emoji + font-awesome + roboto + grim + slurp + networkmanagerapplet + blueman + waybar + kitty + libnotify + kdePackages.dolphin + catppuccin-gtk + materia-theme + rose-pine-gtk-theme + nightfox-gtk-theme + materia-kde-theme - playerctl - wl-clipboard - unstablePkgs.wttrbar - ]; -} + playerctl + wl-clipboard + unstablePkgs.wttrbar + ]; +} \ No newline at end of file diff --git a/home-manager/theme.nix b/home-manager/theme.nix index ee19565..2cfe45e 100644 --- a/home-manager/theme.nix +++ b/home-manager/theme.nix @@ -3,106 +3,66 @@ { stylix.enable = true; - stylix.wallpaper.paths = [ "/home/death916/Pictures/wallpapers/jameswebb1.jpg" ]; - stylix.wallpaper.mode = "fill"; # Or "stretch", "zoom", "fit" + stylix.image = "/home/death916/Pictures/wallpapers/jameswebb1.jpg"; - stylix.colors = { - # Base colors (dark to light) + stylix.base16Scheme = { base00 = "#0f0f0f"; # background - base01 = "#1a1a1a"; # slightly lighter background for elements (generated) - base02 = "#706a6a"; # bright_black (for secondary elements, borders) - base03 = "#808080"; # comments/less prominent text (generated) - base04 = "#b0b0b0"; # dim foreground (generated) + base01 = "#1a1a1a"; # slightly lighter background + base02 = "#706a6a"; # bright_black + base03 = "#808080"; # comments + base04 = "#b0b0b0"; # dim foreground base05 = "#eadccc"; # foreground - base06 = "#f0f0f0"; # brighter foreground (generated) - base07 = "#ffffff"; # white (pure white for contrast) - - # Accent colors + base06 = "#f0f0f0"; # brighter foreground + base07 = "#ffffff"; # white base08 = "#e25d6c"; # red base09 = "#f4bb54"; # yellow base0A = "#e8ab3b"; # cyan base0B = "#cea37f"; # green base0C = "#e2be8a"; # blue - base0D = "#e8ab3b"; # cyan (using cyan for purple-ish if needed, or adjust) - base0E = "#ede4c8"; # magenta (using original magenta) - base0F = "#ff8800"; # a generic amber/orange (generated, could be 'yellow') + base0D = "#e8ab3b"; # cyan (duplicate) + base0E = "#ede4c8"; # magenta + base0F = "#ff8800"; # amber/orange }; stylix.cursor = { - package = pkgs.catppuccin-cursors; # Existing cursor - name = "Catppuccin-Mocha-Dark-Cursors"; # Existing cursor - size = 24; # Existing size + package = pkgs.catppuccin-cursors; + name = "Catppuccin-Mocha-Dark-Cursors"; + size = 24; }; stylix.fonts = { monospace = { package = pkgs.nerd-fonts.jetbrains-mono; name = "JetBrainsMono Nerd Font"; - size = 10; - }; - serif = { - package = pkgs.noto-fonts; - name = "Noto Serif"; # Placeholder - size = 10; }; sansSerif = { package = pkgs.noto-fonts; - name = "Noto Sans"; # Placeholder - size = 10; + name = "Noto Sans"; + }; + serif = { + package = pkgs.noto-fonts; + name = "Noto Serif"; }; emoji = { package = pkgs.noto-fonts-color-emoji; name = "Noto Color Emoji"; - size = 10; + }; + sizes = { + applications = 10; + desktop = 10; + terminal = 10; + waybar = 10; }; }; stylix.targets = { - desktop.enable = true; # Theme desktop environment components + hyprland.enable = true; + waybar.enable = true; + rofi.enable = true; + dunst.enable = true; gtk.enable = true; - kde.enable = true; # KDE is for QT applications + kde.enable = true; plymouth.enable = true; - plasma.enable = true; # For KDE Plasma + plasma.enable = true; }; - - stylix.extraPackageModules = [ - ({ config, pkgs, ... }: { - programs.hyprland.settings.general.col.active_border = "rgb(${config.stylix.colors.base0C})"; # Blue - programs.hyprland.settings.general.col.inactive_border = "rgb(${config.stylix.colors.base00})"; # Background - }) - ]; - - programs.waybar = { - enable = true; - settings = config.stylix.waybar.settings; # Let stylix manage waybar settings - style = config.stylix.waybar.css; # Let stylix generate the CSS - }; - - programs.rofi = { - enable = true; - theme = config.stylix.rofi.theme; # Let stylix manage rofi theme - }; - - services.dunst = { - enable = true; - settings = { - global = { - frame_color = config.stylix.colors.base0C; # Blue accent - background = config.stylix.colors.base00; - foreground = config.stylix.colors.base05; - }; - urgency_low = { - background = config.stylix.colors.base00; - foreground = config.stylix.colors.base05; - }; - urgency_normal = { - background = config.stylix.colors.base00; - foreground = config.stylix.colors.base05; - }; - urgency_critical = { - background = config.stylix.colors.base08; # Red accent - foreground = config.stylix.colors.base00; - }; - }; - }; -} +} \ No newline at end of file From 22c5d9867a9c42ff35d3f414bd49699f8e1cc86a Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 03:16:08 -0800 Subject: [PATCH 11/43] stylix --- home-manager/theme.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/home-manager/theme.nix b/home-manager/theme.nix index 2cfe45e..464746c 100644 --- a/home-manager/theme.nix +++ b/home-manager/theme.nix @@ -47,12 +47,7 @@ package = pkgs.noto-fonts-color-emoji; name = "Noto Color Emoji"; }; - sizes = { - applications = 10; - desktop = 10; - terminal = 10; - waybar = 10; - }; + size = 10; }; stylix.targets = { From 341751f532c23be2deb753c0e7ea2f8cafc44296 Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 03:17:52 -0800 Subject: [PATCH 12/43] stylix --- home-manager/theme.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home-manager/theme.nix b/home-manager/theme.nix index 464746c..7eb94fa 100644 --- a/home-manager/theme.nix +++ b/home-manager/theme.nix @@ -34,20 +34,23 @@ monospace = { package = pkgs.nerd-fonts.jetbrains-mono; name = "JetBrainsMono Nerd Font"; + size = 12; }; sansSerif = { package = pkgs.noto-fonts; name = "Noto Sans"; + size = 12; }; serif = { package = pkgs.noto-fonts; name = "Noto Serif"; + size = 12; }; emoji = { package = pkgs.noto-fonts-color-emoji; name = "Noto Color Emoji"; + size = 12; }; - size = 10; }; stylix.targets = { From ca5fbd14489201433be3ff7a97f462dbe9fb4fa2 Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 03:18:52 -0800 Subject: [PATCH 13/43] stylix --- home-manager/theme.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/theme.nix b/home-manager/theme.nix index 7eb94fa..ab29942 100644 --- a/home-manager/theme.nix +++ b/home-manager/theme.nix @@ -49,7 +49,6 @@ emoji = { package = pkgs.noto-fonts-color-emoji; name = "Noto Color Emoji"; - size = 12; }; }; From 4f030a1f4950591abeb87aad289d910fb1f2d36a Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 03:20:35 -0800 Subject: [PATCH 14/43] stylix --- home-manager/theme.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/home-manager/theme.nix b/home-manager/theme.nix index ab29942..a2abb2d 100644 --- a/home-manager/theme.nix +++ b/home-manager/theme.nix @@ -34,17 +34,14 @@ monospace = { package = pkgs.nerd-fonts.jetbrains-mono; name = "JetBrainsMono Nerd Font"; - size = 12; }; sansSerif = { package = pkgs.noto-fonts; name = "Noto Sans"; - size = 12; }; serif = { package = pkgs.noto-fonts; name = "Noto Serif"; - size = 12; }; emoji = { package = pkgs.noto-fonts-color-emoji; @@ -52,6 +49,13 @@ }; }; + stylix.fontSizes = { + applications = 12; + desktop = 12; + terminal = 12; + waybar = 12; + }; + stylix.targets = { hyprland.enable = true; waybar.enable = true; From 3778f46471b28547a00ce1006a61b0974c0301e6 Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 03:25:39 -0800 Subject: [PATCH 15/43] stylix --- home-manager/hyprland.nix | 134 +++++++++++++++++++++++++++++++++----- home-manager/theme.nix | 7 -- 2 files changed, 119 insertions(+), 22 deletions(-) diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index dbaec90..fce12e7 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -291,12 +291,116 @@ }; }; }; - # style = config.stylix.waybar.css; # Stylix will manage this + style = '' + @define-color rosewater #f5e0dc; + @define-color flamingo #f2cdcd; + @define-color pink #f5c2e7; + @define-color mauve #cba6f7; + @define-color red #f38ba8; + @define-color maroon #eba0ac; + @define-color peach #fab387; + @define-color yellow #f9e2af; + @define-color green #a6e3a1; + @define-color teal #94e2d5; + @define-color sky #89dceb; + @define-color sapphire #74c7ec; + @define-color blue #89b4fa; + @define-color lavender #b4befe; + + @define-color text #cdd6f4; + @define-color subtext1 #bac2de; + @define-color subtext0 #a6adc8; + @define-color overlay2 #9399b2; + @define-color overlay1 #7f849c; + @define-color overlay0 #6c7086; + @define-color surface2 #585b70; + @define-color surface1 #45475a; + @define-color surface0 #313244; + @define-color base #1e1e2e; + @define-color mantle #181825; + @define-color crust #11111b; + + * { + font-family: "JetBrainsMono Nerd Font", FontAwesome, Roboto, Helvetica, Arial, sans-serif; + font-size: 13px; + } + + window#waybar { + background-color: rgba(17, 17, 27, 0.5); + color: @text; + } + + #workspaces button { + padding: 0 5px; + background-color: transparent; + color: @overlay1; + border-radius: 0; + } + + #workspaces button.active { + color: @lavender; + border-bottom: 2px solid @lavender; + } + + #workspaces button:hover { + background-color: @surface0; + } + + #clock, #battery, #cpu, #memory, #network, #pulseaudio, #tray, #window { + padding: 0 10px; + margin: 3px 4px; + border-radius: 8px; + background-color: @mantle; + } + + #clock { + background-color: @crust; + color: @text; + } + + #battery { + background-color: @crust; + color: @text; + } + + #battery.charging, #battery.plugged { + background-color: @green; + } + + #cpu { + background-color: @crust; + color: @text; + } + + #memory { + background-color: @crust; + color: @text; + } + + #network { + background-color: @crust; + color: @text; + } + + #pulseaudio { + background-color: @crust; + color: @text; + } + + #pulseaudio.muted { + background-color: @surface1; + } + + #custom-wttrbar { + background-color: @crust; + color: @text; + } + ''; }; programs.rofi = { enable = true; - # theme = config.stylix.rofi.theme; # Stylix will manage this + theme = "arthur"; extraConfig = { modi = "drun,run,ssh,window"; show-icons = true; @@ -325,7 +429,7 @@ padding = 8; horizontal_padding = 8; frame_width = 2; - # frame_color = config.stylix.colors.base0C; # Stylix will manage this + frame_color = "#cba6f7"; separator_color = "frame"; word_wrap = true; ellipsize = "middle"; @@ -354,18 +458,18 @@ hide_duplicate_count = false; show_indicators = true; }; - # urgency_low = { # Stylix will manage this - # background = config.stylix.colors.base00; - # foreground = config.stylix.colors.base05; - # }; - # urgency_normal = { # Stylix will manage this - # background = config.stylix.colors.base00; - # foreground = config.stylix.colors.base05; - # }; - # urgency_critical = { # Stylix will manage this - # background = config.stylix.colors.base08; - # foreground = config.stylix.colors.base00; - # }; + urgency_low = { + background = "#1e1e2e"; + foreground = "#cdd6f4"; + }; + urgency_normal = { + background = "#1e1e2e"; + foreground = "#cdd6f4"; + }; + urgency_critical = { + background = "#f38ba8"; + foreground = "#1e1e2e"; + }; }; }; diff --git a/home-manager/theme.nix b/home-manager/theme.nix index a2abb2d..e81b454 100644 --- a/home-manager/theme.nix +++ b/home-manager/theme.nix @@ -49,13 +49,6 @@ }; }; - stylix.fontSizes = { - applications = 12; - desktop = 12; - terminal = 12; - waybar = 12; - }; - stylix.targets = { hyprland.enable = true; waybar.enable = true; From 6ad31cda1900905a5da72029a049d831c23d6dd6 Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 03:28:31 -0800 Subject: [PATCH 16/43] stylix --- home-manager/theme.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home-manager/theme.nix b/home-manager/theme.nix index e81b454..6afd38f 100644 --- a/home-manager/theme.nix +++ b/home-manager/theme.nix @@ -57,6 +57,5 @@ gtk.enable = true; kde.enable = true; plymouth.enable = true; - plasma.enable = true; }; -} \ No newline at end of file +} From fe72fde2fe8700190b7f897a9d8eb40e36554be2 Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 03:28:48 -0800 Subject: [PATCH 17/43] stylix --- home-manager/theme.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/theme.nix b/home-manager/theme.nix index 6afd38f..800abd7 100644 --- a/home-manager/theme.nix +++ b/home-manager/theme.nix @@ -56,6 +56,5 @@ dunst.enable = true; gtk.enable = true; kde.enable = true; - plymouth.enable = true; }; } From b6eed490bdf41f53a31b945ba3c8ead50a870a83 Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 03:31:40 -0800 Subject: [PATCH 18/43] stylix --- home-manager/hyprland.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index fce12e7..24c9da2 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -400,7 +400,7 @@ programs.rofi = { enable = true; - theme = "arthur"; + # theme = "arthur"; # Managed by stylix extraConfig = { modi = "drun,run,ssh,window"; show-icons = true; From 7681469c4110342a42935a8362aa9da97c722cb9 Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 03:35:23 -0800 Subject: [PATCH 19/43] stylix --- home-manager/home.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/home.nix b/home-manager/home.nix index e68980d..67e93f1 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -22,10 +22,10 @@ in home.username = "death916"; home.homeDirectory = "/home/death916"; - xresources.properties = { - "Xcursor.size" = 16; - "Xft.dpi" = 172; - }; + # xresources.properties = { + # "Xcursor.size" = 16; + # "Xft.dpi" = 172; + # }; home.stateVersion = "24.11"; home.packages = with pkgs; [ nnn From 051e49aa782ba01525ac14e83d75d786ac9828ce Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 03:39:45 -0800 Subject: [PATCH 20/43] stylix --- home-manager/hyprland.nix | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index 24c9da2..90f8958 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -404,7 +404,7 @@ extraConfig = { modi = "drun,run,ssh,window"; show-icons = true; - icon-theme = "Papirus-Dark"; + # icon-theme = "Papirus-Dark"; # Managed by stylix }; }; @@ -422,14 +422,14 @@ height = 150; offset = "10x50"; origin = "top-right"; - font = "JetBrainsMono Nerd Font 10"; + # font = "JetBrainsMono Nerd Font 10"; # Managed by stylix line_height = 0; notification_height = 0; separator_height = 2; padding = 8; horizontal_padding = 8; frame_width = 2; - frame_color = "#cba6f7"; + # frame_color = "#cba6f7"; # Managed by stylix separator_color = "frame"; word_wrap = true; ellipsize = "middle"; @@ -458,18 +458,19 @@ hide_duplicate_count = false; show_indicators = true; }; - urgency_low = { - background = "#1e1e2e"; - foreground = "#cdd6f4"; - }; - urgency_normal = { - background = "#1e1e2e"; - foreground = "#cdd6f4"; - }; - urgency_critical = { - background = "#f38ba8"; - foreground = "#1e1e2e"; - }; + # The following blocks are managed by stylix + # urgency_low = { + # background = "#1e1e2e"; + # foreground = "#cdd6f4"; + # }; + # urgency_normal = { + # background = "#1e1e2e"; + # foreground = "#cdd6f4"; + # }; + # urgency_critical = { + # background = "#f38ba8"; + # foreground = "#1e1e2e"; + # }; }; }; From a05a6e94247f657fe87e2d8d8aaf4716f2d25b3a Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 03:47:00 -0800 Subject: [PATCH 21/43] stylix --- home-manager/hyprland.nix | 180 +++++++++++++++++++------------------- 1 file changed, 90 insertions(+), 90 deletions(-) diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index 90f8958..3719820 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -291,111 +291,111 @@ }; }; }; - style = '' - @define-color rosewater #f5e0dc; - @define-color flamingo #f2cdcd; - @define-color pink #f5c2e7; - @define-color mauve #cba6f7; - @define-color red #f38ba8; - @define-color maroon #eba0ac; - @define-color peach #fab387; - @define-color yellow #f9e2af; - @define-color green #a6e3a1; - @define-color teal #94e2d5; - @define-color sky #89dceb; - @define-color sapphire #74c7ec; - @define-color blue #89b4fa; - @define-color lavender #b4befe; + # style = '' # Managed by stylix + # @define-color rosewater #f5e0dc; + # @define-color flamingo #f2cdcd; + # @define-color pink #f5c2e7; + # @define-color mauve #cba6f7; + # @define-color red #f38ba8; + # @define-color maroon #eba0ac; + # @define-color peach #fab387; + # @define-color yellow #f9e2af; + # @define-color green #a6e3a1; + # @define-color teal #94e2d5; + # @define-color sky #89dceb; + # @define-color sapphire #74c7ec; + # @define-color blue #89b4fa; + # @define-color lavender #b4befe; - @define-color text #cdd6f4; - @define-color subtext1 #bac2de; - @define-color subtext0 #a6adc8; - @define-color overlay2 #9399b2; - @define-color overlay1 #7f849c; - @define-color overlay0 #6c7086; - @define-color surface2 #585b70; - @define-color surface1 #45475a; - @define-color surface0 #313244; - @define-color base #1e1e2e; - @define-color mantle #181825; - @define-color crust #11111b; + # @define-color text #cdd6f4; + # @define-color subtext1 #bac2de; + # @define-color subtext0 #a6adc8; + # @define-color overlay2 #9399b2; + # @define-color overlay1 #7f849c; + # @define-color overlay0 #6c7086; + # @define-color surface2 #585b70; + # @define-color surface1 #45475a; + # @define-color surface0 #313244; + # @define-color base #1e1e2e; + # @define-color mantle #181825; + # @define-color crust #11111b; - * { - font-family: "JetBrainsMono Nerd Font", FontAwesome, Roboto, Helvetica, Arial, sans-serif; - font-size: 13px; - } + # * { + # font-family: "JetBrainsMono Nerd Font", FontAwesome, Roboto, Helvetica, Arial, sans-serif; + # font-size: 13px; + # } - window#waybar { - background-color: rgba(17, 17, 27, 0.5); - color: @text; - } + # window#waybar { + # background-color: rgba(17, 17, 27, 0.5); + # color: @text; + # } - #workspaces button { - padding: 0 5px; - background-color: transparent; - color: @overlay1; - border-radius: 0; - } + # #workspaces button { + # padding: 0 5px; + # background-color: transparent; + # color: @overlay1; + # border-radius: 0; + # } - #workspaces button.active { - color: @lavender; - border-bottom: 2px solid @lavender; - } + # #workspaces button.active { + # color: @lavender; + # border-bottom: 2px solid @lavender; + # } - #workspaces button:hover { - background-color: @surface0; - } + # #workspaces button:hover { + # background-color: @surface0; + # } - #clock, #battery, #cpu, #memory, #network, #pulseaudio, #tray, #window { - padding: 0 10px; - margin: 3px 4px; - border-radius: 8px; - background-color: @mantle; - } + # #clock, #battery, #cpu, #memory, #network, #pulseaudio, #tray, #window { + # padding: 0 10px; + # margin: 3px 4px; + # border-radius: 8px; + # background-color: @mantle; + # } - #clock { - background-color: @crust; - color: @text; - } + # #clock { + # background-color: @crust; + # color: @text; + # } - #battery { - background-color: @crust; - color: @text; - } + # #battery { + # background-color: @crust; + # color: @text; + # } - #battery.charging, #battery.plugged { - background-color: @green; - } + # #battery.charging, #battery.plugged { + # background-color: @green; + # } - #cpu { - background-color: @crust; - color: @text; - } + # #cpu { + # background-color: @crust; + # color: @text; + # } - #memory { - background-color: @crust; - color: @text; - } + # #memory { + # background-color: @crust; + # color: @text; + # } - #network { - background-color: @crust; - color: @text; - } + # #network { + # background-color: @crust; + # color: @text; + # } - #pulseaudio { - background-color: @crust; - color: @text; - } + # #pulseaudio { + # background-color: @crust; + # color: @text; + # } - #pulseaudio.muted { - background-color: @surface1; - } + # #pulseaudio.muted { + # background-color: @surface1; + # } - #custom-wttrbar { - background-color: @crust; - color: @text; - } - ''; + # #custom-wttrbar { + # background-color: @crust; + # color: @text; + # } + # ''; }; programs.rofi = { @@ -430,7 +430,7 @@ horizontal_padding = 8; frame_width = 2; # frame_color = "#cba6f7"; # Managed by stylix - separator_color = "frame"; + # separator_color = "frame"; # Managed by stylix word_wrap = true; ellipsize = "middle"; ignore_dbus_close = false; From 8ca9d2df81bdb8feea4d72af8aa1911a4c93b4a4 Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 03:48:27 -0800 Subject: [PATCH 22/43] stylix --- modules/home-manager/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home-manager/common.nix b/modules/home-manager/common.nix index 25647fb..affe33c 100644 --- a/modules/home-manager/common.nix +++ b/modules/home-manager/common.nix @@ -21,7 +21,7 @@ programs.helix = { enable = true; settings = { - theme = "autumn_night_transparent"; + # theme = "autumn_night_transparent"; # Managed by stylix editor = { cursor-shape = { normal = "block"; From b99b88f86119e51235337e6df8a75a8ec981064a Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 03:52:57 -0800 Subject: [PATCH 23/43] stylix --- flake.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index de50944..f877c2b 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ hyprland.url = "github:hyprwm/Hyprland"; stylix = { - url = "github:nix-community/stylix"; + url = "github:nix-community/stylix/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -103,7 +103,6 @@ home-manager.users.death916 = { imports = [ ./home-manager/home.nix - stylix.homeModules.stylix ]; }; } From 5e453405a94ad9e8793ab7e270553e9ee96d1f12 Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 03:54:12 -0800 Subject: [PATCH 24/43] stylix --- flake.lock | 7 ++++--- flake.nix | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index dc5238b..f2e1914 100644 --- a/flake.lock +++ b/flake.lock @@ -851,15 +851,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1766440186, - "narHash": "sha256-7B/dntEDan+pMB8B/sG6599f3mQaySAJL+c9NhdMP7k=", + "lastModified": 1766515275, + "narHash": "sha256-2iOwFYtsU2d5Np2pN5cDtPRrs9KswTjP+fVEXk+9QqI=", "owner": "nix-community", "repo": "stylix", - "rev": "844294a58ef0badb3067c4f2fe063030537eb624", + "rev": "c97b7b37b2d068b98271dce203857325abf58fb6", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-25.11", "repo": "stylix", "type": "github" } diff --git a/flake.nix b/flake.nix index f877c2b..91180f3 100644 --- a/flake.nix +++ b/flake.nix @@ -103,6 +103,7 @@ home-manager.users.death916 = { imports = [ ./home-manager/home.nix + stylix.homeModules.stylix ]; }; } From 9bdae359a547eeeb915092f281576846d6aca93a Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 04:04:53 -0800 Subject: [PATCH 25/43] stylix --- .gitignore | 1 + home-manager/theme.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index dd44972..b2cd3b4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.md +*.jpg diff --git a/home-manager/theme.nix b/home-manager/theme.nix index 800abd7..a2bcd85 100644 --- a/home-manager/theme.nix +++ b/home-manager/theme.nix @@ -3,7 +3,7 @@ { stylix.enable = true; - stylix.image = "/home/death916/Pictures/wallpapers/jameswebb1.jpg"; + stylix.image = ./wallpaper.jpg; stylix.base16Scheme = { base00 = "#0f0f0f"; # background From 5f80136c572a419ab004898acbf923d9ce2937d8 Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 04:13:24 -0800 Subject: [PATCH 26/43] stylix --- flake.nix | 6 ++++++ home-manager/theme.nix | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 91180f3..bf3a89e 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,11 @@ url = "github:nix-community/stylix/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; + + my-wallpaper = { + url = "path:/home/death916/Documents/nix-config/home-manager/wallpaper.jpg"; + flake = false; + }; }; outputs = @@ -33,6 +38,7 @@ flox, hyprland, stylix, + my-wallpaper, ... }: let diff --git a/home-manager/theme.nix b/home-manager/theme.nix index a2bcd85..e99d4eb 100644 --- a/home-manager/theme.nix +++ b/home-manager/theme.nix @@ -1,9 +1,9 @@ -{ config, pkgs, ... }: +{ config, pkgs, inputs, ... }: { stylix.enable = true; - stylix.image = ./wallpaper.jpg; + stylix.image = inputs.my-wallpaper; stylix.base16Scheme = { base00 = "#0f0f0f"; # background From a83c78ac0400825c4b506e53ce398a9204cdcb08 Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 04:19:22 -0800 Subject: [PATCH 27/43] stylix --- flake.lock | 14 ++++++++++++++ flake.nix | 7 +------ home-manager/theme.nix | 2 -- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index f2e1914..3e90a0d 100644 --- a/flake.lock +++ b/flake.lock @@ -647,6 +647,19 @@ "type": "github" } }, + "my-wallpaper": { + "flake": false, + "locked": { + "lastModified": 1766577769, + "narHash": "sha256-faUpqZ8CkOSiCOE4ihFqQp/xDbfHFtFLhX8FPBJ2K7E=", + "path": "/home/death916/Documents/nix-config/home-manager/wallpaper.jpg", + "type": "path" + }, + "original": { + "path": "/home/death916/Documents/nix-config/home-manager/wallpaper.jpg", + "type": "path" + } + }, "nixpkgs": { "locked": { "lastModified": 1761114652, @@ -787,6 +800,7 @@ "flox": "flox", "home-manager": "home-manager", "hyprland": "hyprland", + "my-wallpaper": "my-wallpaper", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "rust-overlay": "rust-overlay", diff --git a/flake.nix b/flake.nix index bf3a89e..6c7ddee 100644 --- a/flake.nix +++ b/flake.nix @@ -21,11 +21,6 @@ url = "github:nix-community/stylix/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; - - my-wallpaper = { - url = "path:/home/death916/Documents/nix-config/home-manager/wallpaper.jpg"; - flake = false; - }; }; outputs = @@ -38,7 +33,6 @@ flox, hyprland, stylix, - my-wallpaper, ... }: let @@ -98,6 +92,7 @@ } ./nixos/configuration.nix ./nixos/hardware-configuration.nix + { stylix.image = /home/death916/Documents/nix-config/home-manager/wallpaper.jpg; } home-manager.nixosModules.home-manager ( { unstablePkgs, ... }: diff --git a/home-manager/theme.nix b/home-manager/theme.nix index e99d4eb..648841b 100644 --- a/home-manager/theme.nix +++ b/home-manager/theme.nix @@ -3,8 +3,6 @@ { stylix.enable = true; - stylix.image = inputs.my-wallpaper; - stylix.base16Scheme = { base00 = "#0f0f0f"; # background base01 = "#1a1a1a"; # slightly lighter background From 8ccb0a458c7399331349b03be52da768a0d2f0d3 Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 04:23:18 -0800 Subject: [PATCH 28/43] stylix --- flake.lock | 14 -------------- nixos/configuration.nix | 2 ++ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 3e90a0d..f2e1914 100644 --- a/flake.lock +++ b/flake.lock @@ -647,19 +647,6 @@ "type": "github" } }, - "my-wallpaper": { - "flake": false, - "locked": { - "lastModified": 1766577769, - "narHash": "sha256-faUpqZ8CkOSiCOE4ihFqQp/xDbfHFtFLhX8FPBJ2K7E=", - "path": "/home/death916/Documents/nix-config/home-manager/wallpaper.jpg", - "type": "path" - }, - "original": { - "path": "/home/death916/Documents/nix-config/home-manager/wallpaper.jpg", - "type": "path" - } - }, "nixpkgs": { "locked": { "lastModified": 1761114652, @@ -800,7 +787,6 @@ "flox": "flox", "home-manager": "home-manager", "hyprland": "hyprland", - "my-wallpaper": "my-wallpaper", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "rust-overlay": "rust-overlay", diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 5b2a023..abc931f 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -48,4 +48,6 @@ }; system.stateVersion = "24.11"; + + stylix.image = "/home/death916/Documents/nix-config/home-manager/wallpaper.jpg"; } From 7e184d3dc1f55664f22cbacbe6beae11041de9ed Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 04:25:33 -0800 Subject: [PATCH 29/43] stylix --- flake.nix | 61 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/flake.nix b/flake.nix index 6c7ddee..e42dd3f 100644 --- a/flake.nix +++ b/flake.nix @@ -81,35 +81,38 @@ ; unstablePkgs = import nixpkgs-unstable { inherit system; }; }; - modules = [ - { - nixpkgs.overlays = [ - overlays.waveterm - overlays.rust - overlays.halloy - overlays.karakeep - ]; - } - ./nixos/configuration.nix - ./nixos/hardware-configuration.nix - { stylix.image = /home/death916/Documents/nix-config/home-manager/wallpaper.jpg; } - home-manager.nixosModules.home-manager - ( - { unstablePkgs, ... }: - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.backupFileExtension = "backup"; - home-manager.extraSpecialArgs = { inherit hmLib unstablePkgs inputs; }; - home-manager.users.death916 = { - imports = [ - ./home-manager/home.nix - stylix.homeModules.stylix - ]; - }; - } - ) - ]; + modules = [ + stylix.nixosModules.stylix + { + nixpkgs.overlays = [ + overlays.waveterm + overlays.rust + overlays.halloy + overlays.karakeep + ]; + } + ./nixos/configuration.nix + ./nixos/hardware-configuration.nix + { stylix.image = "/home/death916/Documents/nix-config/home-manager/wallpaper.jpg"; } + home-manager.nixosModules.home-manager + ( + { + unstablePkgs, + ... + }: + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.backupFileExtension = "backup"; + home-manager.extraSpecialArgs = { inherit hmLib unstablePkgs inputs; }; + home-manager.users.death916 = { + imports = [ + ./home-manager/home.nix + ]; + }; + } + ) + ]; }; homelab = From d54c43278d7c337cd414698c9615e64577c9bb40 Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 04:26:57 -0800 Subject: [PATCH 30/43] stylix --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index e42dd3f..fba8cb8 100644 --- a/flake.nix +++ b/flake.nix @@ -108,6 +108,7 @@ home-manager.users.death916 = { imports = [ ./home-manager/home.nix + stylix.homeModules.stylix ]; }; } From 8e9a95fbbdea6c98e3356555c4f5596c96bfaeac Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 04:31:17 -0800 Subject: [PATCH 31/43] stylix --- home-manager/theme.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/theme.nix b/home-manager/theme.nix index 648841b..9e2fc10 100644 --- a/home-manager/theme.nix +++ b/home-manager/theme.nix @@ -2,6 +2,7 @@ { stylix.enable = true; + stylix.polarity = "dark"; stylix.base16Scheme = { base00 = "#0f0f0f"; # background From fdd4ef6689bf4e870d0414b044cc87853a244850 Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 04:53:08 -0800 Subject: [PATCH 32/43] stylix new theme --- home-manager/theme.nix | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/home-manager/theme.nix b/home-manager/theme.nix index 9e2fc10..60cdc73 100644 --- a/home-manager/theme.nix +++ b/home-manager/theme.nix @@ -5,22 +5,22 @@ stylix.polarity = "dark"; stylix.base16Scheme = { - base00 = "#0f0f0f"; # background - base01 = "#1a1a1a"; # slightly lighter background - base02 = "#706a6a"; # bright_black - base03 = "#808080"; # comments - base04 = "#b0b0b0"; # dim foreground - base05 = "#eadccc"; # foreground - base06 = "#f0f0f0"; # brighter foreground - base07 = "#ffffff"; # white - base08 = "#e25d6c"; # red - base09 = "#f4bb54"; # yellow - base0A = "#e8ab3b"; # cyan - base0B = "#cea37f"; # green - base0C = "#e2be8a"; # blue - base0D = "#e8ab3b"; # cyan (duplicate) - base0E = "#ede4c8"; # magenta - base0F = "#ff8800"; # amber/orange + base00 = "#0F0F19"; # Main Background + base01 = "#181824"; # Lighter Background + base02 = "#202034"; # Selection Background + base03 = "#8C8CB8"; # Comments / Dim + base04 = "#8C8CB8"; # Secondary Foreground + base05 = "#EDEDFE"; # Main Foreground + base06 = "#F8F8FF"; # Lighter Foreground + base07 = "#EDEDFE"; # Main Foreground (as white) + base08 = "#FF3366"; # Red + base09 = "#FFEA00"; # Orange / Yellow + base0A = "#FFEA00"; # Yellow + base0B = "#00F59B"; # Green + base0C = "#3CFFED"; # Cyan + base0D = "#33A1FF"; # Blue + base0E = "#FF66F6"; # Magenta + base0F = "#FF66F6"; # Violet / Magenta }; stylix.cursor = { From f81d095f990718302abda8c5e2b6dc473b9e8500 Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 05:02:09 -0800 Subject: [PATCH 33/43] stylix new theme folder --- home-manager/theme.nix | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/home-manager/theme.nix b/home-manager/theme.nix index 60cdc73..f19878e 100644 --- a/home-manager/theme.nix +++ b/home-manager/theme.nix @@ -1,28 +1,13 @@ { config, pkgs, inputs, ... }: { + imports = [ + ./themes/ferra.nix + ]; + stylix.enable = true; stylix.polarity = "dark"; - stylix.base16Scheme = { - base00 = "#0F0F19"; # Main Background - base01 = "#181824"; # Lighter Background - base02 = "#202034"; # Selection Background - base03 = "#8C8CB8"; # Comments / Dim - base04 = "#8C8CB8"; # Secondary Foreground - base05 = "#EDEDFE"; # Main Foreground - base06 = "#F8F8FF"; # Lighter Foreground - base07 = "#EDEDFE"; # Main Foreground (as white) - base08 = "#FF3366"; # Red - base09 = "#FFEA00"; # Orange / Yellow - base0A = "#FFEA00"; # Yellow - base0B = "#00F59B"; # Green - base0C = "#3CFFED"; # Cyan - base0D = "#33A1FF"; # Blue - base0E = "#FF66F6"; # Magenta - base0F = "#FF66F6"; # Violet / Magenta - }; - stylix.cursor = { package = pkgs.catppuccin-cursors; name = "Catppuccin-Mocha-Dark-Cursors"; From 50c45399118ca85dad59800ea0c194cc6ce6a58e Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 05:02:34 -0800 Subject: [PATCH 34/43] theme folder --- home-manager/themes/ferra.nix | 20 ++++++++++++++++++++ home-manager/themes/sunset.nix | 20 ++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 home-manager/themes/ferra.nix create mode 100644 home-manager/themes/sunset.nix diff --git a/home-manager/themes/ferra.nix b/home-manager/themes/ferra.nix new file mode 100644 index 0000000..fc549fc --- /dev/null +++ b/home-manager/themes/ferra.nix @@ -0,0 +1,20 @@ +{ + stylix.base16Scheme = { + base00 = "#242226"; # Main Background + base01 = "#2b292d"; # Lighter Background + base02 = "#453d41"; # Selection Background + base03 = "#ab8a79"; # Comments + base04 = "#d7bde2"; # Secondary Foreground + base05 = "#fecdb2"; # Main Foreground + base06 = "#cbc3c8"; # Lighter Foreground + base07 = "#ffffff"; # Lightest Foreground / White + base08 = "#e06b75"; # Red + base09 = "#ffa07a"; # Orange + base0A = "#f5d76e"; # Yellow + base0B = "#b1b695"; # Green + base0C = "#5dc1c5"; # Cyan + base0D = "#4a90e2"; # Blue + base0E = "#f6b6c9"; # Magenta / Pink + base0F = "#6f5d63"; # Brown + }; +} diff --git a/home-manager/themes/sunset.nix b/home-manager/themes/sunset.nix new file mode 100644 index 0000000..3a87c21 --- /dev/null +++ b/home-manager/themes/sunset.nix @@ -0,0 +1,20 @@ +{ + stylix.base16Scheme = { + base00 = "#0F0F19"; # Main Background + base01 = "#181824"; # Lighter Background + base02 = "#202034"; # Selection Background + base03 = "#8C8CB8"; # Comments / Dim + base04 = "#8C8CB8"; # Secondary Foreground + base05 = "#EDEDFE"; # Main Foreground + base06 = "#F8F8FF"; # Lighter Foreground + base07 = "#EDEDFE"; # Main Foreground (as white) + base08 = "#FF3366"; # Red + base09 = "#FFEA00"; # Orange / Yellow + base0A = "#FFEA00"; # Yellow + base0B = "#00F59B"; # Green + base0C = "#3CFFED"; # Cyan + base0D = "#33A1FF"; # Blue + base0E = "#FF66F6"; # Magenta + base0F = "#FF66F6"; # Violet / Magenta + }; +} From c1d450597a8d9068d6fb11715724ce2f4bb3c5ba Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 05:04:00 -0800 Subject: [PATCH 35/43] stylix new theme folder --- home-manager/themes/aether.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 home-manager/themes/aether.nix diff --git a/home-manager/themes/aether.nix b/home-manager/themes/aether.nix new file mode 100644 index 0000000..635ad48 --- /dev/null +++ b/home-manager/themes/aether.nix @@ -0,0 +1,20 @@ +{ + stylix.base16Scheme = { + base00 = "#0f0f0f"; # background + base01 = "#1a1a1a"; # slightly lighter background for elements + base02 = "#706a6a"; # bright_black (for secondary elements, borders) + base03 = "#808080"; # comments/less prominent text + base04 = "#b0b0b0"; # dim foreground + base05 = "#eadccc"; # foreground + base06 = "#f0f0f0"; # brighter foreground + base07 = "#ffffff"; # white (pure white for contrast) + base08 = "#e25d6c"; # red + base09 = "#f4bb54"; # yellow + base0A = "#e8ab3b"; # cyan + base0B = "#cea37f"; # green + base0C = "#e2be8a"; # blue + base0D = "#e8ab3b"; # cyan (using cyan for purple-ish if needed) + base0E = "#ede4c8"; # magenta + base0F = "#ff8800"; # amber/orange + }; +} From 77033d1247ff07d26a8129c29d2a536c265b7ac4 Mon Sep 17 00:00:00 2001 From: death916 Date: Wed, 24 Dec 2025 23:19:22 -0800 Subject: [PATCH 36/43] stylix --- home-manager/theme.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/home-manager/theme.nix b/home-manager/theme.nix index f19878e..c633cff 100644 --- a/home-manager/theme.nix +++ b/home-manager/theme.nix @@ -1,4 +1,9 @@ -{ config, pkgs, inputs, ... }: +{ + config, + pkgs, + inputs, + ... +}: { imports = [ @@ -40,5 +45,6 @@ dunst.enable = true; gtk.enable = true; kde.enable = true; + zed.enable = true; }; } From edcf64e2184ab426fe83055b6d5fd69502201892 Mon Sep 17 00:00:00 2001 From: death916 Date: Thu, 25 Dec 2025 04:25:03 -0800 Subject: [PATCH 37/43] vscode rust deps --- home-manager/home.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/home-manager/home.nix b/home-manager/home.nix index 67e93f1..495e0b6 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -188,7 +188,14 @@ in programs.vscode = { enable = true; - package = pkgs.vscode.fhs; + programs.vscode.package = pkgs.vscode.fhsWithPackages ( + ps: with ps; [ + rustup + zlib + openssl.dev + pkg-config + ] + ); }; programs.bash = { From 1cf8b347fcd1b8a2d705df7e940ea61ee4cf538a Mon Sep 17 00:00:00 2001 From: death916 Date: Thu, 25 Dec 2025 04:25:41 -0800 Subject: [PATCH 38/43] vscode rust deps --- home-manager/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/home.nix b/home-manager/home.nix index 495e0b6..41e874a 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -188,7 +188,7 @@ in programs.vscode = { enable = true; - programs.vscode.package = pkgs.vscode.fhsWithPackages ( + package = pkgs.vscode.fhsWithPackages ( ps: with ps; [ rustup zlib From 31f957590c55d38cad9fa9f6544089e87187a3fc Mon Sep 17 00:00:00 2001 From: death916 Date: Thu, 25 Dec 2025 04:31:44 -0800 Subject: [PATCH 39/43] vscode rust deps --- home-manager/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/home.nix b/home-manager/home.nix index 41e874a..fc30afe 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -194,6 +194,7 @@ in zlib openssl.dev pkg-config + cargo ] ); }; From dad77be3b7b254e32b59556d59565c9229473451 Mon Sep 17 00:00:00 2001 From: death916 Date: Thu, 25 Dec 2025 04:59:20 -0800 Subject: [PATCH 40/43] stylix --- home-manager/theme.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/theme.nix b/home-manager/theme.nix index c633cff..e0b46c1 100644 --- a/home-manager/theme.nix +++ b/home-manager/theme.nix @@ -46,5 +46,8 @@ gtk.enable = true; kde.enable = true; zed.enable = true; + zed.colors.enable = true; + zellij.enable = true; + zellij.colors.enable = true; }; } From 206e56b046507d0c3290017a580146009b693aad Mon Sep 17 00:00:00 2001 From: death916 Date: Thu, 25 Dec 2025 05:22:31 -0800 Subject: [PATCH 41/43] stylix --- home-manager/home.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/home-manager/home.nix b/home-manager/home.nix index fc30afe..7b9b20e 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -214,4 +214,13 @@ in nh-push = "/home/death916/Documents/nix-config/scripts/nh-push"; }; }; + + programs.zellij.enable = true; + + programs.zed-editor = { + enable = true; + package = pkgs.zed-editor-fhs; + }; + + programs.btop.enable = true; } From 3c092a1221661672a6782015df2726ab418ce1dd Mon Sep 17 00:00:00 2001 From: death916 Date: Thu, 25 Dec 2025 05:38:41 -0800 Subject: [PATCH 42/43] stylix --- home-manager/theme.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/theme.nix b/home-manager/theme.nix index e0b46c1..a556f7c 100644 --- a/home-manager/theme.nix +++ b/home-manager/theme.nix @@ -49,5 +49,6 @@ zed.colors.enable = true; zellij.enable = true; zellij.colors.enable = true; + btop.enable = true; }; } From b44d09e592836581b1ca98b516707bc970ed4955 Mon Sep 17 00:00:00 2001 From: death916 Date: Thu, 25 Dec 2025 05:42:28 -0800 Subject: [PATCH 43/43] stylix --- home-manager/home.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/home.nix b/home-manager/home.nix index 7b9b20e..4cb0b3d 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -75,7 +75,6 @@ in obsidian element-desktop manix - unstablePkgs.zed-editor-fhs aichat wl-clipboard unstablePkgs.gemini-cli