base/gui-programs.nix

@@ -1,18 +1,11 @@
 { pkgs, lib, config, options, ... }:
-let
-  inherit (lib)
-    mkEnableOption
-    mkIf
-    optional
-  ;
-in
 {
   options.my.gui = {
-    enable = mkEnableOption "System has some kind of screen attached";
+    enable = lib.mkEnableOption "System has some kind of screen attached";
-    isNvidia = mkEnableOption "System a NVIDIA GPU";
+    isNvidia = lib.mkEnableOption "System a NVIDIA GPU";
   };
 
-  config = mkIf config.my.gui.enable {
+  config = lib.mkIf config.my.gui.enable {
     my.displayManager.sddm.enable = true;
 
     services = {
@@ -28,13 +21,13 @@ in
       };
     };
 
-    environment.systemPackages = builtins.attrValues {
+    environment.systemPackages = with pkgs; [
-      inherit (pkgs)
       element-desktop
       feh
       firefox
       ffmpeg
       gimp
+      gnome.nautilus
       imagemagick
       mpv
       obs-studio
@@ -46,12 +39,9 @@ in
       thunderbird
       virt-manager
       zathura
-      ;
 
-      inherit (pkgs.gnome) nautilus;
+      unstable.discord
-
+    ];
-      inherit (pkgs.unstable) discord;
-    };
 
     networking.networkmanager.enable = true;
     programs.nm-applet.enable = true;

base/networking.nix

@@ -1,12 +1,6 @@
 { lib, ... }:
-let
-  inherit (lib)
-    mkOption
-    types
-  ;
-in
 {
-  options.my.networking.externalInterface = mkOption {
+  options.my.networking.externalInterface = with lib; mkOption {
     type = types.nullOr types.str;
     default = null;
     example = "eth0";

base/programs.nix

@@ -19,8 +19,7 @@
     bandwhich.enable = true;
   };
 
-  environment.systemPackages = builtins.attrValues {
+  environment.systemPackages = with pkgs; [
-    inherit (pkgs)
     # shell usage
     fd
     ripgrep
@@ -40,6 +39,8 @@
     pinentry-curses
     python3
     vim
+    clang_11
+    llvmPackages_11.bintools
 
     # terminal utilities
     bottom
@@ -53,11 +54,5 @@
 
     # nix pkgs lookup
     nix-index
-    ;
+  ];
-
-    inherit (pkgs.llvmPackages_11)
-      bintools
-      clang
-    ;
-  };
 }

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "emacs-overlay": {
       "locked": {
-        "lastModified": 1641901534,
+        "lastModified": 1641149178,
-        "narHash": "sha256-Nvm6Zj80fVtzmGsUFYlz9XGFyLnyAe9VoduPmDBu+js=",
+        "narHash": "sha256-Mt+oT5YZ6G9zHctDKV5pY+3vIdsMmAg0HMvz6rxsIc0=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "57378ea2f62e9f450f420dc9d01cc06e0d3dd15e",
+        "rev": "f3c435a5e5cfa3ce1b2f50ba37b9cacfec4139d9",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1641915897,
+        "lastModified": 1641121012,
-        "narHash": "sha256-C5Vw7B8BKA/kr9tWVYjEdD3AjstXFqoxkkzrOwfQZxk=",
+        "narHash": "sha256-svaOMxNMQgFHjcxdmLojOxTxfqSENtnO+S3kb+npIwY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5209ea0d8c77399ec4987590e9738953f15f8d80",
+        "rev": "8e7a10602d1eb1d242c9d3f9b822203d5751a8c6",
         "type": "github"
       },
       "original": {
@@ -71,11 +71,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1641710811,
+        "lastModified": 1640959792,
-        "narHash": "sha256-yVJ+CtwWZY8BnkNIJ/ue5a28yrRM6CkDF1LvmGmqqwM=",
+        "narHash": "sha256-zYSR//06FU2TDOpKKj0Hkff6unsxk3NwwNFuB1loU6E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0ecf7d414811f831060cf55707c374d54fbb1dec",
+        "rev": "59bfda72480496f32787cec8c557182738b1bd3f",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
     },
     "nixpkgs-unstable-small": {
       "locked": {
-        "lastModified": 1641865627,
+        "lastModified": 1641125298,
-        "narHash": "sha256-B3b7KCThCx5bcDtWCX9ZZIl/EVs/lB8iDdI277/tvNA=",
+        "narHash": "sha256-oNIG2UsyMk/osOmnjxHp53d8nJMudpW5a2+dcgsJzmE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3fe528dec572a26404f130893d2c22a35646247c",
+        "rev": "c1d8e77ac2ca4248886632c597debea233700b2b",
         "type": "github"
       },
       "original": {

flake.nix

@@ -60,8 +60,6 @@
       };
     };
 
-    overlays = import ./overlays;
-
     nixosConfigurations =
       let
         system = "x86_64-linux";
@@ -75,7 +73,7 @@
               config.allowUnfree = true;
             };
           })
-        ] ++ builtins.attrValues self.overlays;
+        ];
         sharedModules = [
           home-manager.nixosModule
           { nixpkgs.overlays = shared_overlays; }

home/alacritty.nix

@@ -1,17 +1,12 @@
 { config, lib, pkgs, ... }:
 let
-  inherit (lib)
-    mkEnableOption
-    mkIf
-  ;
-
   cfg = config.my.home.alacritty;
   alacrittyTheme = config.my.theme.alacrittyTheme;
 in
 {
-  options.my.home.alacritty.enable = (mkEnableOption "Alacritty terminal") // { default = config.my.home.x.enable; };
+  options.my.home.alacritty.enable = (lib.mkEnableOption "Alacritty terminal") // { default = config.my.home.x.enable; };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     programs.alacritty = {
       enable = true;
 
@@ -39,8 +34,9 @@ in
       };
     };
 
-    home.packages = [ pkgs.iosevka-bin ];
+    home.packages = with pkgs; [
-
+      iosevka-bin
+    ];
     # make sure font is discoverable
     fonts.fontconfig.enable = true;
   };

home/bat.nix

@@ -1,19 +1,14 @@
 { config, lib, ... }:
 let
-  inherit (lib)
-    mkEnableOption
-    mkIf
-  ;
-
   cfg = config.my.home.bat;
   batTheme = config.my.theme.batTheme;
 in
 {
-  options.my.home.bat = {
+  options.my.home.bat = with lib; {
     enable = (mkEnableOption "bat code display tool") // { default = true; };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     programs.bat = {
       enable = true;
 

home/emacs.nix

@@ -1,31 +1,23 @@
 { config, lib, pkgs, ... }:
-let
-  inherit (lib)
-    mkEnableOption
-    mkIf
-  ;
-in
 {
-  options.my.home.emacs = {
+  options.my.home.emacs = with lib; {
     enable = mkEnableOption "Emacs daemon configuration";
   };
 
-  config = mkIf config.my.home.emacs.enable {
+  config = lib.mkIf config.my.home.emacs.enable {
 
     home.sessionPath = [ "${config.xdg.configHome}/emacs/bin" ];
     home.sessionVariables = {
       EDITOR = "emacsclient -t";
     };
 
-    home.packages = builtins.attrValues {
+    home.packages = with pkgs; [
-      inherit (pkgs)
       sqlite # needed by org-roam
 
       # fonts used by my config
       emacs-all-the-icons-fonts
       iosevka-bin
-      ;
+    ];
-    };
     # make sure above fonts are discoverable
     fonts.fontconfig.enable = true;
 

home/firefox.nix

@@ -1,18 +1,13 @@
 { config, lib, pkgs, ... }:
 let
-  inherit (lib)
-    mkEnableOption
-    mkIf
-  ;
-
   cfg = config.my.home.firefox;
 in
 {
-  options.my.home.firefox = {
+  options.my.home.firefox = with lib; {
     enable = (mkEnableOption "firefox config") // { default = config.my.home.x.enable; };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     programs.firefox = {
       enable = true;
       package = pkgs.firefox.override {

home/fish/default.nix

@@ -1,16 +1,11 @@
 { config, lib, ... }:
 let
-  inherit (lib)
-    mkEnableOption
-    mkIf
-  ;
-
   cfg = config.my.home.fish;
 in
 {
-  options.my.home.fish.enable = (mkEnableOption "Fish shell") // { default = true; };
+  options.my.home.fish.enable = (lib.mkEnableOption "Fish shell") // { default = true; };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     programs.fish = {
       enable = true;
     };

home/flameshot.nix

@@ -1,18 +1,13 @@
 { config, lib, ... }:
 let
-  inherit (lib)
-    mkEnableOption
-    mkIf
-  ;
-
   cfg = config.my.home.flameshot;
 in
 {
-  options.my.home.flameshot = {
+  options.my.home.flameshot = with lib; {
     enable = mkEnableOption "flameshot autolaunch";
   };
 
-  config.services.flameshot = mkIf cfg.enable {
+  config.services.flameshot = lib.mkIf cfg.enable {
     enable = true;
   };
 }

home/git.nix

@@ -1,16 +1,11 @@
 { config, lib, pkgs, ... }:
 let
-  inherit (lib)
-    mkEnableOption
-    mkIf
-  ;
-
   cfg = config.my.home.git;
 in
 {
-  options.my.home.git.enable = (mkEnableOption "Git configuration") // { default = true; };
+  options.my.home.git.enable = (lib.mkEnableOption "Git configuration") // { default = true; };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     programs.git = {
       enable = true;
 

home/laptop.nix

@@ -1,11 +1,6 @@
 { config, lib, ... }:
-let
-  inherit (lib)
-    mkEnableOption
-  ;
-in
 {
-  options.my.home.laptop = {
+  options.my.home.laptop = with lib; {
     enable = mkEnableOption "Laptop settings";
   };
 }

home/lorri.nix

@@ -1,18 +1,13 @@
 { config, lib, ... }:
 let
-  inherit (lib)
-    mkEnableOption
-    mkIf
-  ;
-
   cfg = config.my.home.lorri;
 in
 {
-  options.my.home.lorri = {
+  options.my.home.lorri = with lib; {
     enable = (mkEnableOption "lorri daemon setup") // { default = true; };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     services.lorri.enable = true;
     programs.direnv = {
         enable = true;

home/rofi.nix

@@ -1,18 +1,13 @@
 { config, lib, pkgs, ... }:
 let
-  inherit (lib)
-    mkEnableOption
-    mkIf
-  ;
-
   cfg = config.my.home.rofi;
 in
 {
-  options.my.home.rofi = {
+  options.my.home.rofi = with lib; {
     enable = (mkEnableOption "rofi configuration") // { default = config.my.home.x.enable; };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     programs.rofi = {
       enable = true;
 

home/secrets/default.nix

@@ -1,11 +1,5 @@
 { lib, ... }:
-let
+with lib;
-  inherit (lib)
-    fileContents
-    mkOption
-    types
-  ;
-in
 {
   options.my.secrets = mkOption {
     type = types.attrs;

home/ssh.nix

@@ -1,18 +1,13 @@
 { config, lib, ... }:
 let
-  inherit (lib)
-    mkEnableOption
-    mkIf
-  ;
-
   cfg = config.my.home.ssh;
 in
 {
-  options.my.home.ssh = {
+  options.my.home.ssh = with lib; {
     enable = (mkEnableOption "ssh configuration") // { default = true; };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     programs.ssh = {
       enable = true;
 

home/themes/alacritty.nix

@@ -1,10 +1,6 @@
 { lib }:
+with lib;
 let
-  inherit (lib)
-    mkOption
-    types
-  ;
-
   mkColorOption = import ./color.nix { inherit lib; };
 
   primaryColorModule = types.submodule {

home/themes/bat.nix

@@ -1,10 +1,5 @@
 { lib }:
-let
+with lib;
-  inherit (lib)
-    mkOption
-    types
-  ;
-in
 types.submodule {
   options = {
     name = mkOption {

home/themes/color.nix

@@ -1,11 +1,6 @@
 { lib }:
 let
-  inherit (lib)
+  mkColorOption = with lib; {default ? "#000000", description ? "" }: mkOption {
-    mkOption
-    types
-  ;
-
-  mkColorOption = {default ? "#000000", description ? "" }: mkOption {
     inherit description default;
     example = "#abcdef";
     type = types.strMatching "#[0-9a-f]{6}";

home/themes/default.nix

@@ -1,10 +1,6 @@
 { config, lib, ... }:
+with lib;
 let
-  inherit (lib)
-    mkOption
-    types
-  ;
-
   themeType = types.submodule {
     options = {
       alacrittyTheme = mkOption {
@@ -33,7 +29,7 @@ in
   };
 
   options.my.themes = mkOption {
-    type = types.attrsOf themeType;
+    type = with types; attrsOf themeType;
   };
 
   config.my.themes = {

home/themes/i3.nix

@@ -1,10 +1,6 @@
 { lib }:
+with lib;
 let
-  inherit (lib)
-    mkOption
-    types
-  ;
-
   mkColorOption = import ./color.nix { inherit lib; };
 
   barColorSetModule = types.submodule {

home/themes/i3bar.nix

@@ -1,10 +1,6 @@
 { lib }:
+with lib;
 let
-  inherit (lib)
-    mkOption
-    types
-  ;
-
   mkColorOption = import ./color.nix { inherit lib; };
 in
 types.submodule {

home/themes/solarizedLight/alacritty.nix

@@ -1,23 +1,7 @@
 let
-  inherit (import ./colors.nix)
+  colors = import ./colors.nix;
-    base0
-    base00
-    base01
-    base02
-    base03
-    base1
-    base2
-    base3
-    blue
-    cyan
-    green
-    magenta
-    orange
-    red
-    violet
-    yellow
-  ;
 in
+with colors;
 {
   primary = {
     background = base3;

home/themes/solarizedLight/i3.nix

@@ -1,15 +1,7 @@
 let
-  inherit (import ./colors.nix)
+  colors = import ./colors.nix;
-    base00
-    base2
-    base3
-    blue
-    magenta
-    orange
-    red
-    yellow
-  ;
 in
+with colors;
 {
   bar = {
     background = base3;

home/themes/solarizedLight/i3bar.nix

@@ -1,14 +1,7 @@
 let
-  inherit (import ./colors.nix)
+  colors = import ./colors.nix;
-    base00
-    base2
-    base3
-    blue
-    green
-    red
-    yellow
-  ;
 in
+with colors;
 {
   theme = {
     name = "solarized-light";

home/tmux.nix

@@ -1,25 +1,20 @@
 { config, lib, pkgs, ... }:
 let
-  inherit (lib)
-    mkEnableOption
-    mkIf
-  ;
-
   cfg = config.my.home.tmux;
 in
 {
-  options.my.home.tmux = {
+  options.my.home.tmux = with lib; {
     enable = (mkEnableOption "tmux dotfiles") // { default = true; };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     programs.tmux = {
       enable = true;
       baseIndex = 1;
       terminal = "screen-256color";
       clock24 = true;
 
-      plugins = let inherit (pkgs) tmuxPlugins; in [
+      plugins = with pkgs; [
         {
           plugin = tmuxPlugins.cpu;
           extraConfig = ''

home/tridactyl.nix

@@ -1,18 +1,13 @@
 { config, lib, ... }:
 let
-  inherit (lib)
-    mkEnableOption
-    mkIf
-  ;
-
   cfg = config.my.home.tridactyl;
 in
 {
-  options.my.home.tridactyl = {
+  options.my.home.tridactyl = with lib; {
     enable = (mkEnableOption "tridactyl code display tool") // { default = config.my.home.firefox.enable; };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     xdg.configFile."tridactyl/tridactylrc".source = ./tridactylrc;
   };
 }

home/x/cursor.nix

@@ -1,16 +1,11 @@
 { config, lib, pkgs, ... }:
 let
-  inherit (lib)
-    mkEnableOption
-    mkIf
-  ;
-
   cfg = config.my.home.x.cursor;
 in
 {
-  options.my.home.x.cursor.enable = (mkEnableOption "X cursor") // { default = config.my.home.x.enable; };
+  options.my.home.x.cursor.enable = (lib.mkEnableOption "X cursor") // { default = config.my.home.x.enable; };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     xsession.pointerCursor = {
       package = pkgs.capitaine-cursors;
       name = "capitaine-cursors";

home/x/default.nix

@@ -1,9 +1,4 @@
 { config, lib, pkgs, ... }:
-let
-  inherit (lib)
-    mkEnableOption
-  ;
-in
 {
   imports = [
     ./cursor.nix
@@ -11,7 +6,7 @@ in
     ./i3bar.nix
   ];
 
-  options.my.home.x = {
+  options.my.home.x = with lib; {
     enable = mkEnableOption "X server configuration";
   };
 }

home/x/i3.nix

@@ -1,10 +1,5 @@
 { config, lib, pkgs, ... }:
 let
-  inherit (lib)
-    mkIf
-    mkOptionDefault
-  ;
-
   isEnabled = config.my.home.x.enable;
 
   myTerminal =
@@ -22,12 +17,14 @@ let
   i3Theme = config.my.theme.i3Theme;
 in
 {
-  config = mkIf isEnabled {
+  config = lib.mkIf isEnabled {
     my.home = {
       flameshot.enable = true;
     };
 
-    home.packages = [ pkgs.betterlockscreen ];
+    home.packages = with pkgs; [
+      betterlockscreen
+    ];
 
     xsession.windowManager.i3 = {
       enable = true;
@@ -80,7 +77,7 @@ in
           size = 8.0;
         };
 
-        keybindings = mkOptionDefault {
+        keybindings = lib.mkOptionDefault {
           "${modifier}+Shift+e" = ''mode "${logoutMode}"'';
           "${modifier}+i" = "exec emacsclient -c";
 
@@ -109,7 +106,7 @@ in
               "Return" = "mode default";
             };
           in
-            mkOptionDefault {
+            lib.mkOptionDefault {
               "${logoutMode}" = makeModeBindings {
                 "l" = "exec --no-startup-id i3-msg exit, mode default";
                 "s" = "exec --no-startup-id betterlockscreen --suspend, mode default";

home/x/i3bar.nix

@@ -1,19 +1,11 @@
 { config, lib, pkgs, ... }:
 let
-  inherit (lib)
-    lists
-    mkIf
-    mkOption
-    optional
-    types
-  ;
-
   isEnabled = config.my.home.x.enable;
   i3BarTheme = config.my.theme.i3BarTheme;
   cfg = config.my.home.x.i3bar;
 in
 {
-  options.my.home.x.i3bar = {
+  options.my.home.x.i3bar = with lib; {
     temperature.chip = mkOption {
       type = types.str;
       example = "coretemp-isa-*";
@@ -32,14 +24,12 @@ in
     };
   };
 
-  config = mkIf isEnabled {
+  config = lib.mkIf isEnabled {
-    home.packages = builtins.attrValues {
+    home.packages = with pkgs; [
-      inherit (pkgs)
       iw # Used by `net` block
       lm_sensors # Used by `temperature` block
       font-awesome
-      ;
+    ];
-    };
 
     programs.i3status-rust = {
       enable = true;
@@ -89,7 +79,7 @@ in
               chip = cfg.temperature.chip;
               inputs = cfg.temperature.inputs;
             }
-          ] ++ (lists.optionals ((builtins.length cfg.networking.throughput_interfaces) != 0)
+          ] ++ (lib.lists.optionals ((builtins.length cfg.networking.throughput_interfaces) != 0)
             (map
               (interface:
                 {
@@ -115,11 +105,11 @@ in
               block = "sound";
               driver = "pulseaudio";
             }
-          ] ++ (optional config.my.home.laptop.enable
+          ] ++ (lib.lists.optionals config.my.home.laptop.enable [
             {
               block = "battery";
             }
-          ) ++ [
+          ]) ++ [
             # {
             #   block = "notify";
             # }

hosts/boreal/default.nix

@@ -105,7 +105,9 @@ in
     "rfkill-release"
   ];
 
-  services.udev.packages = [ pkgs.packages.kaleidoscope-udev-rules ];
+  services.udev.packages = with pkgs; [
+    packages.kaleidoscope-udev-rules
+  ];
 
   hardware.bluetooth = {
     enable = true;

hosts/boreal/home.nix

@@ -10,8 +10,7 @@
 
     my.theme = config.home-manager.users.alarsyo.my.themes.solarizedLight;
 
-    home.packages = builtins.attrValues {
+    home.packages = with pkgs; [
-      inherit (pkgs)
         # some websites only work there :(
         chromium
 
@@ -20,9 +19,8 @@
 
         # keyboard goodness
         chrysalis
-      ;
 
-      inherit (pkgs.packages) spot;
+        packages.spot
-    };
+    ];
   };
 }

hosts/poseidon/hardware-configuration.nix

@@ -2,11 +2,7 @@
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
-let
+
-  inherit (lib)
-    mkDefault
-  ;
-in
 {
   imports =
     [ (modulesPath + "/installer/scan/not-detected.nix")
@@ -36,5 +32,5 @@ in
     [ { device = "/dev/disk/by-uuid/381a9c5e-4d71-45b4-ac62-e7414b3768fc"; }
     ];
 
-  powerManagement.cpuFreqGovernor = mkDefault "ondemand";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
 }

hosts/zephyrus/default.nix

@@ -56,7 +56,9 @@ in
   };
   my.gui.enable = true;
 
-  environment.systemPackages = [ pkgs.arandr ];
+  environment.systemPackages = with pkgs; [
+    arandr
+  ];
 
   hardware.bluetooth = {
     enable = true;

hosts/zephyrus/hardware-configuration.nix

@@ -2,11 +2,7 @@
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
-let
+
-  inherit (lib)
-    mkDefault
-  ;
-in
 {
   imports =
     [ (modulesPath + "/installer/scan/not-detected.nix")
@@ -44,7 +40,7 @@ in
 
   swapDevices = [ ];
 
-  powerManagement.cpuFreqGovernor = mkDefault "powersave";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 
   hardware.enableRedistributableFirmware = true;
 }

hosts/zephyrus/home.nix

@@ -12,20 +12,18 @@
 
     my.theme = config.home-manager.users.alarsyo.my.themes.solarizedLight;
 
-    home.packages = builtins.attrValues {
+    home.packages = with pkgs; [
-        inherit (pkgs)
         # some websites only work there :(
         chromium
 
+        wineWowPackages.stable
+
         darktable
 
         # dev
         rustup
-        ;
 
-        inherit (pkgs.packages) spot;
+        packages.spot
-
+    ];
-        inherit (pkgs.wineWowPackages) stable;
-    };
   };
 }

modules/sddm.nix

@@ -1,31 +1,23 @@
 { config, lib, pkgs, ... }:
 let
-  inherit (lib)
-    mkEnableOption
-    mkIf
-  ;
-
   cfg = config.my.displayManager.sddm;
 in
 {
-  options.my.displayManager.sddm.enable = mkEnableOption "SDDM setup";
+  options.my.displayManager.sddm.enable = lib.mkEnableOption "SDDM setup";
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     services.xserver.displayManager.sddm = {
       enable = true;
       theme = "sugar-candy";
     };
 
-    environment.systemPackages = builtins.attrValues {
+    environment.systemPackages = with pkgs; [
-      inherit (pkgs.packages)
+      packages.sddm-sugar-candy
-        sddm-sugar-candy
-      ;
 
-      inherit (pkgs.libsForQt5.qt5)
+      # dependencies for sugar-candy theme
-        qtgraphicaleffects
+      libsForQt5.qt5.qtgraphicaleffects
-        qtquickcontrols2
+      libsForQt5.qt5.qtquickcontrols2
-        qtsvg
+      libsForQt5.qt5.qtsvg
-      ;
+    ];
-    };
   };
 }

modules/wakeonwlan.nix

@@ -1,15 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let
+with lib;
-  inherit (lib)
-    concatStringsSep
-    literalExample
-    mapAttrs'
-    mkIf
-    mkOption
-    nameValuePair
-  ;
 
+let
   cfg = config.my.wakeonwlan;
 
   mkWowlanService = name: cfg:
@@ -27,7 +20,7 @@ let
     };
 in
 {
-  options.my.wakeonwlan = let inherit (lib) types; in {
+  options.my.wakeonwlan = {
     interfaces = mkOption {
       default = { };
       description = "Wireless interfaces where you want to enable WoWLAN";

overlays/default.nix

@@ -1,3 +0,0 @@
-{
-  i3status-rust = import ./i3status-rust;
-}

overlays/i3status-rust/default.nix

@@ -1,19 +0,0 @@
-final: prev:
-{
-  # overlay created because nixpkgs's `i3status-rust` depended on `notmuch`, and
-  # `notmuch`'s tests were briefly broken. the features I'm disabling, I don't
-  # need anyway: (at the time of writing)
-  #
-  # - notmuch
-  # - maildir
-  i3status-rust = prev.i3status-rust.overrideAttrs (oldAttrs: {
-    buildInputs = builtins.attrValues {
-      inherit (final)
-        dbus
-        openssl
-        pulseaudio
-      ;
-    };
-    cargoBuildFeatures = [ "pulseaudio" ];
-  });
-}

pkgs/grafana-dashboards/nginx.nix

@@ -1,9 +1,5 @@
 { stdenv, fetchFromGitHub, lib, ... }:
 let
-  inherit (lib)
-    licenses
-  ;
-
   version = "0.9.0";
 in
 stdenv.mkDerivation {
@@ -24,7 +20,7 @@ stdenv.mkDerivation {
     cp grafana/dashboard.json $out/dashboard.json
   '';
 
-  meta = {
+  meta = with lib; {
     description = "grafana dashboard for NGINX exporter";
     homepage = "https://github.com/nginxinc/nginx-prometheus-exporter";
     license = licenses.asl20;

pkgs/grafana-dashboards/node-exporter.nix

@@ -1,9 +1,5 @@
 { stdenv, fetchFromGitHub, lib, ... }:
 let
-  inherit (lib)
-    licenses
-  ;
-
   version = "7d61c79619e5749e629758ecd96748c010028120";
 in
 stdenv.mkDerivation {
@@ -24,7 +20,7 @@ stdenv.mkDerivation {
     cp prometheus/node-exporter-full.json $out/node-exporter-full.json
   '';
 
-  meta = {
+  meta = with lib; {
     description = "grafana dashboard for node exporter";
     homepage = "https://github.com/rfrail3/grafana-dashboards";
     license = licenses.lgpl3Only;

pkgs/kaleidoscope-udev-rules/default.nix

@@ -1,10 +1,6 @@
 { stdenv, lib, fetchFromGitHub }:
 
 let
-  inherit (lib)
-    licenses
-  ;
-
   version = "1.99.3";
 in
 stdenv.mkDerivation {
@@ -25,7 +21,7 @@ stdenv.mkDerivation {
     cp etc/60-kaleidoscope.rules $out/lib/udev/rules.d/
   '';
 
-  meta = {
+  meta = with lib; {
     description = "udev rules for kaleidoscope firmware keyboards";
     homepage = "https://github.com/keyboardio/Kaleidoscope";
     license = licenses.gpl3Only;

secrets/borg-backup/default.nix

@@ -1,10 +1,5 @@
 { lib }:
-let
-  inherit (lib)
-    fileContents
-  ;
-in
 {
-  boreal-repo = fileContents ./boreal-repo.secret;
+  boreal-repo = lib.fileContents ./boreal-repo.secret;
-  poseidon-repo = fileContents ./poseidon-repo.secret;
+  poseidon-repo = lib.fileContents ./poseidon-repo.secret;
 }

secrets/default.nix

@@ -1,24 +1,20 @@
 { pkgs, lib, config, ... }:
-let
+with lib;
-  inherit (lib)
+{
-    fileContents
+  options.my.secrets = mkOption {
-    mkOption
-  ;
-in {
-  options.my.secrets = let inherit (lib) types; in mkOption {
     type = types.attrs;
   };
 
   config.my.secrets = {
-    matrix-registration-shared-secret = fileContents ./matrix-registration-shared-secret.secret;
+    matrix-registration-shared-secret = lib.fileContents ./matrix-registration-shared-secret.secret;
-    shadow-hashed-password-alarsyo = fileContents ./shadow-hashed-password-alarsyo.secret;
+    shadow-hashed-password-alarsyo = lib.fileContents ./shadow-hashed-password-alarsyo.secret;
-    shadow-hashed-password-root = fileContents ./shadow-hashed-password-root.secret;
+    shadow-hashed-password-root = lib.fileContents ./shadow-hashed-password-root.secret;
-    miniflux-admin-credentials = fileContents ./miniflux-admin-credentials.secret;
+    miniflux-admin-credentials = lib.fileContents ./miniflux-admin-credentials.secret;
-    transmission-password = fileContents ./transmission.secret;
+    transmission-password = lib.fileContents ./transmission.secret;
     nextcloud-admin-pass = ./nextcloud-admin-pass.secret;
-    nextcloud-admin-user = fileContents ./nextcloud-admin-user.secret;
+    nextcloud-admin-user = lib.fileContents ./nextcloud-admin-user.secret;
-    lohr-shared-secret = fileContents ./lohr-shared-secret.secret;
+    lohr-shared-secret = lib.fileContents ./lohr-shared-secret.secret;
-    gandiKey = fileContents ./gandi-api-key.secret;
+    gandiKey = lib.fileContents ./gandi-api-key.secret;
 
     borg-backup = import ./borg-backup { inherit lib; };
     paperless = import ./paperless { inherit lib; };

secrets/paperless/default.nix

@@ -1,10 +1,5 @@
 { lib }:
-let
-  inherit (lib)
-    fileContents
-  ;
-in
 {
-  secretKey = fileContents ./secret-key-file.secret;
+  secretKey = lib.fileContents ./secret-key-file.secret;
-  adminPassword = fileContents ./admin-password.secret;
+  adminPassword = lib.fileContents ./admin-password.secret;
 }

secrets/restic-backup/default.nix

@@ -1,9 +1,4 @@
 { lib }:
-let
-  inherit (lib)
-    fileContents
-  ;
-in
 {
-  poseidon-repo = fileContents ./poseidon-repo.secret;
+  poseidon-repo = lib.fileContents ./poseidon-repo.secret;
 }

services/borg-backup.nix

@@ -1,14 +1,10 @@
 { config, lib, pkgs, ... }:
 
-let
+with lib;
-  inherit (lib)
+
-    mkEnableOption
+let cfg = config.my.services.borg-backup;
-    mkIf
-    mkOption
-  ;
-  cfg = config.my.services.borg-backup;
 in {
-  options.my.services.borg-backup = let inherit (lib) types; in {
+  options.my.services.borg-backup = {
     enable = mkEnableOption "Enable Borg backups for this host";
 
     repo = mkOption {

services/fail2ban.nix

@@ -1,11 +1,7 @@
 { config, lib, pkgs, ... }:
 
+with lib;
 let
-  inherit (lib)
-    mkEnableOption
-    mkIf
-  ;
-
   cfg = config.my.services.fail2ban;
 in {
   options.my.services.fail2ban = {

services/fava.nix

@@ -1,20 +1,16 @@
 { config, lib, pkgs, ... }:
 
-let
+with lib;
-  inherit (lib)
-    mkEnableOption
-    mkIf
-    mkOption
-  ;
 
+let
   cfg = config.my.services.fava;
   my = config.my;
   domain = config.networking.domain;
   secrets = config.my.secrets;
 in
 {
-  options.my.services.fava = let inherit (lib) types; in {
+  options.my.services.fava = {
-    enable = mkEnableOption "Fava";
+    enable = lib.mkEnableOption "Fava";
 
     home = mkOption {
       type = types.str;
@@ -47,6 +43,7 @@ in
         User = "fava";
         Group = "fava";
       };
+      path = with pkgs; [];
     };
 
     users.users.fava = {

services/gitea/default.nix

@@ -1,18 +1,14 @@
 { config, lib, pkgs, ... }:
 
-let
+with lib;
-  inherit (lib)
-    mkEnableOption
-    mkIf
-    mkOption
-  ;
 
+let
   cfg = config.my.services.gitea;
   my = config.my;
 
   domain = config.networking.domain;
 in {
-  options.my.services.gitea = let inherit (lib) types; in {
+  options.my.services.gitea = {
     enable = mkEnableOption "Personal Git hosting with Gitea";
 
     privatePort = mkOption {

services/jellyfin.nix

@@ -1,11 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let
+with lib;
-  inherit (lib)
-    mkEnableOption
-    mkIf
-  ;
 
+let
   cfg = config.my.services.jellyfin;
   my = config.my;
 
@@ -18,7 +15,7 @@ in {
     enable = mkEnableOption "Jellyfin";
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     services.jellyfin = {
       enable = true;
       group = "media";

services/lohr.nix

@@ -1,12 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let
+with lib;
-  inherit (lib)
-    mkEnableOption
-    mkIf
-    mkOption
-  ;
 
+let
   cfg = config.my.services.lohr;
   my = config.my;
   domain = config.networking.domain;
@@ -18,8 +14,8 @@ let
     flake.defaultPackage."x86_64-linux"; # FIXME: use correct system
 in
 {
-  options.my.services.lohr = let inherit (lib) types; in {
+  options.my.services.lohr = {
-    enable = mkEnableOption "Lohr Mirroring Daemon";
+    enable = lib.mkEnableOption "Lohr Mirroring Daemon";
 
     home = mkOption {
       type = types.str;
@@ -53,7 +49,9 @@ in
         User = "lohr";
         Group = "lohr";
       };
-      path = [ pkgs.git ];
+      path = with pkgs; [
+        git
+      ];
     };
 
     users.users.lohr = {

services/matrix.nix

@@ -9,13 +9,9 @@
 #
 { config, lib, pkgs, ... }:
 
-let
+with lib;
-  inherit (lib)
-    mkEnableOption
-    mkIf
-    mkOption
-  ;
 
+let
   cfg = config.my.services.matrix;
   my = config.my;
 
@@ -23,10 +19,10 @@ let
   clientPort = { public = 443; private = 11339; };
   domain = config.networking.domain;
 in {
-  options.my.services.matrix = let inherit (lib) types; in {
+  options.my.services.matrix = {
-    enable = mkEnableOption "Matrix Synapse";
+    enable = lib.mkEnableOption "Matrix Synapse";
 
-    registration_shared_secret = mkOption {
+    registration_shared_secret = lib.mkOption {
       type = types.str;
       default = null;
       example = "deadbeef";
@@ -65,7 +61,7 @@ in {
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     services.postgresql = {
       enable = true;
     };

services/media.nix

@@ -1,17 +1,11 @@
 { config, lib, ... }:
 let
-  inherit (lib)
+  mediaServices = with config.my.services; [
-    mkIf
-  ;
-
-  mediaServices = builtins.attrValues {
-    inherit (config.my.services)
     jellyfin
     transmission
-    ;
+  ];
-  };
   needed = builtins.any (service: service.enable) mediaServices;
 in
 {
-  config.users.groups.media = mkIf needed { };
+  config.users.groups.media = lib.mkIf needed { };
 }

services/miniflux.nix

@@ -1,18 +1,14 @@
 { config, lib, pkgs, ... }:
 
-let
+with lib;
-  inherit (lib)
-    mkEnableOption
-    mkIf
-    mkOption
-  ;
 
+let
   cfg = config.my.services.miniflux;
   my = config.my;
 
   domain = config.networking.domain;
 in {
-  options.my.services.miniflux = let inherit (lib) types; in {
+  options.my.services.miniflux = {
     enable = mkEnableOption "Serve a Miniflux instance";
 
     adminCredentialsFile = mkOption {

services/monitoring.nix

@@ -1,16 +1,12 @@
 { config, lib, pkgs, ... }:
 
-let
+with lib;
-  inherit (lib)
-    mkEnableOption
-    mkIf
-    mkOption
-  ;
 
+let
   cfg = config.my.services.monitoring;
   domain = config.networking.domain;
 in {
-  options.my.services.monitoring = let inherit (lib) types; in {
+  options.my.services.monitoring = {
     enable = mkEnableOption "Enable monitoring";
 
     domain = mkOption {

services/navidrome.nix

@@ -1,17 +1,12 @@
 { config, lib, pkgs, ... }:
 
-let
+with lib;
-  inherit (lib)
-    mkEnableOption
-    mkIf
-    mkOption
-    optional
-  ;
 
+let
   cfg = config.my.services.navidrome;
   domain = config.networking.domain;
 in {
-  options.my.services.navidrome = let inherit (lib) types; in {
+  options.my.services.navidrome = {
     enable = mkEnableOption "Navidrome";
     musicFolder = {
       path = mkOption {
@@ -22,7 +17,7 @@ in {
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     services.navidrome = {
       enable = true;
       settings = {

services/nextcloud.nix

@@ -3,11 +3,6 @@
 # TODO: setup prometheus exporter
 
 let
-  inherit (lib)
-    mkEnableOption
-    mkIf
-  ;
-
   cfg = config.my.services.nextcloud;
   my = config.my;
   domain = config.networking.domain;
@@ -15,10 +10,10 @@ let
 in
 {
   options.my.services.nextcloud = {
-    enable = mkEnableOption "NextCloud";
+    enable = lib.mkEnableOption "NextCloud";
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     services.postgresql = {
       enable = true;
 
@@ -78,7 +73,7 @@ in
 
     my.services.restic-backup = let
       nextcloudHome = config.services.nextcloud.home;
-    in mkIf cfg.enable  {
+    in lib.mkIf cfg.enable  {
       paths = [ nextcloudHome ];
       exclude = [
         # borg can fail if *.part files disappear during backup

services/nginx.nix

@@ -2,15 +2,10 @@
 #
 # https://github.com/delroth/infra.delroth.net
 { config, lib, pkgs, ... }:
-let
-  inherit (lib)
-    mkIf
-  ;
-in
 {
   # Whenever something defines an nginx vhost, ensure that nginx defaults are
   # properly set.
-  config = mkIf ((builtins.attrNames config.services.nginx.virtualHosts) != [ "localhost" ]) {
+  config = lib.mkIf ((builtins.attrNames config.services.nginx.virtualHosts) != [ "localhost" ]) {
     services.nginx = {
       enable = true;
       statusPage = true; # For monitoring scraping.

services/nuage.nix

@@ -1,17 +1,14 @@
 { config, lib, ... }:
 
-let
+with lib;
-  inherit (lib)
-    mkEnableOption
-    mkIf
-  ;
 
+let
   cfg = config.my.services.nuage;
   my = config.my;
 in
 {
   options.my.services.nuage = {
-    enable = mkEnableOption "Nuage redirect";
+    enable = lib.mkEnableOption "Nuage redirect";
   };
 
   config = mkIf cfg.enable {

services/paperless.nix

@@ -1,12 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let
+with lib;
-  inherit (lib)
-    mkEnableOption
-    mkIf
-    mkOption
-  ;
 
+let
   cfg = config.my.services.paperless;
   my = config.my;
   domain = config.networking.domain;
@@ -14,8 +10,8 @@ let
   secretKeyFile = pkgs.writeText "paperless-secret-key-file.env" my.secrets.paperless.secretKey;
 in
 {
-  options.my.services.paperless = let inherit (lib) types; in {
+  options.my.services.paperless = {
-    enable = mkEnableOption "Paperless";
+    enable = lib.mkEnableOption "Paperless";
 
     port = mkOption {
       type = types.port;

services/pipewire.nix

@@ -1,18 +1,14 @@
 { config, lib, pkgs, options, ... }:
 
-let
+with lib;
-  inherit (lib)
-    mkEnableOption
-    mkIf
-    optionalAttrs
-  ;
 
+let
   cfg = config.my.services.pipewire;
   my = config.my;
 in
 {
   options.my.services.pipewire = {
-    enable = mkEnableOption "Pipewire sound backend";
+    enable = lib.mkEnableOption "Pipewire sound backend";
   };
 
   # HACK: services.pipewire.alsa doesn't exist on 20.09, avoid evaluating this
@@ -73,6 +69,6 @@ in
 
     # FIXME: a shame pactl isn't available by itself, eventually this should be
     #        replaced by pw-cli or a wrapper, I guess?
-    environment.systemPackages = [ pkgs.pulseaudio ];
+    environment.systemPackages = with pkgs; [ pulseaudio ];
   });
 }

services/postgresql-backup.nix

@@ -1,11 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let
+with lib;
-  inherit (lib)
-    mkEnableOption
-    mkIf
-  ;
 
+let
   cfg = config.my.services.postgresql-backup;
 in {
   options.my.services.postgresql-backup = {

services/restic-backup.nix

@@ -1,22 +1,16 @@
 { config, lib, pkgs, ... }:
 
-let
+with lib;
-  inherit (lib)
-    attrsets
-    concatStringsSep
-    mkEnableOption
-    mkIf
-    mkOption
-    optional
-  ;
 
+let
   cfg = config.my.services.restic-backup;
   secrets = config.my.secrets;
-  excludeArg = "--exclude-file=" + (pkgs.writeText "excludes.txt" (concatStringsSep "\n" cfg.exclude));
+  excludeArg = with builtins; with pkgs;
+    "--exclude-file=" + (writeText "excludes.txt" (concatStringsSep "\n" cfg.exclude));
   makePruneOpts = pruneOpts:
     attrsets.mapAttrsToList (name: value: "--keep-${name} ${toString value}") pruneOpts;
 in {
-  options.my.services.restic-backup = let inherit (lib) types; in {
+  options.my.services.restic-backup = {
     enable = mkEnableOption "Enable Restic backups for this host";
 
     repo = mkOption {
@@ -28,7 +22,7 @@ in {
     };
 
     paths = mkOption {
-      type = types.listOf types.str;
+      type = with types; listOf str;
       default = [ ];
       example = [
         "/var/lib"
@@ -38,7 +32,7 @@ in {
     };
 
     exclude = mkOption {
-      type = types.listOf types.str;
+      type = with types; listOf str;
       default = [ ];
       example = [
         # very large paths

services/tailscale.nix

@@ -1,19 +1,16 @@
 { config, lib, pkgs, ... }:
 
-let
+with lib;
-  inherit (lib)
-    mkEnableOption
-    mkIf
-  ;
 
+let
   cfg = config.my.services.tailscale;
 in
 {
   options.my.services.tailscale = {
-    enable = mkEnableOption "Tailscale";
+    enable = lib.mkEnableOption "Tailscale";
 
     # NOTE: still have to do `tailscale up --advertise-exit-node`
-    exitNode = mkEnableOption "Use as exit node";
+    exitNode = lib.mkEnableOption "Use as exit node";
   };
 
   config = mkIf cfg.enable {

services/tgv.nix

@@ -1,17 +1,14 @@
 { config, lib, ... }:
 
-let
+with lib;
-  inherit (lib)
-    mkEnableOption
-    mkIf
-  ;
 
+let
   cfg = config.my.services.tgv;
   my = config.my;
 in
 {
   options.my.services.tgv = {
-    enable = mkEnableOption "TGV redirect";
+    enable = lib.mkEnableOption "TGV redirect";
   };
 
   config = mkIf cfg.enable {

services/transmission.nix

@@ -1,11 +1,5 @@
 { config, lib, ... }:
 let
-  inherit (lib)
-    mkEnableOption
-    mkIf
-    mkOption
-  ;
-
   cfg = config.my.services.transmission;
 
   domain = config.networking.domain;
@@ -17,7 +11,7 @@ let
   downloadBase = "/media/torrents/";
 in
 {
-  options.my.services.transmission = let inherit (lib) types; in {
+  options.my.services.transmission = with lib; {
     enable = mkEnableOption "Transmission torrent client";
 
     username = mkOption {
@@ -34,7 +28,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     services.transmission = {
       enable = true;
       group = "media";

services/vaultwarden.nix

@@ -1,18 +1,14 @@
 { config, lib, pkgs, ... }:
 
-let
+with lib;
-  inherit (lib)
-    mkEnableOption
-    mkIf
-    mkOption
-  ;
 
+let
   cfg = config.my.services.vaultwarden;
   my = config.my;
 
   domain = config.networking.domain;
 in {
-  options.my.services.vaultwarden = let inherit (lib) types; in {
+  options.my.services.vaultwarden = {
     enable = mkEnableOption "Vaultwarden";
 
     privatePort = mkOption {