From 7459ae0e9671b6b66765191ddd1e7c3c037b1be6 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Tue, 15 Aug 2023 18:33:34 +0200 Subject: [PATCH] Remove 'with' from most modules --- modules/hm/alacritty.nix | 37 ++++++------ modules/hm/bspwm.nix | 3 +- modules/hm/development/cpp.nix | 9 +-- modules/hm/development/data.nix | 15 +++-- modules/hm/development/docker.nix | 7 +-- modules/hm/development/go.nix | 5 +- modules/hm/development/javascript.nix | 11 ++-- modules/hm/development/nix.nix | 7 +-- modules/hm/development/python.nix | 24 ++++---- modules/hm/development/rust.nix | 33 +++++------ modules/hm/dunst.nix | 10 ++-- modules/hm/dwarf-fortress.nix | 14 +++-- modules/hm/gnome_shell.nix | 60 ++++++++++--------- modules/hm/gtk_theme.nix | 4 +- modules/hm/mangohud.nix | 3 +- modules/hm/nemo.nix | 4 +- modules/hm/obs-studio.nix | 29 ++++----- modules/hm/pass.nix | 8 +-- modules/hm/polybar.nix | 84 +++++++++++++-------------- modules/hm/terminator.nix | 29 +++++---- modules/hm/thunar.nix | 17 +++--- modules/hm/tmux.nix | 2 +- modules/hm/twmn.nix | 5 +- modules/hm/vim.nix | 17 +++--- modules/hm/xidlehook.nix | 5 +- modules/hm/xresources.nix | 3 +- modules/hm/zathura.nix | 7 ++- 27 files changed, 222 insertions(+), 230 deletions(-) diff --git a/modules/hm/alacritty.nix b/modules/hm/alacritty.nix index c94718a..d35aa29 100644 --- a/modules/hm/alacritty.nix +++ b/modules/hm/alacritty.nix @@ -1,26 +1,25 @@ { pkgs, ... }: let - strPalette = with pkgs.rice; - pkgs.lib.nix-rice.palette.toRgbHex rec { - inherit (colorPalette) normal bright primary; - dim = colorPalette.dark; - cursor = { - cursor = normal.white; - text = normal.black; - }; - vi_mode_cursor = { - cursor = normal.white; - text = normal.black; - }; - selection.background = dim.blue; - search = { - matches.background = dim.cyan; - bar = { - foreground = dim.cyan; - background = dim.yellow; - }; + strPalette = pkgs.lib.nix-rice.palette.toRgbHex rec { + inherit (pkgs.rice.colorPalette) normal bright primary; + dim = pkgs.rice.colorPalette.dark; + cursor = { + cursor = normal.white; + text = normal.black; + }; + vi_mode_cursor = { + cursor = normal.white; + text = normal.black; + }; + selection.background = dim.blue; + search = { + matches.background = dim.cyan; + bar = { + foreground = dim.cyan; + background = dim.yellow; }; }; + }; in { # Include fonts packages diff --git a/modules/hm/bspwm.nix b/modules/hm/bspwm.nix index a53cd65..2113965 100644 --- a/modules/hm/bspwm.nix +++ b/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 = { diff --git a/modules/hm/development/cpp.nix b/modules/hm/development/cpp.nix index 261a725..e45802f 100644 --- a/modules/hm/development/cpp.nix +++ b/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; - }; + }); } diff --git a/modules/hm/development/data.nix b/modules/hm/development/data.nix index ac5b325..29b6a37 100644 --- a/modules/hm/development/data.nix +++ b/modules/hm/development/data.nix @@ -1,11 +1,10 @@ { config, pkgs, lib, ... }: { - home.packages = - lib.optionals config.programs.helix.enable builtins.attrValues - { - inherit (pkgs) yaml-language-server taplo-cli; - inherit (pkgs.nodePackages) vscode-langservers-extracted; - } ++ lib.optionals config.programs.kakoune.enable builtins.attrValues { - inherit (pkgs) yaml-language-server; + home.packages = lib.optionals config.programs.helix.enable + (builtins.attrValues { + inherit (pkgs) yaml-language-server taplo-cli; inherit (pkgs.nodePackages) vscode-langservers-extracted; - }; + }) ++ lib.optionals config.programs.kakoune.enable (builtins.attrValues { + inherit (pkgs) yaml-language-server; + inherit (pkgs.nodePackages) vscode-langservers-extracted; + }); } diff --git a/modules/hm/development/docker.nix b/modules/hm/development/docker.nix index 61c3143..52e8291 100644 --- a/modules/hm/development/docker.nix +++ b/modules/hm/development/docker.nix @@ -1,9 +1,6 @@ { pkgs, config, lib, ... }: { - home.packages = - builtins.attrValues { inherit (pkgs) docker-compose docker-machine; } - ++ lib.optionals config.programs.helix.enable builtins.attrValues { - inherit (pkgs.nodePackages) dockerfile-language-server-nodejs; - }; + home.packages = (builtins.attrValues { inherit (pkgs) docker-compose docker-machine; }) + ++ lib.optionals config.programs.helix.enable (builtins.attrValues { inherit (pkgs.nodePackages) dockerfile-language-server-nodejs; }); home.shellAliases = { "dkcd" = "docker-compose down"; "dkc" = "docker-compose"; diff --git a/modules/hm/development/go.nix b/modules/hm/development/go.nix index d99d767..c470fb0 100644 --- a/modules/hm/development/go.nix +++ b/modules/hm/development/go.nix @@ -4,6 +4,7 @@ goPath = ".go"; }; - home.packages = lib.optionals config.programs.helix.enable [ pkgs.gopls ] - ++ (lib.optionals config.programs.kakoune.enable [ pkgs.gopls ]); + home.packages = + (lib.optionals config.programs.helix.enable [ pkgs.gopls ]) ++ + (lib.optionals config.programs.kakoune.enable [ pkgs.gopls ]); } diff --git a/modules/hm/development/javascript.nix b/modules/hm/development/javascript.nix index 6a34662..4872926 100644 --- a/modules/hm/development/javascript.nix +++ b/modules/hm/development/javascript.nix @@ -1,11 +1,10 @@ { pkgs, lib, config, ... }: { - home.packages = - lib.optionals config.programs.helix.enable builtins.attrValues - { - inherit (pkgs.nodePackages) typescript-language-server; - } ++ lib.optionals config.programs.kakoune.enable builtins.attrValues { + home.packages = lib.optionals config.programs.helix.enable + (builtins.attrValues { inherit (pkgs.nodePackages) typescript-language-server; - }; + }) ++ lib.optionals config.programs.kakoune.enable (builtins.attrValues { + inherit (pkgs.nodePackages) typescript-language-server; + }); programs.neovim.withNodeJs = true; } diff --git a/modules/hm/development/nix.nix b/modules/hm/development/nix.nix index db6e59e..0e678a8 100644 --- a/modules/hm/development/nix.nix +++ b/modules/hm/development/nix.nix @@ -1,8 +1,7 @@ { pkgs, config, lib, ... }: { - home.packages = builtins.attrValues - { - inherit (pkgs) nixpkgs-fmt nixfmt nix-prefetch-scripts nix-review nix-tree; - } ++ lib.optionals config.programs.helix.enable [ pkgs.nil ] + 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.kakoune.enable [ pkgs.rnix-lsp ]; programs.neovim.plugins = [ pkgs.vimPlugins.vim-nix ]; } diff --git a/modules/hm/development/python.nix b/modules/hm/development/python.nix index 1ca69c4..5678020 100644 --- a/modules/hm/development/python.nix +++ b/modules/hm/development/python.nix @@ -5,16 +5,18 @@ let pyPkgs = py.pkgs; in { - home.packages = [ py pyPkgs.black ] - ++ lib.optionals config.programs.helix.enable ([ - pyPkgs.python-lsp-server - pyPkgs.pyls-flake8 - pyPkgs.pyls-isort - ] ++ pyPkgs.python-lsp-server.optional-dependencies.all) - ++ lib.optionals config.programs.kakoune.enable ([ - pyPkgs.python-lsp-server - pyPkgs.pyls-flake8 - pyPkgs.pyls-isort - ] ++ pyPkgs.python-lsp-server.optional-dependencies.all); + home.packages = [ py pyPkgs.black ] ++ + lib.optionals config.programs.helix.enable ((builtins.attrValues { + inherit (pyPkgs) + python-lsp-server + pyls-flake8 + pyls-isort; + }) ++ pyPkgs.python-lsp-server.optional-dependencies.all) ++ + lib.optionals config.programs.kakoune.enable ((builtins.attrValues { + inherit (pyPkgs) + python-lsp-server + pyls-flake8 + pyls-isort; + }) ++ pyPkgs.python-lsp-server.optional-dependencies.all); programs.neovim.withPython3 = true; } diff --git a/modules/hm/development/rust.nix b/modules/hm/development/rust.nix index 9cf96ff..1101c12 100644 --- a/modules/hm/development/rust.nix +++ b/modules/hm/development/rust.nix @@ -3,22 +3,19 @@ [build] rustc-wrapper = "${pkgs.sccache}/bin/sccache" ''; - 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 - cargo-modules cargo-outdated cargo-profiler cargo-release cargo-show-asm - cargo-spellcheck cargo-tarpaulin cargo-udeps cargo-watch cargo-workspaces - clippy rustc rustfmt; - # cargo-about - # cargo-auditable - # cargo-deny - # cargo-deps - # cargo-feature - - } ++ lib.optionals config.programs.helix.enable - (builtins.attrValues { inherit (pkgs) lldb rust-analyzer; }) - ++ lib.optionals config.programs.kakoune.enable - (builtins.attrValues { inherit (pkgs) rust-analyzer; }); + 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 + cargo-modules cargo-outdated cargo-profiler cargo-release cargo-show-asm + cargo-spellcheck cargo-tarpaulin cargo-udeps cargo-watch cargo-workspaces + clippy rustc rustfmt; + # cargo-about + # cargo-auditable + # cargo-deny + # cargo-deps + # cargo-feature + }) + ++ lib.optionals config.programs.helix.enable (builtins.attrValues { inherit (pkgs) lldb rust-analyzer; }) + ++ lib.optionals config.programs.kakoune.enable (builtins.attrValues { inherit (pkgs) rust-analyzer; }); } diff --git a/modules/hm/dunst.nix b/modules/hm/dunst.nix index a90744f..fb2b7dc 100644 --- a/modules/hm/dunst.nix +++ b/modules/hm/dunst.nix @@ -1,7 +1,9 @@ { pkgs, ... }: -with pkgs.lib.nix-rice; -let strPalette = palette.toRGBHex pkgs.rice.colorPalette; -in { +let + inherit (pkgs.lib) nix-rice; + 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 = { diff --git a/modules/hm/dwarf-fortress.nix b/modules/hm/dwarf-fortress.nix index 2268991..8d0c58f 100644 --- a/modules/hm/dwarf-fortress.nix +++ b/modules/hm/dwarf-fortress.nix @@ -1,9 +1,11 @@ { pkgs, ... }: let - package = with pkgs.dwarf-fortress-packages; - dwarf-fortress-full.override { - theme = themes.ironhand; - enableFPS = true; - }; + dfp = pkgs.dwarf-fortress-packages; + package = dfp.dwarf-fortress-full.override { + theme = dfp.themes.ironhand; + enableFPS = true; + }; in -{ home.packages = [ package ]; } +{ + home.packages = [ package ]; +} diff --git a/modules/hm/gnome_shell.nix b/modules/hm/gnome_shell.nix index f182fa8..b6048fd 100644 --- a/modules/hm/gnome_shell.nix +++ b/modules/hm/gnome_shell.nix @@ -1,32 +1,36 @@ { pkgs, ... }: let - gnomeExtensions = with pkgs.gnomeExtensions; [ - appindicator - aylurs-widgets - babar - caffeine - dash-to-dock - dash-to-panel - # dash-to-plank - # devbar - dock-from-dash - # espresso - # focus - freon - gamemode - # git - gtile - # jiggle - just-perfection - # keyman - spotify-tray - topiconsfix - # tray-icons - tray-icons-reloaded - unite - user-themes - # vitals - ]; + gnomeExtensions = builtins.attrValues { + inherit (pkgs.gnomeExtensions) + appindicator + aylurs-widgets + babar + caffeine + dash-to-dock + dash-to-panel + # dash-to-plank + # devbar + dock-from-dash + # espresso + # focus + freon + gamemode + # git + gtile + # jiggle + just-perfection + # keyman + spotify-tray + topiconsfix + # tray-icons + tray-icons-reloaded + unite + user-themes + # vitals + ; + }; in -{ home.packages = [ pkgs.gnome.gnome-tweaks ] ++ gnomeExtensions; } +{ + home.packages = [ pkgs.gnome.gnome-tweaks ] ++ gnomeExtensions; +} diff --git a/modules/hm/gtk_theme.nix b/modules/hm/gtk_theme.nix index 89ba071..09e6dd3 100644 --- a/modules/hm/gtk_theme.nix +++ b/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"; diff --git a/modules/hm/mangohud.nix b/modules/hm/mangohud.nix index e565e49..5432f5f 100644 --- a/modules/hm/mangohud.nix +++ b/modules/hm/mangohud.nix @@ -1,6 +1,5 @@ { pkgs, ... }: -with pkgs.lib.nix-rice; -let strPalette = palette.toRgbShortHex pkgs.rice.colorPalette; +let strPalette = pkgs.lib.nix-rice.palette.toRgbShortHex pkgs.rice.colorPalette; in { programs.mangohud = { enable = true; diff --git a/modules/hm/nemo.nix b/modules/hm/nemo.nix index 824dc7b..7ea3a13 100644 --- a/modules/hm/nemo.nix +++ b/modules/hm/nemo.nix @@ -1,6 +1,4 @@ { pkgs, ... }: { - home.packages = with pkgs.cinnamon; [ - nemo - ]; + home.packages = builtins.attrValues { inherit (pkgs.cinnamon) nemo; }; } diff --git a/modules/hm/obs-studio.nix b/modules/hm/obs-studio.nix index 71f91fe..72faf36 100644 --- a/modules/hm/obs-studio.nix +++ b/modules/hm/obs-studio.nix @@ -2,19 +2,20 @@ programs.obs-studio = { enable = true; package = pkgs.obs-studio; - plugins = with pkgs.obs-studio-plugins; [ - # obs-backgroundremoval - # obs-multi-rtmp - obs-nvfbc - obs-pipewire-audio-capture - obs-vkcapture - obs-backgroundremoval - input-overlay - - # obs-linuxbrowser - # obs-gstreamer - # obs-move-transition - # obs-multi-rtmp - ]; + plugins = builtins.attrValues { + inherit (pkgs.obs-studio-plugins) + # obs-backgroundremoval + # obs-multi-rtmp + obs-nvfbc + obs-pipewire-audio-capture + obs-vkcapture + obs-backgroundremoval + input-overlay + # obs-linuxbrowser + # obs-gstreamer + # obs-move-transition + # obs-multi-rtmp + ; + }; }; } diff --git a/modules/hm/pass.nix b/modules/hm/pass.nix index e2b2832..5baeb36 100644 --- a/modules/hm/pass.nix +++ b/modules/hm/pass.nix @@ -1,14 +1,14 @@ { pkgs, ... }: { programs.password-store = { - package = pkgs.pass.withExtensions (ext: - with ext; [ + package = pkgs.pass.withExtensions (ext: (builtins.attrValues { + inherit (ext) # pass-audit pass-checkup pass-import pass-otp pass-tomb - pass-update - ]); + pass-update; + })); enable = true; }; } diff --git a/modules/hm/polybar.nix b/modules/hm/polybar.nix index 16c2f18..8ab02ca 100644 --- a/modules/hm/polybar.nix +++ b/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,34 +49,31 @@ 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; - let alpha = 255 * opacity; - in palette.toARGBHex rec { - - normal = { - foreground = color.darken 10 colorPalette.foreground; - background = color.setAlphaRgba alpha colorPalette.background; - underline = colorPalette.normal.blue; - }; - - active = { - inherit (colorPalette) foreground; - background = color.setAlphaRgba alpha colorPalette.background; - underline = colorPalette.normal.yellow; - }; - - selected = { - inherit (colorPalette) foreground; - background = color.setAlphaRgba alpha colorPalette.background; - underline = colorPalette.bright.red; - }; - - inherit (colorPalette.normal) green red yellow; - inherit (color) transparent; - orange = colorPalette.bright.red; - alert = orange; + colors = nix-rice.palette.toARGBHex rec { + normal = { + foreground = nix-rice.color.darken 10 colorPalette.foreground; + background = nix-rice.color.setAlphaRgba alpha colorPalette.background; + underline = colorPalette.normal.blue; }; + active = { + inherit (colorPalette) foreground; + background = nix-rice.color.setAlphaRgba alpha colorPalette.background; + underline = colorPalette.normal.yellow; + }; + + selected = { + inherit (colorPalette) foreground; + background = nix-rice.color.setAlphaRgba alpha colorPalette.background; + underline = colorPalette.bright.red; + }; + + inherit (colorPalette.normal) green red yellow; + inherit (nix-rice.color) transparent; + orange = colorPalette.bright.red; + alert = orange; + }; + commonBar = { locale = config.home.language.base; monitor = "\${env:MONITOR}"; @@ -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 = " "; }; - discharging = recursiveUpdate colors.active { + discharging = lib.recursiveUpdate colors.active { text = " "; }; - full = recursiveUpdate colors.normal { text = " "; }; + full = lib.recursiveUpdate colors.normal { text = " "; }; }; label.text = "%percentage%%"; @@ -202,16 +200,16 @@ in }; in { - focused = recursiveUpdate common colors.selected; - occupied = recursiveUpdate common colors.active; - urgent = recursiveUpdate (recursiveUpdate common colors.active) { background = colors.alert; }; - empty = recursiveUpdate common colors.normal; + focused = lib.recursiveUpdate common colors.selected; + occupied = lib.recursiveUpdate common colors.active; + urgent = lib.recursiveUpdate (lib.recursiveUpdate common colors.active) { background = colors.alert; }; + empty = lib.recursiveUpdate common colors.normal; }; }; "module/cpu" = { type = "internal/cpu"; - format = recursiveUpdate colors.normal { text = "