Remove 'with' from most modules

modules/hm/alacritty.nix

@@ -1,9 +1,8 @@
 { pkgs, ... }:
 let
-  strPalette = with pkgs.rice;
+  strPalette = pkgs.lib.nix-rice.palette.toRgbHex rec {
-    pkgs.lib.nix-rice.palette.toRgbHex rec {
+    inherit (pkgs.rice.colorPalette) normal bright primary;
-      inherit (colorPalette) normal bright primary;
+    dim = pkgs.rice.colorPalette.dark;
-      dim = colorPalette.dark;
     cursor = {
       cursor = normal.white;
       text = normal.black;

modules/hm/bspwm.nix

@@ -1,5 +1,4 @@
 { pkgs, lib, ... }:
-with pkgs.lib.nix-rice;
 let
   xsetroot = "${pkgs.xorg.xsetroot}/bin/xsetroot";
   monitorPages = [ "Ⅰ" "Ⅱ" "Ⅲ" "Ⅳ" "Ⅴ" "Ⅵ" "Ⅶ" "Ⅷ" "Ⅸ" "Ⅹ" ];
@@ -12,7 +11,7 @@ let
     systemctl --user restart polybar # Restart polybar
     systemctl --user restart kdeconnect-indicator # Restart polybar
   '';
-  strPalette = palette.toRGBHex pkgs.rice.colorPalette;
+  strPalette = pkgs.lib.nix-rice.palette.toRGBHex pkgs.rice.colorPalette;
 in
 {
   xsession.windowManager.bspwm = {

modules/hm/development/cpp.nix

@@ -1,9 +1,10 @@
 { pkgs, config, lib, ... }: {
   home.packages =
-    lib.optionals config.programs.helix.enable builtins.attrValues
+    lib.optionals config.programs.helix.enable
-      {
+      (builtins.attrValues {
         inherit (pkgs) clang-tools cmake-language-server;
-      } ++ lib.optionals config.programs.kakoune.enable builtins.attrValues {
+      }) ++
+    lib.optionals config.programs.kakoune.enable (builtins.attrValues {
       inherit (pkgs) clang-tools cmake-language-server;
-    };
+    });
 }

modules/hm/development/data.nix

@@ -1,11 +1,10 @@
 { config, pkgs, lib, ... }: {
-  home.packages =
+  home.packages = lib.optionals config.programs.helix.enable
-    lib.optionals config.programs.helix.enable builtins.attrValues
+    (builtins.attrValues {
-      {
       inherit (pkgs) yaml-language-server taplo-cli;
       inherit (pkgs.nodePackages) vscode-langservers-extracted;
-      } ++ lib.optionals config.programs.kakoune.enable builtins.attrValues {
+    }) ++ lib.optionals config.programs.kakoune.enable (builtins.attrValues {
     inherit (pkgs) yaml-language-server;
     inherit (pkgs.nodePackages) vscode-langservers-extracted;
-    };
+  });
 }

modules/hm/development/docker.nix

@@ -1,9 +1,6 @@
 { pkgs, config, lib, ... }: {
-  home.packages =
+  home.packages = (builtins.attrValues { inherit (pkgs) docker-compose docker-machine; })
-    builtins.attrValues { inherit (pkgs) docker-compose docker-machine; }
+    ++ lib.optionals config.programs.helix.enable (builtins.attrValues { inherit (pkgs.nodePackages) dockerfile-language-server-nodejs; });
-    ++ lib.optionals config.programs.helix.enable builtins.attrValues {
-      inherit (pkgs.nodePackages) dockerfile-language-server-nodejs;
-    };
   home.shellAliases = {
     "dkcd" = "docker-compose down";
     "dkc" = "docker-compose";

modules/hm/development/go.nix

@@ -4,6 +4,7 @@
     goPath = ".go";
   };
 
-  home.packages = lib.optionals config.programs.helix.enable [ pkgs.gopls ]
+  home.packages =
-    ++ (lib.optionals config.programs.kakoune.enable [ pkgs.gopls ]);
+    (lib.optionals config.programs.helix.enable [ pkgs.gopls ]) ++
+    (lib.optionals config.programs.kakoune.enable [ pkgs.gopls ]);
 }

modules/hm/development/javascript.nix

@@ -1,11 +1,10 @@
 { pkgs, lib, config, ... }: {
-  home.packages =
+  home.packages = lib.optionals config.programs.helix.enable
-    lib.optionals config.programs.helix.enable builtins.attrValues
+    (builtins.attrValues {
-      {
       inherit (pkgs.nodePackages) typescript-language-server;
-      } ++ lib.optionals config.programs.kakoune.enable builtins.attrValues {
+    }) ++ lib.optionals config.programs.kakoune.enable (builtins.attrValues {
     inherit (pkgs.nodePackages) typescript-language-server;
-    };
+  });
   programs.neovim.withNodeJs = true;
 }
 

modules/hm/development/nix.nix

@@ -1,8 +1,7 @@
 { pkgs, config, lib, ... }: {
-  home.packages = builtins.attrValues
+  home.packages = (builtins.attrValues {
-    {
     inherit (pkgs) nixpkgs-fmt nixfmt nix-prefetch-scripts nix-review nix-tree;
-    } ++ lib.optionals config.programs.helix.enable [ pkgs.nil ]
+  }) ++ lib.optionals config.programs.helix.enable [ pkgs.nil ]
   ++ lib.optionals config.programs.kakoune.enable [ pkgs.rnix-lsp ];
   programs.neovim.plugins = [ pkgs.vimPlugins.vim-nix ];
 }

modules/hm/development/python.nix

@@ -5,16 +5,18 @@ let
   pyPkgs = py.pkgs;
 in
 {
-  home.packages = [ py pyPkgs.black ]
+  home.packages = [ py pyPkgs.black ] ++
-    ++ lib.optionals config.programs.helix.enable ([
+    lib.optionals config.programs.helix.enable ((builtins.attrValues {
-    pyPkgs.python-lsp-server
+      inherit (pyPkgs)
-    pyPkgs.pyls-flake8
+        python-lsp-server
-    pyPkgs.pyls-isort
+        pyls-flake8
-  ] ++ pyPkgs.python-lsp-server.optional-dependencies.all)
+        pyls-isort;
-    ++ lib.optionals config.programs.kakoune.enable ([
+    }) ++ pyPkgs.python-lsp-server.optional-dependencies.all) ++
-    pyPkgs.python-lsp-server
+    lib.optionals config.programs.kakoune.enable ((builtins.attrValues {
-    pyPkgs.pyls-flake8
+      inherit (pyPkgs)
-    pyPkgs.pyls-isort
+        python-lsp-server
-  ] ++ pyPkgs.python-lsp-server.optional-dependencies.all);
+        pyls-flake8
+        pyls-isort;
+    }) ++ pyPkgs.python-lsp-server.optional-dependencies.all);
   programs.neovim.withPython3 = true;
 }

modules/hm/development/rust.nix

@@ -3,8 +3,7 @@
     [build]
     rustc-wrapper = "${pkgs.sccache}/bin/sccache"
   '';
-  home.packages = builtins.attrValues
+  home.packages = (builtins.attrValues {
-    {
     inherit (pkgs)
       bacon cargo cargo-audit cargo-criterion cargo-deadlinks cargo-expand
       cargo-flamegraph cargo-fuzz cargo-hack cargo-hakari cargo-inspect
@@ -16,9 +15,7 @@
     # cargo-deny
     # cargo-deps
     # cargo-feature
-
+  })
-    } ++ lib.optionals config.programs.helix.enable
+  ++ lib.optionals config.programs.helix.enable (builtins.attrValues { inherit (pkgs) lldb rust-analyzer; })
-    (builtins.attrValues { inherit (pkgs) lldb rust-analyzer; })
+  ++ lib.optionals config.programs.kakoune.enable (builtins.attrValues { inherit (pkgs) rust-analyzer; });
-  ++ lib.optionals config.programs.kakoune.enable
-    (builtins.attrValues { inherit (pkgs) rust-analyzer; });
 }

modules/hm/dunst.nix

@@ -1,7 +1,9 @@
 { pkgs, ... }:
-with pkgs.lib.nix-rice;
+let
-let strPalette = palette.toRGBHex pkgs.rice.colorPalette;
+  inherit (pkgs.lib) nix-rice;
-in {
+  strPalette = nix-rice.palette.toRGBHex pkgs.rice.colorPalette;
+in
+{
   home.packages = builtins.attrValues {
     inherit (pkgs) dunst;
     inherit (pkgs.rice.font.normal) package;
@@ -26,7 +28,7 @@ in {
         notification_limit = 10;
         offset = "7x28";
         separator_color = strPalette.normal.blue;
-        transparency = 100 - float.round (pkgs.rice.opacity * 100);
+        transparency = 100 - nix-rice.float.round (pkgs.rice.opacity * 100);
         width = "(0, 320)";
       };
       urgency_low = {

modules/hm/dwarf-fortress.nix

@@ -1,9 +1,11 @@
 { pkgs, ... }:
 let
-  package = with pkgs.dwarf-fortress-packages;
+  dfp = pkgs.dwarf-fortress-packages;
-    dwarf-fortress-full.override {
+  package = dfp.dwarf-fortress-full.override {
-      theme = themes.ironhand;
+    theme = dfp.themes.ironhand;
     enableFPS = true;
   };
 in
-{ home.packages = [ package ]; }
+{
+  home.packages = [ package ];
+}

modules/hm/gnome_shell.nix

@@ -1,7 +1,8 @@
 { pkgs, ... }:
 
 let
-  gnomeExtensions = with pkgs.gnomeExtensions; [
+  gnomeExtensions = builtins.attrValues {
+    inherit (pkgs.gnomeExtensions)
       appindicator
       aylurs-widgets
       babar
@@ -27,6 +28,9 @@ let
       unite
       user-themes
       # vitals
-  ];
+      ;
+  };
 in
-{ home.packages = [ pkgs.gnome.gnome-tweaks ] ++ gnomeExtensions; }
+{
+  home.packages = [ pkgs.gnome.gnome-tweaks ] ++ gnomeExtensions;
+}

modules/hm/gtk_theme.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }: {
-  gtk = with pkgs.rice; {
+  gtk = {
     enable = true;
-    font = font.normal;
+    font = pkgs.rice.font.normal;
     iconTheme = {
       package = pkgs.qogir-icon-theme;
       name = "Qogir-dark";

modules/hm/mangohud.nix

@@ -1,6 +1,5 @@
 { pkgs, ... }:
-with pkgs.lib.nix-rice;
+let strPalette = pkgs.lib.nix-rice.palette.toRgbShortHex pkgs.rice.colorPalette;
-let strPalette = palette.toRgbShortHex pkgs.rice.colorPalette;
 in {
   programs.mangohud = {
     enable = true;

modules/hm/nemo.nix

@@ -1,6 +1,4 @@
 { pkgs, ... }: {
-  home.packages = with pkgs.cinnamon; [
+  home.packages = builtins.attrValues { inherit (pkgs.cinnamon) nemo; };
-    nemo
-  ];
 }
 

modules/hm/obs-studio.nix

@@ -2,7 +2,8 @@
   programs.obs-studio = {
     enable = true;
     package = pkgs.obs-studio;
-    plugins = with pkgs.obs-studio-plugins; [
+    plugins = builtins.attrValues {
+      inherit (pkgs.obs-studio-plugins)
         # obs-backgroundremoval
         # obs-multi-rtmp
         obs-nvfbc
@@ -10,11 +11,11 @@
         obs-vkcapture
         obs-backgroundremoval
         input-overlay
-
         # obs-linuxbrowser
         # obs-gstreamer
         # obs-move-transition
         # obs-multi-rtmp
-    ];
+        ;
+    };
   };
 }

modules/hm/pass.nix

@@ -1,14 +1,14 @@
 { pkgs, ... }: {
   programs.password-store = {
-    package = pkgs.pass.withExtensions (ext:
+    package = pkgs.pass.withExtensions (ext: (builtins.attrValues {
-      with ext; [
+      inherit (ext)
         # pass-audit
         pass-checkup
         pass-import
         pass-otp
         pass-tomb
-        pass-update
+        pass-update;
-      ]);
+    }));
     enable = true;
   };
 }

modules/hm/polybar.nix

@@ -1,7 +1,8 @@
 { nixosConfig, config, pkgs, lib, ... }:
-with lib;
 let
   inherit (pkgs.rice) colorPalette opacity;
+  inherit (pkgs.lib) nix-rice;
+  alpha = 255 * opacity;
   grep = "${pkgs.gnugrep}/bin/grep";
   cut = "${pkgs.coreutils}/bin/cut";
   pavucontrol = "${pkgs.pavucontrol}/bin/pavucontrol";
@@ -48,30 +49,27 @@ let
     PATH=$PATH:"${lib.makeBinPath [ pkgs.rofi pkgs.rofi-power-menu pkgs.zsh ]}"
     zsh -c 'rofi -show menu -modi "menu:rofi-power-menu --choices=shutdown/reboot/hibernate/logout"'
   '';
-  colors = with pkgs.lib.nix-rice;
+  colors = nix-rice.palette.toARGBHex rec {
-    let alpha = 255 * opacity;
-    in palette.toARGBHex rec {
-
     normal = {
-        foreground = color.darken 10 colorPalette.foreground;
+      foreground = nix-rice.color.darken 10 colorPalette.foreground;
-        background = color.setAlphaRgba alpha colorPalette.background;
+      background = nix-rice.color.setAlphaRgba alpha colorPalette.background;
       underline = colorPalette.normal.blue;
     };
 
     active = {
       inherit (colorPalette) foreground;
-        background = color.setAlphaRgba alpha colorPalette.background;
+      background = nix-rice.color.setAlphaRgba alpha colorPalette.background;
       underline = colorPalette.normal.yellow;
     };
 
     selected = {
       inherit (colorPalette) foreground;
-        background = color.setAlphaRgba alpha colorPalette.background;
+      background = nix-rice.color.setAlphaRgba alpha colorPalette.background;
       underline = colorPalette.bright.red;
     };
 
     inherit (colorPalette.normal) green red yellow;
-      inherit (color) transparent;
+    inherit (nix-rice.color) transparent;
     orange = colorPalette.bright.red;
     alert = orange;
   };
@@ -141,7 +139,7 @@ in
     settings = {
       "settings" = { screenchange-reload = false; };
 
-      "bar/primary" = recursiveUpdate commonBar {
+      "bar/primary" = lib.recursiveUpdate commonBar {
         modules-left = "bspwm";
         # modules-center =
         modules-right =
@@ -152,7 +150,7 @@ in
         };
       };
 
-      "bar/secondary" = recursiveUpdate commonBar {
+      "bar/secondary" = lib.recursiveUpdate commonBar {
         modules-left = "bspwm";
         # modules-center =
         modules-right =
@@ -172,13 +170,13 @@ in
         };
 
         format = {
-          charging = recursiveUpdate colors.selected {
+          charging = lib.recursiveUpdate colors.selected {
             text = "<animation-charging> <label-charging>";
           };
-          discharging = recursiveUpdate colors.active {
+          discharging = lib.recursiveUpdate colors.active {
             text = "<animation-discharging> <label-discharging>";
           };
-          full = recursiveUpdate colors.normal { text = " <label-full>"; };
+          full = lib.recursiveUpdate colors.normal { text = " <label-full>"; };
         };
 
         label.text = "%percentage%%";
@@ -202,16 +200,16 @@ in
             };
           in
           {
-            focused = recursiveUpdate common colors.selected;
+            focused = lib.recursiveUpdate common colors.selected;
-            occupied = recursiveUpdate common colors.active;
+            occupied = lib.recursiveUpdate common colors.active;
-            urgent = recursiveUpdate (recursiveUpdate common colors.active) { background = colors.alert; };
+            urgent = lib.recursiveUpdate (lib.recursiveUpdate common colors.active) { background = colors.alert; };
-            empty = recursiveUpdate common colors.normal;
+            empty = lib.recursiveUpdate common colors.normal;
           };
       };
 
       "module/cpu" = {
         type = "internal/cpu";
-        format = recursiveUpdate colors.normal { text = " <label>"; };
+        format = lib.recursiveUpdate colors.normal { text = " <label>"; };
         interval = 2;
         label = "%percentage-sum%%";
         ramp-load = ramp;
@@ -228,7 +226,7 @@ in
 
       "module/memory" = {
         type = "internal/memory";
-        format = recursiveUpdate colors.normal { text = " <label>"; };
+        format = lib.recursiveUpdate colors.normal { text = " <label>"; };
         interval = 2;
         label = "%percentage_used%%";
         ramp-used = ramp;
@@ -257,7 +255,7 @@ in
         format = {
           padding = 1;
           muted = colors.active;
-          volume = recursiveUpdate colors.normal {
+          volume = lib.recursiveUpdate colors.normal {
             text = "<ramp-volume> <label-volume>";
           };
         };
@@ -268,7 +266,7 @@ in
       };
 
       "module/temperature" = {
-        format = recursiveUpdate colors.normal {
+        format = lib.recursiveUpdate colors.normal {
           text = "<ramp> <label>";
           warn = {
             text = "<ramp> <label-warn>";
@@ -286,13 +284,13 @@ in
       };
       "module/powermenu" = {
         type = "custom/script";
-        format = recursiveUpdate colors.normal { padding = 0; };
+        format = lib.recursiveUpdate colors.normal { padding = 0; };
         exec = "echo ";
         click.left = "${powermenu}";
       };
       "module/notifications" = {
         type = "custom/script";
-        format = recursiveUpdate colors.normal { padding = 0; };
+        format = lib.recursiveUpdate colors.normal { padding = 0; };
         exec = "${notificationStatus}";
         click.left = "${notificationToggle}";
         click.right = "${notificationHistory}";
@@ -301,7 +299,7 @@ in
       };
       "module/keyboard-switch" = {
         type = "custom/script";
-        format = recursiveUpdate colors.normal { padding = 0; };
+        format = lib.recursiveUpdate colors.normal { padding = 0; };
         exec = "${keyboardStatus}";
         click.left = "${keyboardToggle}";
         interval = 1;

modules/hm/terminator.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }:
-with pkgs.lib.nix-rice;
 let
-  strPalette = palette.toRgbHex {
+  strPalette = pkgs.lib.nix-rice.palette.toRgbHex {
     inherit (pkgs.rice.colorPalette) normal bright dark;
     inherit (pkgs.rice.colorPalette.primary) background foreground;
   };
@@ -30,7 +29,7 @@ in
 {
   home.packages = [ pkgs.terminator ];
 
-  xdg.configFile."terminator/config".text = with strPalette; ''
+  xdg.configFile."terminator/config".text = ''
     [global_config]
       scroll_tabbar = True
       enabled_plugins = ActivityWatch, LaunchpadCodeURLHandler, APTURLHandler, LaunchpadBugURLHandler
@@ -41,34 +40,34 @@ in
     [profiles]
       [[default]]
         visible_bell = True
-        background_color = "${background}"
+        background_color = "${strPalette.background}"
         background_darkness = ${opacity}
         background_type = transparent
-        cursor_color = "${foreground}"
+        cursor_color = "${strPalette.foreground}"
         font = ${font.name} weight=450 ${toString font.size}
-        foreground_color = "${foreground}"
+        foreground_color = "${strPalette.foreground}"
         show_titlebar = False
         scrollbar_position = hidden
         scrollback_lines = 10000
-        palette = "${colorString normal bright}"
+        palette = "${colorString strPalette.normal strPalette.bright}"
         use_system_font = False
       [[Light presentation]]
         visible_bell = True
-        background_color = "${foreground}"
+        background_color = "${strPalette.foreground}"
-        cursor_color = "${background}"
+        cursor_color = "${strPalette.background}"
         font = ${font.name} weight=450 20
-        foreground_color = "${background}"
+        foreground_color = "${strPalette.background}"
         show_titlebar = False
-        palette = "${colorString dark normal}"
+        palette = "${colorString strPalette.dark strPalette.normal}"
         use_system_font = False
       [[Dark presentation]]
         visible_bell = True
-        background_color = "${background}"
+        background_color = "${strPalette.background}"
-        cursor_color = "${foreground}"
+        cursor_color = "${strPalette.foreground}"
         font = ${font.name} weight=450 20
-        foreground_color = "${foreground}"
+        foreground_color = "${strPalette.foreground}"
         show_titlebar = False
-        palette = "${colorString normal bright}"
+        palette = "${colorString strPalette.normal strPalette.bright}"
         use_system_font = False
     [layouts]
       [[default]]

modules/hm/thunar.nix

@@ -1,10 +1,11 @@
 { pkgs, ... }: {
-  home.packages = with pkgs.xfce; [
+  home.packages = builtins.attrValues {
+    inherit (pkgs.xfce)
       thunar
       thunar-archive-plugin
       thunar-media-tags-plugin
       thunar-volman
       tumbler
-    xfconf
+      xfconf;
-  ];
+  };
 }

modules/hm/tmux.nix

@@ -4,7 +4,7 @@
     clock24 = true;
     escapeTime = 25;
     terminal = "screen-256color";
-    plugins = with pkgs.tmuxPlugins; [ nord prefix-highlight ];
+    plugins = builtins.attrValues { inherit (pkgs.tmuxPlugins) nord prefix-highlight; };
     extraConfig = ''
       set -g mouse on
     '';

modules/hm/twmn.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }:
-with pkgs.lib.nix-rice;
 let
-  strPalette = palette.toRGBHex pkgs.rice.colorPalette;
+  strPalette = pkgs.lib.nix-rice.palette.toRGBHex pkgs.rice.colorPalette;
   font = pkgs.rice.font.normal;
 in
 {
@@ -18,7 +17,7 @@ in
       animation.bounce.enable = false;
       color = strPalette.primary.background;
       height = 32;
-      opacity = float.round (pkgs.rice.opacity * 100);
+      opacity = pkgs.lib.nix-rice.float.round (pkgs.rice.opacity * 100);
       offset = {
         x = -20;
         y = 50;

modules/hm/vim.nix

@@ -1,30 +1,29 @@
 { pkgs, ... }: {
   programs.neovim = {
     enable = true;
-    plugins = with pkgs.vimPlugins; [
+    plugins = [
       {
-        plugin = airline;
+        plugin = pkgs.vimPlugins.airline;
         # config = "let g:airline#extensions#tabline#left_alt_sep = '>'";
       }
-
       # {
-      #   plugin = catppuccin-nvim;
+      #   plugin = pkgs.vimPlugins.catppuccin-nvim;
       #   config = "colorscheme catppuccin-mocha";
       # }
       # {
-      #   plugin = neovim-ayu;
+      #   plugin = pkgs.vimPlugins.neovim-ayu;
       #   config = "colorscheme ayu-mirage";
       # }
       {
-        plugin = nightfox-nvim;
+        plugin = pkgs.vimPlugins.nightfox-nvim;
         config = "colorscheme nightfox";
       }
       {
-        plugin = vim-airline-themes;
+        plugin = pkgs.vimPlugins.vim-airline-themes;
         config = "let g:airline_theme='nightfox'";
       }
-      fugitive
+      pkgs.vimPlugins.fugitive
-      surround
+      pkgs.vimPlugins.surround
     ];
     # settings = { ignorecase = true; };
     coc.enable = true;

modules/hm/xidlehook.nix

@@ -1,7 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
-
-with lib;
-
 let
   xbacklightCmd = "${pkgs.xorg.xbacklight}/bin/xbacklight";
   xsetCmd = "${pkgs.xorg.xset}/bin/xset";

modules/hm/xresources.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }:
 let
-  strPalette = with pkgs.rice;
+  strPalette = pkgs.lib.nix-rice.palette.toRgbHex { inherit (pkgs.rice.colorPalette) normal bright primary; };
-    pkgs.lib.nix-rice.palette.toRgbHex { inherit (colorPalette) normal bright primary; };
 in
 {
   home.file.".Xresources" = {

modules/hm/zathura.nix

@@ -1,7 +1,8 @@
 { pkgs, ... }:
-with pkgs.lib.nix-rice;
+let
-let strPalette = palette.toRgbHex pkgs.rice.colorPalette;
+  strPalette = pkgs.lib.nix-rice.palette.toRgbHex pkgs.rice.colorPalette;
-in {
+in
+{
   programs.zathura = {
     enable = true;
     mappings = { "<C-i>" = "recolor"; };