treewide: move regreet styling out of module

modules/hm/programs/default.nix

@@ -6,6 +6,7 @@
     ./media
     ./terminal
 
+    ./discord.nix
     ./games.nix
     ./gnome.nix
     ./misc.nix

modules/hm/programs/discord.nix

@@ -1,13 +1,15 @@
 {
   lib,
-  config,
+  pkgs,
+  osConfig,
   ...
 }: let
-  cfg = config.local.style;
+  styleCfg = osConfig.local.style;
 in {
-  config.home-manager.sharedModules = lib.mkIf cfg.enable [
+  config = lib.mkIf osConfig.local.profiles.desktop.enable {
-    {
+    home.packages = [pkgs.vesktop];
-      xdg.configFile."vesktop/themes/midnight-base16.css".text = with cfg.scheme.palette; ''
+    xdg.configFile."vesktop/themes/midnight-base16.css".text = with styleCfg.scheme.palette;
+      lib.mkIf styleCfg.enable ''
         /**
          * @name Midnight-base16
          * @description A dark, rounded discord theme. Updated to use base16 colors.
@@ -30,7 +32,7 @@ in {
          --font: 'gg sans';
 
          /* top left corner text */
-         --corner-text: '${cfg.scheme.name}';
+         --corner-text: '${styleCfg.scheme.name}';
 
          /* color of status indicators and window controls */
             --online-indicator: ${base0B}; /* change to #23a55a for default green */
@@ -108,6 +110,5 @@ in {
             fill: var(--text-0) !important;
         }
       '';
-    }
+  };
-  ];
 }

modules/hm/programs/editors/neovim.nix

@@ -4,225 +4,230 @@
   pkgs,
   osConfig,
   ...
-}: {
+}: let
+  styleCfg = osConfig.local.style;
+in {
   imports = [inputs.nvf.homeManagerModules.default];
 
   config = lib.mkIf osConfig.local.profiles.desktop.enable {
     programs.nvf = {
       enable = true;
-      settings.vim = {
+      settings.vim = lib.mkMerge [
-        viAlias = true;
+        {
-        vimAlias = true;
+          viAlias = true;
-        enableLuaLoader = true;
+          vimAlias = true;
-        preventJunkFiles = true;
+          enableLuaLoader = true;
-        useSystemClipboard = true;
+          preventJunkFiles = true;
-        options = {
+          useSystemClipboard = true;
-          tabstop = 4;
+          options = {
-          autoindent = false;
+            tabstop = 4;
-        };
+            autoindent = false;
+          };
 
-        luaConfigPost = ''
+          luaConfigPost = ''
-          vim.opt.formatoptions:remove('c')
+            vim.opt.formatoptions:remove('c')
-          vim.opt.formatoptions:remove('r')
+            vim.opt.formatoptions:remove('r')
-          vim.opt.formatoptions:remove('o')
+            vim.opt.formatoptions:remove('o')
-        '';
+          '';
 
-        maps = {
+          maps = {
-          normal = {
+            normal = {
-            "<leader>m" = {
+              "<leader>m" = {
-              silent = true;
+                silent = true;
-              action = "<cmd>make<CR>";
+                action = "<cmd>make<CR>";
-            }; # Same as nnoremap <leader>m <silent> <cmd>make<CR>
+              }; # Same as nnoremap <leader>m <silent> <cmd>make<CR>
-            "<leader>t" = {
+              "<leader>t" = {
-              silent = true;
+                silent = true;
-              action = "<cmd>Neotree toggle<CR>";
+                action = "<cmd>Neotree toggle<CR>";
+              };
             };
           };
-        };
 
-        theme = lib.mkDefault {
+          ui = {
-          enable = true;
+            noice.enable = true;
-          name = "catppuccin";
+          };
-          style = "macchiato";
+          notify.nvim-notify.enable = true;
-        };
 
-        ui = {
+          statusline = {
-          noice.enable = true;
+            lualine = {
-        };
+              enable = true;
-        notify.nvim-notify.enable = true;
+              theme = "auto";
+              componentSeparator = {
+                left = "";
+              };
+              sectionSeparator = {
+                left = "";
+                right = "";
+              };
 
-        statusline = {
+              activeSection = {
-          lualine = {
+                a = [
+                  ''
+                    {
+                      "mode",
+                      separator = { right = "" },
+                      right_padding = 2
+                    }
+                  ''
+                ];
+                b = [
+                  ''
+                    {
+                      "branch",
+                      icon = '',
+                      separator = { right = "" }
+                    }
+                  ''
+                ];
+                c = [
+                  ''
+                    "filename"
+                  ''
+                ];
+                x = [
+                  ''
+                    {
+                      "diagnostics",
+                      sources = {'nvim_lsp', 'nvim_diagnostic', 'nvim_diagnostic', 'vim_lsp', 'coc'},
+                      symbols = {error = '󰅙  ', warn = '  ', info = '  ', hint = '󰌵 '},
+                      colored = true,
+                      update_in_insert = false,
+                      always_visible = false,
+                      diagnostics_color = {
+                        color_error = { fg = 'red' },
+                        color_warn = { fg = 'yellow' },
+                        color_info = { fg = 'cyan' },
+                      },
+                    }
+                  ''
+                  ''
+                    "filetype"
+                  ''
+                ];
+                y = [
+                  ''
+                    {
+                      "progress",
+                      separator = { left = "" },
+                    }
+                  ''
+                  ''
+                  ''
+                ];
+                z = [
+                  ''
+                    {
+                      "location",
+                      separator = { left = "" },
+                      left_padding = 2
+                    }
+                  ''
+                  ''
+                    {
+                      "fileformat",
+                      color = {fg='black'},
+                      symbols = {
+                        unix = '', -- e712
+                        dos = '',  -- e70f
+                        mac = '',  -- e711
+                      },
+                    }
+                  ''
+                ];
+              };
+
+              inactiveSection = {
+                a = [
+                  ''
+                    "filename"
+                  ''
+                ];
+                z = [
+                  ''
+                    "location"
+                  ''
+                ];
+              };
+            };
+          };
+
+          git.enable = true;
+
+          utility = {
+            vim-wakatime.enable = true;
+            surround.enable = true;
+            motion.leap = {
+              enable = true;
+            };
+          };
+
+          lsp = {
             enable = true;
-            theme = "auto";
+            lspSignature.enable = true;
-            componentSeparator = {
+            lspconfig.enable = true;
-              left = "";
+            formatOnSave = true;
-            };
+            mappings = {
-            sectionSeparator = {
+              addWorkspaceFolder = "<leader>wa";
-              left = "";
+              codeAction = "<leader>a";
-              right = "";
+              goToDeclaration = "gD";
-            };
+              goToDefinition = "gd";
-
+              hover = "K";
-            activeSection = {
+              listImplementations = "gi";
-              a = [
+              listReferences = "gr";
-                ''
+              listWorkspaceFolders = "<leader>wl";
-                  {
+              nextDiagnostic = "<leader>k";
-                    "mode",
+              previousDiagnostic = "<leader>j";
-                    separator = { right = "" },
+              openDiagnosticFloat = "<leader>e";
-                    right_padding = 2
+              removeWorkspaceFolder = "<leader>wr";
-                  }
+              renameSymbol = "<leader>r";
-                ''
+              signatureHelp = "<C-k>";
-              ];
-              b = [
-                ''
-                  {
-                    "branch",
-                    icon = '',
-                    separator = { right = "" }
-                  }
-                ''
-              ];
-              c = [
-                ''
-                  "filename"
-                ''
-              ];
-              x = [
-                ''
-                  {
-                    "diagnostics",
-                    sources = {'nvim_lsp', 'nvim_diagnostic', 'nvim_diagnostic', 'vim_lsp', 'coc'},
-                    symbols = {error = '󰅙  ', warn = '  ', info = '  ', hint = '󰌵 '},
-                    colored = true,
-                    update_in_insert = false,
-                    always_visible = false,
-                    diagnostics_color = {
-                      color_error = { fg = 'red' },
-                      color_warn = { fg = 'yellow' },
-                      color_info = { fg = 'cyan' },
-                    },
-                  }
-                ''
-                ''
-                  "filetype"
-                ''
-              ];
-              y = [
-                ''
-                  {
-                    "progress",
-                    separator = { left = "" },
-                  }
-                ''
-                ''
-                ''
-              ];
-              z = [
-                ''
-                  {
-                    "location",
-                    separator = { left = "" },
-                    left_padding = 2
-                  }
-                ''
-                ''
-                  {
-                    "fileformat",
-                    color = {fg='black'},
-                    symbols = {
-                      unix = '', -- e712
-                      dos = '',  -- e70f
-                      mac = '',  -- e711
-                    },
-                  }
-                ''
-              ];
-            };
-
-            inactiveSection = {
-              a = [
-                ''
-                  "filename"
-                ''
-              ];
-              z = [
-                ''
-                  "location"
-                ''
-              ];
             };
           };
-        };
 
-        git.enable = true;
+          autocomplete.nvim-cmp = {
-
-        utility = {
-          vim-wakatime.enable = true;
-          surround.enable = true;
-          motion.leap = {
             enable = true;
           };
-        };
 
-        lsp = {
+          autopairs.nvim-autopairs.enable = true;
-          enable = true;
+
-          lspSignature.enable = true;
+          languages = {
-          lspconfig.enable = true;
+            enableExtraDiagnostics = true;
-          formatOnSave = true;
+            enableFormat = true;
-          mappings = {
+            enableLSP = true;
-            addWorkspaceFolder = "<leader>wa";
+            enableTreesitter = true;
-            codeAction = "<leader>a";
+
-            goToDeclaration = "gD";
+            nix.enable = true;
-            goToDefinition = "gd";
+            clang.enable = true;
-            hover = "K";
+            python.enable = true;
-            listImplementations = "gi";
+            ts.enable = true;
-            listReferences = "gr";
+            css.enable = true;
-            listWorkspaceFolders = "<leader>wl";
+            typst.enable = true;
-            nextDiagnostic = "<leader>k";
-            previousDiagnostic = "<leader>j";
-            openDiagnosticFloat = "<leader>e";
-            removeWorkspaceFolder = "<leader>wr";
-            renameSymbol = "<leader>r";
-            signatureHelp = "<C-k>";
           };
-        };
 
-        autocomplete.nvim-cmp = {
+          treesitter = {
-          enable = true;
+            enable = true;
-        };
+            fold = true;
+            context.enable = true;
+            grammars = [
+              pkgs.vimPlugins.nvim-treesitter.builtGrammars.nix
+              pkgs.vimPlugins.nvim-treesitter.builtGrammars.c
+              pkgs.vimPlugins.nvim-treesitter.builtGrammars.python
+            ];
+          };
 
-        autopairs.nvim-autopairs.enable = true;
+          binds.whichKey.enable = true;
+          filetree.neo-tree.enable = true;
 
-        languages = {
+          telescope.enable = true;
-          enableExtraDiagnostics = true;
+        }
-          enableFormat = true;
+        (lib.mkIf styleCfg.enable {
-          enableLSP = true;
+          theme = {
-          enableTreesitter = true;
+            enable = true;
-
+            name = "base16";
-          nix.enable = true;
+            base16-colors = styleCfg.scheme.palette;
-          clang.enable = true;
+          };
-          python.enable = true;
+        })
-          ts.enable = true;
+      ];
-          css.enable = true;
-          typst.enable = true;
-        };
-
-        treesitter = {
-          enable = true;
-          fold = true;
-          context.enable = true;
-          grammars = [
-            pkgs.vimPlugins.nvim-treesitter.builtGrammars.nix
-            pkgs.vimPlugins.nvim-treesitter.builtGrammars.c
-            pkgs.vimPlugins.nvim-treesitter.builtGrammars.python
-          ];
-        };
-
-        binds.whichKey.enable = true;
-        filetree.neo-tree.enable = true;
-
-        telescope.enable = true;
-      };
     };
 
     programs.neovide = {

modules/hm/programs/hypr/land/default.nix

@@ -4,7 +4,10 @@
   pkgs,
   osConfig,
   ...
-}: {
+}: let
+  inherit (builtins) toString;
+  styleCfg = osConfig.local.style;
+in {
   imports = [./binds.nix];
 
   config = lib.mkIf osConfig.local.modules.hyprland.enable {
@@ -35,85 +38,103 @@
 
       systemd.enable = false;
 
-      settings = {
+      settings = lib.mkMerge [
-        xwayland = {
+        {
-          force_zero_scaling = true;
+          xwayland = {
-        };
+            force_zero_scaling = true;
-
-        env = [
-          "GDK_SCALE,1"
-        ];
-
-        cursor = {
-          no_hardware_cursors = 1;
-        };
-
-        monitor = [
-          "eDP-1, preferred, auto, 1.33"
-        ];
-        workspace = [
-          "special:terminal, on-created-empty:foot"
-          "special:mixer_gui, on-created-empty:pavucontrol"
-          "special:file_manager_gui, on-created-empty:nautilus"
-          "special:file_manager_tui, on-created-empty:foot -- yazi"
-        ];
-
-        windowrulev2 = [
-          # fixes fullscreen windows (mostly games)
-          "stayfocused, initialtitle:^()$, initialclass:^(steam)$"
-          "minsize 1 1, initialtitle:^()$, initialclass:^(steam)$"
-          "maximize, initialtitle:^(\S+)$, initialclass:^(steamwebhelper)$"
-
-          "immediate, initialclass:^(steam_app_)(.*)$"
-          "fullscreen, initialclass:^(steam_app_)(.*)$"
-
-          # inhibit idle on every fullscreen app except games
-          "idleinhibit always, fullscreen:1,!initialclass:^(steam_app_)(.*)$"
-        ];
-
-        render = {
-          explicit_sync = 1;
-          explicit_sync_kms = 1;
-          expand_undersized_textures = false;
-        };
-
-        animations = {
-          enabled = true;
-          bezier = "myBezier, 0.05, 0.9, 0.1, 1.1";
-          animation = [
-            "windows, 1, 5, myBezier"
-            "windowsOut, 1, 5, default, popin 80%"
-            "windowsMove, 1, 5, default, popin 80%"
-            "fade, 1, 5, default"
-            "border, 1, 5, default"
-            "borderangle, 0, 8, default"
-            "workspaces, 0"
-            "specialWorkspace, 0"
-          ];
-        };
-
-        input = {
-          kb_options = "compose:ralt";
-          touchpad = {
-            natural_scroll = true;
-            scroll_factor = 0.8;
-            tap-to-click = true;
-            clickfinger_behavior = true;
           };
-        };
 
-        gestures = {
+          env = [
-          workspace_swipe = true;
+            "GDK_SCALE,1"
-          workspace_swipe_direction_lock = false;
+          ];
-          workspace_swipe_cancel_ratio = 0.15;
-        };
 
-        misc = {
+          cursor = {
-          force_default_wallpaper = 0;
+            no_hardware_cursors = 1;
-          disable_hyprland_logo = true;
+          };
-          middle_click_paste = false;
+
-        };
+          monitor = [
-      };
+            "eDP-1, preferred, auto, 1.33"
+          ];
+          workspace = [
+            "special:terminal, on-created-empty:foot"
+            "special:mixer_gui, on-created-empty:pavucontrol"
+            "special:file_manager_gui, on-created-empty:nautilus"
+            "special:file_manager_tui, on-created-empty:foot -- yazi"
+          ];
+
+          windowrulev2 = [
+            # fixes fullscreen windows (mostly games)
+            "stayfocused, initialtitle:^()$, initialclass:^(steam)$"
+            "minsize 1 1, initialtitle:^()$, initialclass:^(steam)$"
+            "maximize, initialtitle:^(\S+)$, initialclass:^(steamwebhelper)$"
+
+            "immediate, initialclass:^(steam_app_)(.*)$"
+            "fullscreen, initialclass:^(steam_app_)(.*)$"
+
+            # inhibit idle on every fullscreen app except games
+            "idleinhibit always, fullscreen:1,!initialclass:^(steam_app_)(.*)$"
+          ];
+
+          render = {
+            explicit_sync = 1;
+            explicit_sync_kms = 1;
+            expand_undersized_textures = false;
+          };
+
+          animations = {
+            enabled = true;
+            bezier = "myBezier, 0.05, 0.9, 0.1, 1.1";
+            animation = [
+              "windows, 1, 5, myBezier"
+              "windowsOut, 1, 5, default, popin 80%"
+              "windowsMove, 1, 5, default, popin 80%"
+              "fade, 1, 5, default"
+              "border, 1, 5, default"
+              "borderangle, 0, 8, default"
+              "workspaces, 0"
+              "specialWorkspace, 0"
+            ];
+          };
+
+          input = {
+            kb_options = "compose:ralt";
+            touchpad = {
+              natural_scroll = true;
+              scroll_factor = 0.8;
+              tap-to-click = true;
+              clickfinger_behavior = true;
+            };
+          };
+
+          gestures = {
+            workspace_swipe = true;
+            workspace_swipe_direction_lock = false;
+            workspace_swipe_cancel_ratio = 0.15;
+          };
+
+          misc = {
+            force_default_wallpaper = 0;
+            disable_hyprland_logo = true;
+            middle_click_paste = false;
+          };
+        }
+
+        (lib.mkIf styleCfg.enable {
+          env = [
+            "HYPRCURSOR_THEME,${styleCfg.cursorTheme.name}"
+            "HYPRCURSOR_SIZE,${toString styleCfg.cursorTheme.size}"
+            "XCURSOR_SIZE,${toString styleCfg.cursorTheme.size}"
+          ];
+          general = {
+            border_size = 4;
+            "col.active_border" = "rgb(${lib.removePrefix "#" styleCfg.scheme.palette.base0E})";
+          };
+          decoration = {
+            rounding = 10;
+            blur.enabled = true;
+          };
+        })
+      ];
     };
   };
 }

modules/hm/programs/hypr/lock.nix

@@ -1,14 +1,114 @@
 {
   lib,
+  lib',
   inputs,
   pkgs,
   osConfig,
   ...
-}: {
+}: let
+  styleCfg = osConfig.local.style;
+  rgbaPalette = builtins.mapAttrs (_: c: (lib'.rgba c 1)) styleCfg.scheme.palette;
+in {
   config = lib.mkIf osConfig.local.modules.hyprland.enable {
     programs.hyprlock = {
       enable = true;
       package = inputs.hyprlock.packages.${pkgs.system}.hyprlock;
+
+      settings = lib.mkMerge [
+        {
+          general = {
+            disable_loading_bar = true;
+            hide_cursor = true;
+          };
+        }
+
+        (with rgbaPalette;
+          lib.mkIf styleCfg.enable {
+            background = [
+              {
+                path = "screenshot";
+                blur_passes = 3;
+                blur_size = 8;
+              }
+            ];
+
+            label = [
+              {
+                monitor = "";
+                text = "Layout: $LAYOUT";
+                font_size = 25;
+                color = base05;
+
+                position = "30, -30";
+                halign = "left";
+                valign = "top";
+              }
+              {
+                monitor = "";
+                text = "$TIME";
+                font_size = 90;
+                color = base05;
+
+                position = "-30, 0";
+                halign = "right";
+                valign = "top";
+              }
+              {
+                monitor = "";
+                text = "cmd[update:43200000] date +\"%A, %d %B %Y\"";
+                font_size = 25;
+                color = base05;
+
+                position = "-30, -150";
+                halign = "right";
+                valign = "top";
+              }
+            ];
+
+            image = {
+              monitor = "";
+              path = "${styleCfg.avatar}"; # Replace with your avatar path
+              size = 100;
+              border_color = base0D;
+
+              position = "0, 75";
+              halign = "center";
+              valign = "center";
+            };
+
+            input-field = [
+              {
+                monitor = "";
+
+                size = "300, 60";
+                outline_thickness = 4;
+                dots_size = 0.2;
+                dots_spacing = 0.2;
+                dots_center = true;
+
+                outer_color = base0D;
+                inner_color = base02;
+                font_color = base05;
+
+                fade_on_empty = false;
+
+                # the span elements still use #RRGGBB, so we use scheme directly
+                placeholder_text = "<span foreground=\"#${styleCfg.scheme.palette.base05}\"><i>󰌾 Logged in as </i><span foreground=\"#${styleCfg.scheme.palette.base0D}\">$USER</span></span>";
+
+                hide_input = false;
+                check_color = base0D;
+                fail_color = base08;
+
+                fail_text = "<i>$FAIL <b>($ATTEMPTS)</b></i>";
+                capslock_color = base0E;
+
+                position = "0, -47";
+                halign = "center";
+                valign = "center";
+              }
+            ];
+          })
+      ];
     };
   };
 }

modules/hm/programs/misc.nix

@@ -19,7 +19,6 @@
       playerctl
       proton-pass
       simple-scan
-      vesktop
       wl-clipboard
     ];
 

modules/hm/programs/terminal/emulators/foot.nix

@@ -3,7 +3,11 @@
   config,
   osConfig,
   ...
-}: {
+}: let
+  styleCfg = osConfig.local.style;
+  # because someone thought this was a great idea: https://github.com/tinted-theming/schemes/commit/61058a8d2e2bd4482b53d57a68feb56cdb991f0b
+  palette = builtins.mapAttrs (_: color: lib.removePrefix "#" color) styleCfg.scheme.palette;
+in {
   config = lib.mkIf osConfig.local.modules.hyprland.enable {
     programs.foot = {
       enable = true;
@@ -13,6 +17,37 @@
           font = "monospace:size=14";
           shell = "${lib.getExe config.programs.fish.package}";
         };
+
+        colors = with palette;
+          lib.mkIf styleCfg.enable {
+            background = base00;
+            foreground = base05;
+
+            regular0 = base00;
+            regular1 = base08;
+            regular2 = base0B;
+            regular3 = base0A;
+            regular4 = base0D;
+            regular5 = base0E;
+            regular6 = base0C;
+            regular7 = base05;
+
+            bright0 = base02;
+            bright1 = base08;
+            bright2 = base0B;
+            bright3 = base0A;
+            bright4 = base0D;
+            bright5 = base0E;
+            bright6 = base0C;
+            bright7 = base07;
+
+            "16" = base09;
+            "17" = base0F;
+            "18" = base01;
+            "19" = base02;
+            "20" = base04;
+            "21" = base06;
+          };
       };
     };
   };

modules/hm/programs/terminal/shell/fish.nix

@@ -14,6 +14,7 @@
       starship module cmd_duration
     end
   '';
+  styleCfg = osConfig.local.style;
 in {
   config = lib.mkIf osConfig.local.profiles.desktop.enable {
     programs.fish = {
@@ -24,7 +25,43 @@ in {
           set fish_greeting # Disable greeting
           fish_vi_key_bindings # Enable Vi mode
 
+        ''
+        + lib.optionalString styleCfg.enable
+        ''
+          set fish_cursor_default     block      blink
+          set fish_cursor_insert      line       blink
+          set fish_cursor_replace_one underscore blink
+          set fish_cursor_visual      block
+
+          set -x fish_color_autosuggestion      brblack
+          set -x fish_color_cancel              -r
+          set -x fish_color_command             brgreen
+          set -x fish_color_comment             brmagenta
+          set -x fish_color_cwd                 green
+          set -x fish_color_cwd_root            red
+          set -x fish_color_end                 brmagenta
+          set -x fish_color_error               brred
+          set -x fish_color_escape              brcyan
+          set -x fish_color_history_current     --bold
+          set -x fish_color_host                normal
+          set -x fish_color_host_remote         yellow
+          set -x fish_color_match               --background=brblue
+          set -x fish_color_normal              normal
+          set -x fish_color_operator            cyan
+          set -x fish_color_param               brblue
+          set -x fish_color_quote               yellow
+          set -x fish_color_redirection         bryellow
+          set -x fish_color_search_match        'bryellow' '--background=brblack'
+          set -x fish_color_selection           'white' '--bold' '--background=brblack'
+          set -x fish_color_status              red
+          set -x fish_color_user                brgreen
+          set -x fish_color_valid_path          --underline
+          set -x fish_pager_color_completion    normal
+          set -x fish_pager_color_description   yellow
+          set -x fish_pager_color_prefix        'white' '--bold' '--underline'
+          set -x fish_pager_color_progress      'brwhite' '--background=cyan'
         '';
+
       plugins = [
         {
           name = "fzf";

modules/hm/services/default.nix

@@ -1,6 +1,7 @@
 {
   imports = [
     ./gammastep.nix
+    ./gtk.nix
     ./syncthing.nix
     ./swaync
     ./udiskie.nix

modules/hm/services/gtk.nix

@@ -1,20 +1,19 @@
 {
   lib,
-  config,
+  osConfig,
   ...
 }: let
-  cfg = config.local.style;
+  styleCfg = osConfig.local.style;
-  inherit (cfg) scheme;
 in {
-  home-manager.sharedModules = lib.mkIf cfg.enable [
+  config = with styleCfg;
-    {
+    lib.mkIf styleCfg.enable {
       gtk = rec {
         enable = true;
         iconTheme = {
-          inherit (cfg.gtk.iconTheme) name package;
+          inherit (gtk.iconTheme) name package;
         };
         theme = {
-          inherit (cfg.gtk.theme) name package;
+          inherit (gtk.theme) name package;
         };
 
         gtk3.extraConfig = {
@@ -24,6 +23,5 @@ in {
       };
 
       dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-${scheme.variant}";
-    }
+    };
-  ];
 }

modules/hm/services/swaync/default.nix

@@ -1,33 +1,41 @@
 {
   lib,
+  lib',
   osConfig,
   ...
 }: let
-  inherit (builtins) readFile;
+  styleCfg = osConfig.local.style;
 in {
   config = lib.mkIf osConfig.local.modules.hyprland.enable {
-    services.swaync = {
+    services.swaync = lib.mkMerge [
-      enable = true;
+      {
-      style = readFile ./style.css;
+        enable = true;
-      settings = {
+        settings = {
-        positionX = "right";
+          positionX = "right";
-        positionY = "top";
+          positionY = "top";
-        layer = "overlay";
+          layer = "overlay";
-        control-center-layer = "top";
+          control-center-layer = "top";
-        layer-shell = true;
+          layer-shell = true;
-        cssPriority = "application";
+          cssPriority = "application";
-        control-center-margin-top = 0;
+          control-center-margin-top = 0;
-        control-center-margin-bottom = 0;
+          control-center-margin-bottom = 0;
-        control-center-margin-right = 0;
+          control-center-margin-right = 0;
-        control-center-margin-left = 0;
+          control-center-margin-left = 0;
-        notification-2fa-action = true;
+          notification-2fa-action = true;
-        notification-inline-replies = false;
+          notification-inline-replies = false;
-        notification-icon-size = 64;
+          notification-icon-size = 64;
-        notification-body-image-height = 100;
+          notification-body-image-height = 100;
-        notification-body-image-width = 200;
+          notification-body-image-width = 200;
-      };
+        };
-    };
+      }
-    # systemd.user.services.swaync.Service.Environment = "WAYLAND_DISPLAY=wayland-1";
+
+      (lib.mkIf styleCfg.enable {
+        style =
+          lib'.generateGtkColors lib styleCfg.scheme.palette
+          + builtins.readFile ./style.css;
+      })
+    ];
+
     systemd.user.services.swaync.Unit.ConditionEnvironment = lib.mkForce "";
   };
 }

modules/nix/core/home-manager.nix

@@ -5,6 +5,7 @@
   ...
 }: let
   inherit (config.local.systemVars) username;
+  lib' = import ../../../shared/lib inputs.nixpkgs.lib;
 in {
   imports = [
     inputs.home-manager.nixosModules.default
@@ -16,7 +17,7 @@ in {
       useGlobalPkgs = true;
       useUserPackages = true;
 
-      extraSpecialArgs = {inherit inputs;};
+      extraSpecialArgs = {inherit inputs lib';};
       sharedModules = [../../hm];
     };
 

modules/nix/services/greetd.nix

@@ -1,8 +1,8 @@
 {
-  config,
-  inputs,
   lib,
+  inputs,
   pkgs,
+  config,
   ...
 }:
 # thanks https://git.jacekpoz.pl/poz/niksos/src/commit/f8d5e7ccd9c769f7c0b564f10dff419285e75248/modules/services/greetd.nix
@@ -10,6 +10,8 @@ let
   inherit (lib) getExe getExe';
   inherit (inputs.hyprland.packages.${pkgs.stdenv.system}) hyprland;
 
+  styleCfg = config.local.style;
+
   hyprctl = getExe' hyprland "hyprctl";
   Hyprland = getExe' hyprland "Hyprland";
 
@@ -46,9 +48,25 @@ in {
       };
     };
 
-    programs.regreet = {
+    programs.regreet = lib.mkMerge [
-      enable = true;
+      {
-    };
+        enable = true;
+      }
+
+      (lib.mkIf styleCfg.enable {
+        theme = {
+          inherit (styleCfg.gtk.theme) name package;
+        };
+
+        cursorTheme = {
+          inherit (styleCfg.cursorTheme) name package;
+        };
+
+        iconTheme = {
+          inherit (styleCfg.gtk.iconTheme) name package;
+        };
+      })
+    ];
 
     security.pam.services = {
       greetd.enableGnomeKeyring = true;

modules/nix/style/modules/fish.nix

@@ -1,46 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.local.style;
-in {
-  config.home-manager.sharedModules = lib.mkIf cfg.enable [
-    {
-      programs.fish.interactiveShellInit = ''
-        set fish_cursor_default     block      blink
-        set fish_cursor_insert      line       blink
-        set fish_cursor_replace_one underscore blink
-        set fish_cursor_visual      block
-
-        set -x fish_color_autosuggestion      brblack
-        set -x fish_color_cancel              -r
-        set -x fish_color_command             brgreen
-        set -x fish_color_comment             brmagenta
-        set -x fish_color_cwd                 green
-        set -x fish_color_cwd_root            red
-        set -x fish_color_end                 brmagenta
-        set -x fish_color_error               brred
-        set -x fish_color_escape              brcyan
-        set -x fish_color_history_current     --bold
-        set -x fish_color_host                normal
-        set -x fish_color_host_remote         yellow
-        set -x fish_color_match               --background=brblue
-        set -x fish_color_normal              normal
-        set -x fish_color_operator            cyan
-        set -x fish_color_param               brblue
-        set -x fish_color_quote               yellow
-        set -x fish_color_redirection         bryellow
-        set -x fish_color_search_match        'bryellow' '--background=brblack'
-        set -x fish_color_selection           'white' '--bold' '--background=brblack'
-        set -x fish_color_status              red
-        set -x fish_color_user                brgreen
-        set -x fish_color_valid_path          --underline
-        set -x fish_pager_color_completion    normal
-        set -x fish_pager_color_description   yellow
-        set -x fish_pager_color_prefix        'white' '--bold' '--underline'
-        set -x fish_pager_color_progress      'brwhite' '--background=cyan'
-      '';
-    }
-  ];
-}

modules/nix/style/modules/foot.nix

@@ -1,45 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.local.style;
-in {
-  config.home-manager.sharedModules = lib.mkIf cfg.enable [
-    {
-      programs.foot.settings.colors = let
-        # because someone thought this was a great idea: https://github.com/tinted-theming/schemes/commit/61058a8d2e2bd4482b53d57a68feb56cdb991f0b
-        palette = builtins.mapAttrs (_: color: lib.removePrefix "#" color) cfg.scheme.palette;
-      in
-        with palette; {
-          background = base00;
-          foreground = base05;
-
-          regular0 = base00;
-          regular1 = base08;
-          regular2 = base0B;
-          regular3 = base0A;
-          regular4 = base0D;
-          regular5 = base0E;
-          regular6 = base0C;
-          regular7 = base05;
-
-          bright0 = base02;
-          bright1 = base08;
-          bright2 = base0B;
-          bright3 = base0A;
-          bright4 = base0D;
-          bright5 = base0E;
-          bright6 = base0C;
-          bright7 = base07;
-
-          "16" = base09;
-          "17" = base0F;
-          "18" = base01;
-          "19" = base02;
-          "20" = base04;
-          "21" = base06;
-        };
-    }
-  ];
-}

modules/nix/style/modules/fuzzel.nix

@@ -1,27 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.local.style;
-  inherit (cfg) scheme;
-in {
-  config.home-manager.sharedModules = lib.mkIf cfg.enable [
-    {
-      programs.fuzzel.settings = {
-        main = {
-          font = "sans-serif:size=16";
-        };
-        colors = with scheme.palette; {
-          background = "${base01}f2";
-          text = "${base05}ff";
-          match = "${base0E}ff";
-          selection = "${base03}ff";
-          selection-text = "${base06}ff";
-          selection-match = "${base0E}ff";
-          border = "${base0E}ff";
-        };
-      };
-    }
-  ];
-}

modules/nix/style/modules/hyprland.nix

@@ -1,27 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.local.style;
-in {
-  config.home-manager.sharedModules = lib.mkIf cfg.enable [
-    {
-      wayland.windowManager.hyprland.settings = {
-        env = [
-          "HYPRCURSOR_THEME,phinger-cursors-light"
-          "HYPRCURSOR_SIZE,32"
-          "XCURSOR_SIZE,32"
-        ];
-        general = {
-          border_size = 4;
-          "col.active_border" = "rgb(${lib.removePrefix "#" cfg.scheme.palette.base0E})";
-        };
-        decoration = {
-          rounding = 10;
-          blur.enabled = true;
-        };
-      };
-    }
-  ];
-}

modules/nix/style/modules/hyprlock.nix

@@ -1,109 +0,0 @@
-{
-  lib,
-  lib',
-  config,
-  ...
-}: let
-  cfg = config.local.style;
-
-  # hyprlock takes colors such as rgb[a](r, g, b [, a])
-  rgbaPalette = builtins.mapAttrs (_: c: (lib'.rgba c 1)) cfg.scheme.palette;
-in {
-  config.home-manager.sharedModules = with rgbaPalette;
-    lib.mkIf cfg.enable [
-      {
-        programs.hyprlock = {
-          settings = {
-            background = [
-              {
-                path = "screenshot";
-                blur_passes = 3;
-                blur_size = 8;
-              }
-            ];
-
-            general = {
-              disable_loading_bar = true;
-              hide_cursor = true;
-            };
-
-            label = [
-              {
-                monitor = "";
-                text = "Layout: $LAYOUT";
-                font_size = 25;
-                color = base05;
-
-                position = "30, -30";
-                halign = "left";
-                valign = "top";
-              }
-              {
-                monitor = "";
-                text = "$TIME";
-                font_size = 90;
-                color = base05;
-
-                position = "-30, 0";
-                halign = "right";
-                valign = "top";
-              }
-              {
-                monitor = "";
-                text = "cmd[update:43200000] date +\"%A, %d %B %Y\"";
-                font_size = 25;
-                color = base05;
-
-                position = "-30, -150";
-                halign = "right";
-                valign = "top";
-              }
-            ];
-
-            image = {
-              monitor = "";
-              path = "${cfg.avatar}"; # Replace with your avatar path
-              size = 100;
-              border_color = base0D;
-
-              position = "0, 75";
-              halign = "center";
-              valign = "center";
-            };
-
-            input-field = [
-              {
-                monitor = "";
-
-                size = "300, 60";
-                outline_thickness = 4;
-                dots_size = 0.2;
-                dots_spacing = 0.2;
-                dots_center = true;
-
-                outer_color = base0D;
-                inner_color = base02;
-                font_color = base05;
-
-                fade_on_empty = false;
-
-                # the span elements still use #RRGGBB, so we use scheme directly
-                placeholder_text = "<span foreground=\"#${cfg.scheme.palette.base05}\"><i>󰌾 Logged in as </i><span foreground=\"#${cfg.scheme.palette.base0D}\">$USER</span></span>";
-
-                hide_input = false;
-                check_color = base0D;
-                fail_color = base08;
-
-                fail_text = "<i>$FAIL <b>($ATTEMPTS)</b></i>";
-                capslock_color = base0E;
-
-                position = "0, -47";
-                halign = "center";
-                valign = "center";
-              }
-            ];
-          };
-        };
-      }
-    ];
-}

modules/nix/style/modules/niri.nix

@@ -1,21 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.local.style;
-in {
-  config.home-manager.sharedModules = lib.mkIf cfg.enable [
-    {
-      programs.niri = {
-        settings = {
-          layout.focus-ring.active.color = cfg.scheme.palette.base0D;
-          cursor = {
-            inherit (cfg.cursorTheme) size;
-            theme = cfg.cursorTheme.name;
-          };
-        };
-      };
-    }
-  ];
-}

modules/nix/style/modules/nvf.nix

@@ -1,17 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.local.style;
-in {
-  config.home-manager.sharedModules = lib.mkIf cfg.enable [
-    {
-      programs.nvf.settings.vim.theme = {
-        enable = true;
-        name = "base16";
-        base16-colors = cfg.scheme.palette;
-      };
-    }
-  ];
-}

modules/nix/style/modules/regreet.nix

@@ -1,21 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.local.style;
-in {
-  config.programs.regreet = lib.mkIf cfg.enable {
-    theme = {
-      inherit (cfg.gtk.theme) name package;
-    };
-
-    cursorTheme = {
-      inherit (cfg.cursorTheme) name package;
-    };
-
-    iconTheme = {
-      inherit (cfg.gtk.iconTheme) name package;
-    };
-  };
-}

modules/nix/style/modules/swaylock.nix

@@ -1,47 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.local.style;
-in {
-  config.home-manager.sharedModules = with cfg.scheme.palette;
-    lib.mkIf cfg.enable [
-      {
-        programs.swaylock.settings = {
-          inside-color = base01;
-          line-color = base01;
-          ring-color = base05;
-          text-color = base05;
-
-          inside-clear-color = base0A;
-          line-clear-color = base0A;
-          ring-clear-color = base00;
-          text-clear-color = base00;
-
-          inside-caps-lock-color = base03;
-          line-caps-lock-color = base03;
-          ring-caps-lock-color = base00;
-          text-caps-lock-color = base00;
-
-          inside-ver-color = base0D;
-          line-ver-color = base0D;
-          ring-ver-color = base00;
-          text-ver-color = base00;
-
-          inside-wrong-color = base08;
-          line-wrong-color = base08;
-          ring-wrong-color = base00;
-          text-wrong-color = base00;
-
-          caps-lock-bs-hl-color = base08;
-          caps-lock-key-hl-color = base0D;
-          bs-hl-color = base08;
-          key-hl-color = base0D;
-
-          separator-color = "#00000000"; # transparent
-          layout-bg-color = "#00000050"; # semi-transparent black
-        };
-      }
-    ];
-}

modules/nix/style/modules/swaync.nix

@@ -1,14 +0,0 @@
-{
-  config,
-  lib,
-  lib',
-  ...
-}: let
-  cfg = config.local.style;
-in {
-  config.home-manager.sharedModules = lib.mkIf cfg.enable [
-    {
-      services.swaync.style = lib'.generateGtkColors lib cfg.scheme.palette;
-    }
-  ];
-}