fix statix

nixos/common/generic-lxc.nix

@@ -1,4 +1,4 @@
-{ ... }: {
+{ _ }: {
   # See also: https://blog.xirion.net/posts/nixos-proxmox-lxc/
 
   # Supress systemd services that don't work (correctly) on LXC

nixos/common/modules/dns.nix

@@ -37,7 +37,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    networking.firewall = mkIf (cfg.openFirewall) {
+    networking.firewall = mkIf cfg.openFirewall {
       allowedTCPPorts = [ 53 ];
       allowedUDPPorts = [ 53 ];
     };

nixos/common/modules/flood.nix

@@ -115,7 +115,7 @@ in {
     # Create user if set to default
     users.users = mkIf (cfg.user == "flood") {
       flood = {
-        group = cfg.group;
+        inherit (cfg) group;
         shell = pkgs.bashInteractive;
         home = cfg.dataDir;
         description = "flood Daemon user";
@@ -124,7 +124,7 @@ in {
     };
 
     # Open firewall if option is set to do so.
-    networking.firewall.allowedTCPPorts = mkIf (cfg.openFirewall) [ cfg.port ];
+    networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
 
     # The actual service
     systemd.services.flood = {

nixos/common/modules/unpackerr.nix

@@ -244,7 +244,7 @@ in
     # Create user if set to default
     users.users = mkIf (cfg.user == "unpackerr") {
       unpackerr = {
-        group = cfg.group;
+        inherit (cfg) group;
         shell = pkgs.bashInteractive;
         createHome = false;
         description = "unpackerr Daemon user";

nixos/hosts/hades/mastodon/configuration.nix

@@ -2,8 +2,7 @@
 let
   vs = config.vault-secrets.secrets;
   cfg = config.services.mastodon;
-in
+in {
-{
   system.stateVersion = "21.05";
   # Use DHCP with static leases
   networking.interfaces.eth0.useDHCP = true;
@@ -19,8 +18,7 @@ in
 
   vault-secrets.secrets.mastodon = {
     services = [ "mastodon-init-dirs" "mastodon" "mastodon-media-prune" ];
-    user = cfg.user;
+    inherit (cfg) user group;
-    group = cfg.group;
   };
 
   # Append the init-dirs script to add AWS/Minio secrets
@@ -47,7 +45,7 @@ in
 
     elasticsearch = {
       host = "127.0.0.1";
-      port = config.services.elasticsearch.port;
+      inherit (config.services.elasticsearch) port;
     };
 
     database = {
@@ -98,13 +96,11 @@ in
   };
 
   # https://github.com/NixOS/nixpkgs/issues/116418#issuecomment-799517120
-  systemd.services.mastodon-media-prune =
+  systemd.services.mastodon-media-prune = let cfg = config.services.mastodon;
-    let
+  in {
-      cfg = config.services.mastodon;
-    in
-    {
     description = "Mastodon media prune";
-      environment = lib.filterAttrs (n: _: n != "PATH") config.systemd.services.mastodon-web.environment;
+    environment = lib.filterAttrs (n: _: n != "PATH")
+      config.systemd.services.mastodon-web.environment;
     serviceConfig = {
       Type = "oneshot";
       # Remove remote media attachments older than one month.
@@ -126,7 +122,6 @@ in
     };
   };
 
-  networking.firewall =
+  networking.firewall = let cfg = config.services.mastodon;
-    let cfg = config.services.mastodon;
   in { allowedTCPPorts = [ cfg.streamingPort cfg.webPort ]; };
 }

nixos/hosts/hades/rtorrent/configuration.nix

@@ -1,9 +1,7 @@
 { config, pkgs, ... }:
-let vs = config.vault-secrets.secrets; in
+let vs = config.vault-secrets.secrets;
-{
+in {
-  imports = [
+  imports = [ ./rtorrent.nix ];
-    ./rtorrent.nix
-  ];
 
   networking.interfaces.eth0.useDHCP = true;
   system.stateVersion = "22.05";
@@ -17,12 +15,10 @@ let vs = config.vault-secrets.secrets; in
     enable = true;
     host = "0.0.0.0";
     openFirewall = true;
-    downloadDir = config.services.rtorrent.downloadDir;
+    inherit (config.services.rtorrent) downloadDir;
   };
 
-  vault-secrets.secrets.rtorrent = {
+  vault-secrets.secrets.rtorrent = { services = [ "wg-quick-wg0" ]; };
-    services = [ "wg-quick-wg0" ];
-  };
 
   # Mullvad VPN
   networking.wg-quick.interfaces = let
@@ -31,21 +27,19 @@ let vs = config.vault-secrets.secrets; in
       ${pkgs.iproute2}/bin/ip route add 10.42.42.0/23 via 192.168.0.1
       ${pkgs.iproute2}/bin/ip route add 10.100.0.0/24 via 192.168.0.1
     '';
-  in{
+  in {
     wg0 = {
       address = [ "10.66.153.191/32" "fc00:bbbb:bbbb:bb01::3:99be/128" ];
       dns = [ "193.138.218.74" ];
       privateKeyFile = "${vs.rtorrent}/wireguardKey";
       postUp = "${postUpScript}/bin/post_up || true";
 
-      peers = [
+      peers = [{
-        {
         publicKey = "hnRorSW0YHlHAzGb4Uc/sjOqQIrqDnpJnTQi/n7Rp1c=";
         allowedIPs = [ "0.0.0.0/0" "::/0" ];
         endpoint = "185.65.134.223:51820";
         persistentKeepalive = 25;
-        }
+      }];
-      ];
     };
   };
 }

nixos/hosts/olympus/outline/configuration.nix

@@ -23,8 +23,7 @@ let vs = config.vault-secrets.secrets; in
   ];
 
   vault-secrets.secrets.outline = {
-    user = config.services.outline.user;
+    inherit (config.services.outline) user group;
-    group = config.services.outline.group;
   };
 
   services.outline = {

nixos/hosts/thalassa/aoife/configuration.nix

@@ -46,11 +46,33 @@
 
   # Enable the X11 windowing system.
   services.xserver.enable = true;
+  services.xserver.excludePackages = [ pkgs.xterm ];
 
   # Enable the GNOME Desktop Environment.
   services.xserver.displayManager.gdm.enable = true;
   services.xserver.desktopManager.gnome.enable = true;
   services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
+  environment.gnome.excludePackages =
+    (with pkgs; [ gnome-photos gnome-tour gnome-connections ])
+    ++ (with pkgs.gnome; [
+      atomix # puzzle game
+      epiphany # web browser
+      geary # email reader
+      gedit # text editor
+      gnome-calendar
+      gnome-clocks
+      gnome-contacts
+      gnome-maps
+      gnome-music
+      gnome-notes
+      gnome-terminal
+      gnome-weather
+      hitori # sudoku game
+      iagno # go game
+      simple-scan # document scanner
+      tali # poker game
+      totem # video player
+    ]);
 
   programs.dconf.enable = true;
   services.udisks2.enable = true;

nixos/hosts/thalassa/aoife/home/default.nix

@@ -1,9 +1,9 @@
 { lib, config, pkgs, inputs, ... }:
 let
-  tex = (pkgs.texlive.combine {
+  tex = pkgs.texlive.combine {
     inherit (pkgs.texlive) scheme-full;
     dnd-5e-latex-template = { pkgs = [ pkgs.v.dnd-5e-latex-template ]; };
-  });
+  };
 in {
   programs.home-manager.enable = true;
 

nixos/hosts/thalassa/aoife/home/theme.nix

@@ -21,8 +21,7 @@ in {
     };
     cursorTheme = {
       name = cursorTheme;
-      package = config.home.pointerCursor.package;
+      inherit (config.home.pointerCursor) package size;
-      size = config.home.pointerCursor.size;
     };
   };
 

nixos/hosts/thalassa/null/home/default.nix

@@ -1,11 +1,10 @@
 { config, pkgs, lib, inputs, texlive, ... }:
 let
-  tex = (pkgs.texlive.combine {
+  tex = pkgs.texlive.combine {
     inherit (pkgs.texlive) scheme-full;
     dnd-5e-latex-template = { pkgs = [ pkgs.v.dnd-5e-latex-template ]; };
-  });
+  };
-in
+in {
-{
   programs.home-manager.enable = true;
   home.username = "victor";
   home.homeDirectory = "/home/victor";
@@ -62,8 +61,7 @@ in
 
   xdg.mimeApps = {
     enable = true;
-    defaultApplications =
+    defaultApplications = let browser = [ "firefox.desktop" ];
-      let browser = [ "firefox.desktop" ];
     in {
       "image/*" = "org.gnome.eog.desktop";
       "text/html" = browser;
@@ -185,8 +183,7 @@ in
     sessionVariables = { DIRENV_LOG_FORMAT = ""; };
   };
 
-  xdg.userDirs =
+  xdg.userDirs = let home = config.home.homeDirectory;
-    let home = config.home.homeDirectory;
   in {
     enable = true;
     createDirectories = true;

nixos/hosts/thalassa/null/home/theme.nix

@@ -58,8 +58,7 @@ in {
     };
     cursorTheme = {
       name = cursorTheme;
-      package = config.home.pointerCursor.package;
+      inherit (config.home.pointerCursor) size package;
-      size = config.home.pointerCursor.size;
     };
   };
 

nixos/hosts/thalassa/null/networking.nix

@@ -1,4 +1,4 @@
-{ ... }:
+{ _ }:
 {
   services.v.dns = {
     enable = true;

nixos/util.nix

@@ -28,11 +28,11 @@ let
 in
 {
   # Add to whatever realm a host belong to its list of tags
-  add_realm_to_tags = realm: hosts: map ({ tags ? [ ], ... }@host: host // { tags = [ realm ] ++ tags; inherit realm; }) hosts;
+  add_realm_to_tags = realm: map ({ tags ? [ ], ... }@host: host // { tags = [ realm ] ++ tags; inherit realm; });
   # Flatten all hosts to a single list
   flatten_hosts = hosts: concatLists (attrValues hosts);
   # Filter out all hosts which aren't nixos
-  filter_nix_hosts = hosts: filter ({ nix ? true, ... }: nix) hosts;
+  filter_nix_hosts = filter ({ nix ? true, ... }: nix);
 
   # Helper function to build a colmena host definition
   mkColmenaHost = { ip ? null, hostname, tags, realm, type ? "lxc", ... }@host:
@@ -50,7 +50,7 @@ in
         deployment = {
           inherit tags;
           targetHost = ip;
-          allowLocalDeployment = (type == "local");
+          allowLocalDeployment = type == "local";
           targetUser = null; # Defaults to $USER
         };
       };