Update

home/programs/fetch/neofetch/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }: {
+{ pkgs, ... }: {
   home.packages = with pkgs; [ neofetch ];
 
   xdg.configFile."neofetch/ascii.txt".text = ''
@@ -109,9 +109,6 @@
     song_format="%artist% - %album% - %title%"
     song_shorthand="off"
     mpc_args=()
-    colors=(${toString config.var.theme.colors.accentNumber} 1 ${
-      toString config.var.theme.colors.accentNumber
-    } ${toString config.var.theme.colors.accentNumber} 7)
     bold="on"
     underline_enabled="on"
     underline_char="-"

home/programs/fetch/nerdfetch/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 let
   nerdfetch = pkgs.writeShellScriptBin "nerdfetch" ''
           ostype="$(uname)"
@@ -345,9 +345,9 @@ let
 
           ## USER VARIABLES -- YOU CAN CHANGE THESE
 
-          lc="$reset$bold''$${config.var.theme.colors.accentName}" # labels
-          nc="$reset$bold''$${config.var.theme.colors.accentName}" # labels
-          hn="$reset$bold''$${config.var.theme.colors.accentName}" # labels
+          lc="$reset$bold$magenta" # labels
+          nc="$reset$bold$magenta" # labels
+          hn="$reset$bold$magenta" # labels
           ic="$reset$white"          # info
           c0="$reset$grey"           # first color
           c1="$reset$white"          # second color

home/programs/nvim/keymaps.nix

@@ -165,16 +165,16 @@
         action = "<cmd>lua require('telescope.builtin').spell_suggest()<cr>";
         options.desc = "Spell Suggest";
       }
-      {
-        key = "<leader>st";
-        action = "<cmd>lua require('telescope.builtin').treesitter()<cr>";
-        options.desc = "Treesitter";
-      }
       {
         key = "<leader>sr";
         action = "<cmd>:noh<return><esc>";
         options.desc = "Reset search";
       }
+      {
+        key = "<leader>st";
+        action = "<cmd>TodoTelescope<cr>";
+        options.desc = "Todos";
+      }
 
       # Trouble
       {

home/programs/nvim/plugins/dashboard.nix

@@ -1,9 +1,9 @@
 { config, ... }: {
 
   programs.nixvim.highlight = {
-    AlphaHeaderColor.fg = "#${config.var.theme.colors.accent}";
-    AlphaTextColor.fg = "#${config.var.theme.colors.fg}";
-    AlphaShortcutColor.fg = "#${config.var.theme.colors.fgalt}";
+    AlphaHeaderColor.fg = "#${config.lib.stylix.colors.base0D}";
+    AlphaTextColor.fg = "#${config.lib.stylix.colors.base05}";
+    AlphaShortcutColor.fg = "#${config.lib.stylix.colors.base03}";
   };
 
   programs.nixvim.plugins.alpha = {

home/programs/nvim/plugins/ui.nix

@@ -3,9 +3,9 @@
 
   programs.nixvim = {
     highlight = {
-      Headline.bg = "#${config.var.theme.colors.bgalt}";
+      Headline.bg = "#${config.lib.stylix.colors.base0D}";
       Headline.bold = true;
-      Headline1.bg = "#${config.var.theme.colors.c0}";
+      Headline1.bg = "#${config.lib.stylix.colors.base01}";
       Headline1.bold = true;
     };
     plugins = {

home/programs/nvim/plugins/utils.nix

@@ -1,7 +1,7 @@
 { config, ... }: {
   programs.nixvim = {
     highlightOverride = {
-      FloatBorder.fg = "#${config.var.theme.colors.accent}";
+      FloatBorder.fg = "#${config.lib.stylix.colors.base0D}";
     };
     plugins = {
       copilot-vim.enable = true;
@@ -15,6 +15,7 @@
         enable = true;
         extensions.fzf-native = { enable = true; };
       };
+      todo-comments.enable = true;
       treesitter = {
         enable = true;
         nixGrammars = true;

home/programs/qutebrowser/default.nix

@@ -7,10 +7,10 @@ let
         "openLinksInNewTab": false,
         "locale": "fr-FR",
         "colors": {
-          "primary": "#${config.var.theme.colors.accent}",
-          "background": "#${config.var.theme.colors.bg}",
-          "foreground": "#${config.var.theme.colors.fg}",
-          "muted": "#${config.var.theme.colors.c8}"
+          "primary": "#${config.lib.stylix.colors.base0D}",
+          "background": "#${config.lib.stylix.colors.base00}",
+          "foreground": "#${config.lib.stylix.colors.base05}",
+          "muted": "#${config.lib.stylix.colors.base03}"
         },
         "folders": [
           {
@@ -73,7 +73,7 @@ let
 
 in {
 
-  imports = [ ./duckduckgo-colorscheme.nix ];
+  # imports = [ ./duckduckgo-colorscheme.nix ];
 
   programs.qutebrowser = {
     enable = true;

home/programs/shell/default.nix

@@ -1,11 +1,4 @@
 {
-  imports = [
-    ./fzf.nix
-    ./zsh.nix
-    ./starship.nix
-    ./zoxide.nix
-    ./tmux.nix
-    ./lazygit.nix
-    ./eza.nix
-  ];
+  imports =
+    [ ./fzf.nix ./zsh.nix ./starship.nix ./zoxide.nix ./tmux.nix ./eza.nix ];
 }

home/programs/shell/lazygit.nix

@@ -1,13 +0,0 @@
-{ config, ... }: {
-  programs.lazygit = {
-    enable = true;
-    settings = {
-      gui.theme = {
-        ligthTheme = false;
-        activeBorderColor = [ "${config.var.theme.colors.accentName}" "bold" ];
-        inactiveBorderColor = [ "black" ];
-        selectedLineBgColor = [ "default" ];
-      };
-    };
-  };
-}

home/programs/shell/starship.nix

@@ -10,10 +10,10 @@
         "$git_status"
         "$character"
       ];
-      directory = { style = "#${config.var.theme.colors.accent}"; };
+      directory = { style = "#${config.lib.stylix.colors.base0D}"; };
 
       character = {
-        success_symbol = "[❯](#${config.var.theme.colors.accent})";
+        success_symbol = "[❯](#${config.lib.stylix.colors.base0D})";
         error_symbol = "[❯](red)";
         vimcmd_symbol = "[❮](cyan)";
       };

home/system/gtk/default.nix

@@ -6,131 +6,130 @@
     style.name = "gtk2";
   };
 
-  gtk = {
-    enable = true;
-
-    theme = { name = "FlatColor"; };
-
-    iconTheme = {
-      package = pkgs.kora-icon-theme;
-      name = "Kora";
-    };
-
-    font = {
-      name = config.var.theme.font;
-      size = config.var.theme.font-size;
-    };
-
-    gtk3.extraConfig = {
-      Settings = ''
-        gtk-application-prefer-dark-theme=1
-      '';
-    };
-
-    gtk4.extraConfig = {
-      Settings = ''
-        gtk-application-prefer-dark-theme=1
-      '';
-    };
-  };
-
-  home.pointerCursor = {
-    gtk.enable = true;
-    package = pkgs.bibata-cursors;
-    name = "Bibata-Modern-Classic";
-    size = 14;
-  };
-
-  home.file = {
-    ".local/share/themes/FlatColor" = {
-      recursive = true;
-      source = pkgs.stdenv.mkDerivation {
-        name = "FlatColor";
-
-        src = pkgs.fetchFromGitHub {
-          owner = "jasperro";
-          repo = "FlatColor";
-          rev = "0a56c50e8c5e2ad35f6174c19a00e01b30874074";
-          hash = "sha256-P8RnYTk9Z1rCBEEMLTVRrNr5tUM/Pc9dsdMtpHd1Y18=";
-        };
-
-        buildPhase = ''
-          mkdir -p $out
-          # delete the default gtk-color-scheme:
-          file="./gtk-2.0/gtkrc"
-          sed -i '3,29d' $file
-          sed -i '3i include "../colors2"' $file
-
-          file="./gtk-3.0/gtk.css"
-          sed -i '2,10d' $file
-          sed -i '2i @import url("../colors3");' $file
-
-          file="./gtk-3.20/gtk.css"
-          sed -i '2,26d' $file
-          sed -i '2i @import url("../colors3");' $file
-
-          cp -r . $out 
-        '';
-      };
-    };
-
-    ".local/share/themes/FlatColor/colors2".text = ''
-      bg_color:#${config.var.theme.colors.bg}
-      color0:#${config.var.theme.colors.c0}
-      color1:#${config.var.theme.colors.c1}
-      color2:#${config.var.theme.colors.c2}
-      color3:#${config.var.theme.colors.c3}
-      color4:#${config.var.theme.colors.c4}
-      color5:#${config.var.theme.colors.c5}
-      color6:#${config.var.theme.colors.c6}
-      color7:#${config.var.theme.colors.c7}
-      color8:#${config.var.theme.colors.c8}
-      color9:#${config.var.theme.colors.c9}
-      color10:#${config.var.theme.colors.c10}
-      color11:#${config.var.theme.colors.c11}
-      color12:#${config.var.theme.colors.c12}
-      color13:#${config.var.theme.colors.c13}
-      color14:#${config.var.theme.colors.c14}
-      color15:#${config.var.theme.colors.c15}
-      text_color:#${config.var.theme.colors.fg}
-      selected_bg_color:#${config.var.theme.colors.accent}
-      selected_fg_color:#${config.var.theme.colors.accentFg}
-      tooltip_bg_color:#${config.var.theme.colors.bgalt}
-      tooltip_fg_color:#${config.var.theme.colors.fgalt}
-      titlebar_bg_color:#${config.var.theme.colors.bgalt}
-      titlebar_fg_color:#${config.var.theme.colors.fgalt}
-      menu_bg_color:#${config.var.theme.colors.bgalt}
-      menu_fg_color:#${config.var.theme.colors.fgalt}
-      link_color:#${config.var.theme.colors.accent}
-    '';
-
-    ".local/share/themes/FlatColor/colors3".text = ''
-      @define-color color0 #${config.var.theme.colors.c0};
-      @define-color color1 #${config.var.theme.colors.c1};
-      @define-color color2 #${config.var.theme.colors.c2};
-      @define-color color3 #${config.var.theme.colors.c3};
-      @define-color color4 #${config.var.theme.colors.c4};
-      @define-color color5 #${config.var.theme.colors.c5};
-      @define-color color6 #${config.var.theme.colors.c6};
-      @define-color color7 #${config.var.theme.colors.c7};
-      @define-color color8 #${config.var.theme.colors.c8};
-      @define-color color9 #${config.var.theme.colors.c9};
-      @define-color color10 #${config.var.theme.colors.c10};
-      @define-color color11 #${config.var.theme.colors.c11};
-      @define-color color12 #${config.var.theme.colors.c12};
-      @define-color color13 #${config.var.theme.colors.c13};
-      @define-color color14 #${config.var.theme.colors.c14};
-      @define-color color15 #${config.var.theme.colors.c15};
-      @define-color selected_bg_color #${config.var.theme.colors.accent};
-      @define-color selected_fg_color #${config.var.theme.colors.accentFg};
-
-      @define-color bg_color #${config.var.theme.colors.bg};
-      @define-color fg_color #${config.var.theme.colors.fg};
-      @define-color base_color @bg_color;
-      @define-color text_color @fg_color;
-      @define-color text_color_disabled mix(@text_color, @base_color, 0.4);
-      @define-color tooltip_bg_color #${config.var.theme.colors.bgalt};
-      @define-color tooltip_fg_color #${config.var.theme.colors.fgalt};
-    '';
-  };
+  gtk = { enable = true; };
+  #
+  #   theme = { name = "FlatColor"; };
+  #
+  #   iconTheme = {
+  #     package = pkgs.kora-icon-theme;
+  #     name = "Kora";
+  #   };
+  #
+  #   font = {
+  #     name = config.var.theme.font;
+  #     size = config.var.theme.font-size;
+  #   };
+  #
+  #   gtk3.extraConfig = {
+  #     Settings = ''
+  #       gtk-application-prefer-dark-theme=1
+  #     '';
+  #   };
+  #
+  #   gtk4.extraConfig = {
+  #     Settings = ''
+  #       gtk-application-prefer-dark-theme=1
+  #     '';
+  #   };
+  # };
+  #
+  # home.pointerCursor = {
+  #   gtk.enable = true;
+  #   package = pkgs.bibata-cursors;
+  #   name = "Bibata-Modern-Classic";
+  #   size = 14;
+  # };
+  #
+  # home.file = {
+  #   ".local/share/themes/FlatColor" = {
+  #     recursive = true;
+  #     source = pkgs.stdenv.mkDerivation {
+  #       name = "FlatColor";
+  #
+  #       src = pkgs.fetchFromGitHub {
+  #         owner = "jasperro";
+  #         repo = "FlatColor";
+  #         rev = "0a56c50e8c5e2ad35f6174c19a00e01b30874074";
+  #         hash = "sha256-P8RnYTk9Z1rCBEEMLTVRrNr5tUM/Pc9dsdMtpHd1Y18=";
+  #       };
+  #
+  #       buildPhase = ''
+  #         mkdir -p $out
+  #         # delete the default gtk-color-scheme:
+  #         file="./gtk-2.0/gtkrc"
+  #         sed -i '3,29d' $file
+  #         sed -i '3i include "../colors2"' $file
+  #
+  #         file="./gtk-3.0/gtk.css"
+  #         sed -i '2,10d' $file
+  #         sed -i '2i @import url("../colors3");' $file
+  #
+  #         file="./gtk-3.20/gtk.css"
+  #         sed -i '2,26d' $file
+  #         sed -i '2i @import url("../colors3");' $file
+  #
+  #         cp -r . $out 
+  #       '';
+  #     };
+  #   };
+  #
+  #   ".local/share/themes/FlatColor/colors2".text = ''
+  #     bg_color:#${config.var.theme.colors.bg}
+  #     color0:#${config.var.theme.colors.c0}
+  #     color1:#${config.var.theme.colors.c1}
+  #     color2:#${config.var.theme.colors.c2}
+  #     color3:#${config.var.theme.colors.c3}
+  #     color4:#${config.var.theme.colors.c4}
+  #     color5:#${config.var.theme.colors.c5}
+  #     color6:#${config.var.theme.colors.c6}
+  #     color7:#${config.var.theme.colors.c7}
+  #     color8:#${config.var.theme.colors.c8}
+  #     color9:#${config.var.theme.colors.c9}
+  #     color10:#${config.var.theme.colors.c10}
+  #     color11:#${config.var.theme.colors.c11}
+  #     color12:#${config.var.theme.colors.c12}
+  #     color13:#${config.var.theme.colors.c13}
+  #     color14:#${config.var.theme.colors.c14}
+  #     color15:#${config.var.theme.colors.c15}
+  #     text_color:#${config.var.theme.colors.fg}
+  #     selected_bg_color:#${config.var.theme.colors.accent}
+  #     selected_fg_color:#${config.var.theme.colors.accentFg}
+  #     tooltip_bg_color:#${config.var.theme.colors.bgalt}
+  #     tooltip_fg_color:#${config.var.theme.colors.fgalt}
+  #     titlebar_bg_color:#${config.var.theme.colors.bgalt}
+  #     titlebar_fg_color:#${config.var.theme.colors.fgalt}
+  #     menu_bg_color:#${config.var.theme.colors.bgalt}
+  #     menu_fg_color:#${config.var.theme.colors.fgalt}
+  #     link_color:#${config.var.theme.colors.accent}
+  #   '';
+  #
+  #   ".local/share/themes/FlatColor/colors3".text = ''
+  #     @define-color color0 #${config.var.theme.colors.c0};
+  #     @define-color color1 #${config.var.theme.colors.c1};
+  #     @define-color color2 #${config.var.theme.colors.c2};
+  #     @define-color color3 #${config.var.theme.colors.c3};
+  #     @define-color color4 #${config.var.theme.colors.c4};
+  #     @define-color color5 #${config.var.theme.colors.c5};
+  #     @define-color color6 #${config.var.theme.colors.c6};
+  #     @define-color color7 #${config.var.theme.colors.c7};
+  #     @define-color color8 #${config.var.theme.colors.c8};
+  #     @define-color color9 #${config.var.theme.colors.c9};
+  #     @define-color color10 #${config.var.theme.colors.c10};
+  #     @define-color color11 #${config.var.theme.colors.c11};
+  #     @define-color color12 #${config.var.theme.colors.c12};
+  #     @define-color color13 #${config.var.theme.colors.c13};
+  #     @define-color color14 #${config.var.theme.colors.c14};
+  #     @define-color color15 #${config.var.theme.colors.c15};
+  #     @define-color selected_bg_color #${config.var.theme.colors.accent};
+  #     @define-color selected_fg_color #${config.var.theme.colors.accentFg};
+  #
+  #     @define-color bg_color #${config.var.theme.colors.bg};
+  #     @define-color fg_color #${config.var.theme.colors.fg};
+  #     @define-color base_color @bg_color;
+  #     @define-color text_color @fg_color;
+  #     @define-color text_color_disabled mix(@text_color, @base_color, 0.4);
+  #     @define-color tooltip_bg_color #${config.var.theme.colors.bgalt};
+  #     @define-color tooltip_fg_color #${config.var.theme.colors.fgalt};
+  #   '';
+  # };
 }

home/system/hyprland/default.nix

@@ -4,7 +4,7 @@
     ./hyprlock.nix
     ./hypridle.nix
     ./hyprpaper.nix
-    ./hyprcursor.nix
+    # ./hyprcursor.nix
     ./hyprpanel.nix
   ];
 

home/system/hyprland/hypridle.nix

@@ -1,7 +1,4 @@
 { pkgs, ... }: {
-  # wayland.windowManager.hyprland.settings.exec-once =
-  #   [ "${pkgs.hypridle}/bin/hypridle" ];
-
   services.hypridle = {
     enable = true;
     settings = {

home/system/hyprland/hyprlock.nix

@@ -1,5 +1,6 @@
-{ config, ... }: {
-
+{ config, ... }:
+let foreground = "rgba(216, 222, 233, 0.70)";
+in {
   programs.hyprlock = {
     enable = true;
     settings = {
@@ -12,10 +13,10 @@
       # BACKGROUND
       background = {
         monitor = "";
-        path = "~/wallpapers/${config.var.theme.wallpaper}";
+        path = toString config.stylix.image;
         blur_passes = 0;
         contrast = 0.8916;
-        brightness = 0.8172;
+        brightness = 0.7172;
         vibrancy = 0.1696;
         vibrancy_darkness = 0.0;
       };
@@ -25,9 +26,9 @@
           # Day-Month-Date
           monitor = "";
           text = ''cmd[update:1000] echo -e "$(date +"%A, %B %d")"'';
-          color = "rgba(216, 222, 233, .7)";
+          color = foreground;
           font_size = 28;
-          font_family = "SFProDisplay Nerd Font Bold";
+          font_family = config.stylix.fonts.serif.name + " Bold";
           position = "0, 490";
           halign = "center";
           valign = "center";
@@ -36,7 +37,7 @@
         {
           monitor = "";
           text = ''cmd[update:1000] echo "<span>$(date +"%I:%M")</span>"'';
-          color = "rgba(216, 222, 233, .7)";
+          color = foreground;
           font_size = 160;
           font_family = "steelfish outline regular";
           position = "0, 370";
@@ -47,34 +48,19 @@
         {
           monitor = "";
           text = "    $USER";
-          color = "rgba(216, 222, 233, 0.80)";
+          color = foreground;
           outline_thickness = 2;
           dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8
           dots_spacing = 0.2; # Scale of dots' absolute size, 0.0 - 1.0
           dots_center = true;
           font_size = 18;
-          font_family = "SFProDisplay Nerd Font Bold";
+          font_family = config.stylix.fonts.serif.name + " Bold";
           position = "0, -180";
           halign = "center";
           valign = "center";
         }
       ];
 
-      # Foreground
-      # image = [{
-      #   monitor = "";
-      #   path = "~/.config/hypr/foreground.png";
-      #   size = 700;
-      #   border_size = 0;
-      #   rounding = 0;
-      #   rotate = 0;
-      #   reload_time = 0;
-      #   reload_cmd = "";
-      #   position = "0, -66";
-      #   halign = "center";
-      #   valign = "center";
-      # }];
-
       # INPUT FIELD
       input-field = [{
         monitor = "";
@@ -85,11 +71,10 @@
         dots_center = true;
         outer_color = "rgba(255, 255, 255, 0)";
         inner_color = "rgba(255, 255, 255, 0.1)";
-        font_color = "rgb(200, 200, 200)";
+        font_color = foreground;
         fade_on_empty = false;
-        font_family = "SFProDisplay Nerd Font Bold";
-        placeholder_text =
-          ''<i><span foreground="##ffffff99">🔒 Enter Pass</span></i>'';
+        font_family = config.stylix.fonts.serif.name + " Bold";
+        placeholder_text = "<i>🔒 Enter Pass</i>";
         hide_input = false;
         position = "0, -250";
         halign = "center";

home/system/hyprland/hyprpanel.nix

@@ -67,7 +67,7 @@
               ]
             }
           },
-          "theme.font.name": "${config.var.theme.font}",
+          "theme.font.name": "${config.stylix.fonts.serif.name}",
           "theme.font.size": "${toString config.var.theme.bar.font-size}px",
           "theme.bar.outer_spacing": "${
             if config.var.theme.bar.floating
@@ -96,9 +96,9 @@
           "theme.bar.buttons.padding_x": "0.8rem",
           "theme.bar.buttons.padding_y": "0.4rem",
 
-          "theme.bar.buttons.workspaces.hover": "#${config.var.theme.colors.accentalt}",
-          "theme.bar.buttons.workspaces.active": "#${config.var.theme.colors.accent}",
-          "theme.bar.buttons.workspaces.available": "#${config.var.theme.colors.bg}",
+          "theme.bar.buttons.workspaces.hover": "#${config.lib.stylix.colors.base0A}",
+          "theme.bar.buttons.workspaces.active": "#${config.lib.stylix.colors.base0D}",
+          "theme.bar.buttons.workspaces.available": "#${config.lib.stylix.colors.base00}",
 
           "theme.bar.margin_top": "1.0em",
           "theme.bar.margin_sides": "${toString config.var.theme.gaps-out}px",
@@ -168,61 +168,61 @@
 
           "theme.bar.menus.monochrome": true,
           "wallpaper.enable": false,
-          "theme.bar.menus.background": "#${config.var.theme.colors.bg}",
-          "theme.bar.menus.cards": "#${config.var.theme.colors.bgalt}",
+          "theme.bar.menus.background": "#${config.lib.stylix.colors.base00}",
+          "theme.bar.menus.cards": "#${config.lib.stylix.colors.base01}",
           "theme.bar.menus.card_radius": "${
             toString config.var.theme.rounding
           }px",
-          "theme.bar.menus.label": "#${config.var.theme.colors.fg}",
-          "theme.bar.menus.text": "#${config.var.theme.colors.fg}",
+          "theme.bar.menus.label": "#${config.lib.stylix.colors.base05}",
+          "theme.bar.menus.text": "#${config.lib.stylix.colors.base05}",
           "theme.bar.menus.border.size": "${
             toString config.var.theme.border-size
           }px",
-          "theme.bar.menus.border.color": "#${config.var.theme.colors.accent}",
+          "theme.bar.menus.border.color": "#${config.lib.stylix.colors.base0D}",
           "theme.bar.menus.border.radius": "${
             toString config.var.theme.rounding
           }px",
-          "theme.bar.menus.popover.text": "#${config.var.theme.colors.fg}",
-          "theme.bar.menus.popover.background": "#${config.var.theme.colors.bgalt}",
-          "theme.bar.menus.listitems.active": "#${config.var.theme.colors.accent}",
-          "theme.bar.menus.icons.active": "#${config.var.theme.colors.accent}",
-          "theme.bar.menus.switch.enabled": "#${config.var.theme.colors.accent}",
-          "theme.bar.menus.check_radio_button.active": "#${config.var.theme.colors.accent}",
-          "theme.bar.menus.buttons.default": "#${config.var.theme.colors.accent}",
-          "theme.bar.menus.buttons.active": "#${config.var.theme.colors.accent}",
-          "theme.bar.menus.iconbuttons.active": "#${config.var.theme.colors.accent}",
-          "theme.bar.menus.progressbar.foreground": "#${config.var.theme.colors.accent}",
-          "theme.bar.menus.slider.primary": "#${config.var.theme.colors.accent}",
-          "theme.bar.menus.tooltip.background": "#${config.var.theme.colors.bgalt}",
-          "theme.bar.menus.tooltip.text": "#${config.var.theme.colors.fg}",
-          "theme.bar.menus.dropdownmenu.background": "#${config.var.theme.colors.bgalt}",
-          "theme.bar.menus.dropdownmenu.text": "#${config.var.theme.colors.fg}",
-          "theme.bar.background": "#${config.var.theme.colors.bg}",
+          "theme.bar.menus.popover.text": "#${config.lib.stylix.colors.base05}",
+          "theme.bar.menus.popover.background": "#${config.lib.stylix.colors.base01}",
+          "theme.bar.menus.listitems.active": "#${config.lib.stylix.colors.base0D}",
+          "theme.bar.menus.icons.active": "#${config.lib.stylix.colors.base0D}",
+          "theme.bar.menus.switch.enabled": "#${config.lib.stylix.colors.base0D}",
+          "theme.bar.menus.check_radio_button.active": "#${config.lib.stylix.colors.base0D}",
+          "theme.bar.menus.buttons.default": "#${config.lib.stylix.colors.base0D}",
+          "theme.bar.menus.buttons.active": "#${config.lib.stylix.colors.base0D}",
+          "theme.bar.menus.iconbuttons.active": "#${config.lib.stylix.colors.base0D}",
+          "theme.bar.menus.progressbar.foreground": "#${config.lib.stylix.colors.base0D}",
+          "theme.bar.menus.slider.primary": "#${config.lib.stylix.colors.base0D}",
+          "theme.bar.menus.tooltip.background": "#${config.lib.stylix.colors.base01}",
+          "theme.bar.menus.tooltip.text": "#${config.lib.stylix.colors.base05}",
+          "theme.bar.menus.dropdownmenu.background": "#${config.lib.stylix.colors.base01}",
+          "theme.bar.menus.dropdownmenu.text": "#${config.lib.stylix.colors.base05}",
+          "theme.bar.background": "#${config.lib.stylix.colors.base00}",
           "theme.bar.buttons.style": "default",
           "theme.bar.buttons.monochrome": true,
-          "theme.bar.buttons.text": "#${config.var.theme.colors.fg}",
-          "theme.bar.buttons.background": "#${config.var.theme.colors.bgalt}",
-          "theme.bar.buttons.icon": "#${config.var.theme.colors.accent}",
-          "theme.bar.buttons.notifications.background": "#${config.var.theme.colors.bgalt}",
-          "theme.bar.buttons.hover": "#${config.var.theme.colors.bg}",
-          "theme.bar.buttons.notifications.hover": "#${config.var.theme.colors.bg}",
-          "theme.bar.buttons.notifications.total": "#${config.var.theme.colors.accent}",
-          "theme.bar.buttons.notifications.icon": "#${config.var.theme.colors.accent}",
-          "theme.notification.background": "#${config.var.theme.colors.bgalt}",
-          "theme.notification.actions.background": "#${config.var.theme.colors.accent}",
-          "theme.notification.actions.text": "#${config.var.theme.colors.fg}",
-          "theme.notification.label": "#${config.var.theme.colors.accent}",
-          "theme.notification.border": "#${config.var.theme.colors.bgalt}",
-          "theme.notification.text": "#${config.var.theme.colors.fgalt}",
-          "theme.notification.labelicon": "#${config.var.theme.colors.accent}",
-          "theme.osd.bar_color": "#${config.var.theme.colors.accent}",
-          "theme.osd.bar_overflow_color": "#${config.var.theme.colors.accentalt}",
-          "theme.osd.icon": "#${config.var.theme.colors.bg}",
-          "theme.osd.icon_container": "#${config.var.theme.colors.accent}",
-          "theme.osd.label": "#${config.var.theme.colors.accent}",
-          "theme.osd.bar_container": "#${config.var.theme.colors.bgalt}",
-          "theme.bar.menus.menu.media.background.color": "#${config.var.theme.colors.bgalt}",
-          "theme.bar.menus.menu.media.card.color": "#${config.var.theme.colors.bgalt}",
+          "theme.bar.buttons.text": "#${config.lib.stylix.colors.base05}",
+          "theme.bar.buttons.background": "#${config.lib.stylix.colors.base01}",
+          "theme.bar.buttons.icon": "#${config.lib.stylix.colors.base0D}",
+          "theme.bar.buttons.notifications.background": "#${config.lib.stylix.colors.base01}",
+          "theme.bar.buttons.hover": "#${config.lib.stylix.colors.base00}",
+          "theme.bar.buttons.notifications.hover": "#${config.lib.stylix.colors.base00}",
+          "theme.bar.buttons.notifications.total": "#${config.lib.stylix.colors.base0D}",
+          "theme.bar.buttons.notifications.icon": "#${config.lib.stylix.colors.base0D}",
+          "theme.notification.background": "#${config.lib.stylix.colors.base01}",
+          "theme.notification.actions.background": "#${config.lib.stylix.colors.base0D}",
+          "theme.notification.actions.text": "#${config.lib.stylix.colors.base05}",
+          "theme.notification.label": "#${config.lib.stylix.colors.base0D}",
+          "theme.notification.border": "#${config.lib.stylix.colors.base01}",
+          "theme.notification.text": "#${config.lib.stylix.colors.base05}",
+          "theme.notification.labelicon": "#${config.lib.stylix.colors.base0D}",
+          "theme.osd.bar_color": "#${config.lib.stylix.colors.base0D}",
+          "theme.osd.bar_overflow_color": "#${config.lib.stylix.colors.base0A}",
+          "theme.osd.icon": "#${config.lib.stylix.colors.base00}",
+          "theme.osd.icon_container": "#${config.lib.stylix.colors.base0D}",
+          "theme.osd.label": "#${config.lib.stylix.colors.base0D}",
+          "theme.osd.bar_container": "#${config.lib.stylix.colors.base01}",
+          "theme.bar.menus.menu.media.background.color": "#${config.lib.stylix.colors.base01}",
+          "theme.bar.menus.menu.media.card.color": "#${config.lib.stylix.colors.base01}",
           "theme.bar.menus.menu.media.card.tint": 90,
           "bar.customModules.updates.pollingInterval": 1440000,
           "bar.media.show_active_only": true

home/system/hyprland/hyprpaper.nix

@@ -1,15 +1,10 @@
-{ pkgs, config, ... }: {
-  # wayland.windowManager.hyprland.settings.exec-once =
-  #   [ "${pkgs.hyprpaper}/bin/hyprpaper" ];
-
+{ ... }: {
   services.hyprpaper = {
     enable = true;
     settings = {
       ipc = "on";
       splash = false;
       splash_offset = 2.0;
-      preload = [ "~/wallpapers/${config.var.theme.wallpaper}" ];
-      wallpaper = [ ",~/wallpapers/${config.var.theme.wallpaper}" ];
     };
   };
 }

home/system/wlogout/default.nix

@@ -1,117 +0,0 @@
-{ config, pkgs, ... }: {
-
-  programs.wlogout = {
-    enable = true;
-    layout = [
-      {
-        label = "shutdown";
-        action = "systemctl poweroff";
-        text = "Shutdown";
-        keybind = "s";
-      }
-      {
-        label = "reboot";
-        action = "systemctl reboot";
-        text = "Reboot";
-        keybind = "r";
-      }
-      {
-        label = "lock";
-        action = "${pkgs.hyprlock}/bin/hyprlock";
-        text = "Lock";
-        keybind = "l";
-      }
-      {
-        label = "suspend";
-        action = "systemctl suspend";
-        text = "Suspend";
-        keybind = "u";
-      }
-      {
-        label = "logout";
-        action = "killall -9 Hyprland sleep 2";
-        text = "Exit";
-        keybind = "e";
-      }
-      {
-        label = "hibernate";
-        action = "systemctl hibernate";
-        text = "Hibernate";
-        keybind = "h";
-      }
-    ];
-
-    style = ''
-            * {
-              font-family: "${config.var.theme.font}";
-              background-image: none;
-              transition: 20ms;
-            }
-
-          window {
-            background-color: rgba(12,12,12,0.5);
-          }
-
-          button {
-      color: #${config.var.theme.colors.fg};
-             font-size:20px;
-
-             background-repeat: no-repeat;
-             background-position: center;
-             background-size: 25%;
-
-              border: 3px solid #${config.var.theme.colors.bg};
-             background-color: #${config.var.theme.colors.bg};
-              box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-          }
-
-      button:focus,
-               button:active {
-      color: #${config.var.theme.colors.accentFg};
-             background-color: #${config.var.theme.colors.accent};
-      border: 3px solid #${config.var.theme.colors.accent};
-               }
-
-             /* 
-                ----------------------------------------------------- 
-                Buttons
-                ----------------------------------------------------- 
-              */
-
-      #lock,#logout,#suspend,#hibernate,#shutdown,#reboot {
-        margin: 10px;
-        border-radius: ${toString config.var.theme.rounding}px;
-      }
-
-      #lock {
-              background-image: image(url("icons/lock.png"));
-      }
-
-      #logout {
-              background-image: image(url("icons/logout.png"));
-      }
-
-      #suspend {
-              background-image: image(url("icons/suspend.png"));
-      }
-
-      #hibernate {
-              background-image: image(url("icons/hibernate.png"));
-      }
-
-      #shutdown {
-              background-image: image(url("icons/shutdown.png"));
-      }
-
-      #reboot {
-              background-image: image(url("icons/reboot.png"));
-      }
-    '';
-  };
-
-  xdg.configFile."wlogout/icons" = {
-    recursive = false;
-    source = ./icons;
-  };
-
-}