flake: clean up modules

hosts/Infini-DESKTOP/filesystems.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ ... }:
 let
   uuid = uuid: "/dev/disk/by-uuid/${uuid}";
 

hosts/Infini-DESKTOP/hardware-configuration.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ ... }:
 
 {
   boot.initrd.availableKernelModules = [ "nvme" "ahci" "xhci_pci" "usbhid" "sd_mod" ];

hosts/Infini-DL360/factorio.nix

@@ -1,4 +1,4 @@
-{ config, private, ... }:
+{ private, ... }:
 
 {
   services.factorio = {

hosts/Infini-DL360/forgejo.nix

@@ -1,7 +1,7 @@
-{ config, pkgs, common, ... }:
+{ config, common, pkgs, ... }:
 let
   cfg = config.services.forgejo;
-  domain = config.common.subdomain "git";
+  domain = common.subdomain "git";
 in
 {
   persist.directories = [ "/var/lib/private/gitea-runner/" ];
@@ -25,10 +25,10 @@ in
     settings = {
       server = {
         ROOT_URL = "https://${domain}/";
-        SSH_DOMAIN = config.common.domain;
+        SSH_DOMAIN = common.domain;
         LANDING_PAGE = "explore";
       };
-      mailer = with config.common.email; {
+      mailer = with common.email; {
         ENABLED = true;
         PROTOCOL = "smtps";
         SMTP_ADDR = smtp.address;
@@ -49,7 +49,7 @@ in
       service = {
         DISABLE_REGISTRATION = true;
         OFFLINE_MODE = false;
-        NO_REPLY_ADDRESS = config.common.email.outgoing;
+        NO_REPLY_ADDRESS = common.email.outgoing;
       };
       indexer = {
         REPO_INDEXER_ENABLED = true;
@@ -96,7 +96,7 @@ in
     };
   };
 
-  services.nginx.virtualHosts.${domain} = config.common.nginx.ssl // {
+  services.nginx.virtualHosts.${domain} = common.nginx.ssl // {
     locations."/" = {
       proxyPass = "http://${cfg.settings.server.DOMAIN}:${toString cfg.settings.server.HTTP_PORT}";
       extraConfig = ''

hosts/Infini-DL360/freshrss.nix

@@ -1,10 +1,10 @@
-{ config, ... }:
+{ config, common, ... }:
 
 let
   domain = "freshrss.inx.moe";
 in
 {
-  services.nginx.virtualHosts.${domain} = config.common.nginx.ssl;
+  services.nginx.virtualHosts.${domain} = common.nginx.ssl;
 
   services.freshrss = {
     enable = true;

hosts/Infini-DL360/hardware-configuration.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{ lib, modulesPath, ... }:
 
 {
   imports = [

hosts/Infini-DL360/hydra.nix

@@ -1,11 +1,11 @@
-{ config, pkgs, lib, ... }:
+{ config, common, ... }:
 let
-  domain = config.common.subdomain "hydra";
+  domain = common.subdomain "hydra";
 in
 {
-  services.nginx.virtualHosts.${domain} = config.common.nginx.ssl // {
+  services.nginx.virtualHosts.${domain} = common.nginx.ssl // {
     locations."/" = {
-      proxyPass = "http://localhost:${builtins.toString config.services.hydra.port}";
+      proxyPass = "http://localhost:${toString config.services.hydra.port}";
     };
   };
 
@@ -14,13 +14,13 @@ in
     port = 3333;
     baseDir = "/srv/hydra";
     hydraURL = "https://${domain}";
-    notificationSender = config.common.email.withSubaddress "hydra";
-    smtpHost = config.common.email.smtp.address;
+    notificationSender = common.email.withSubaddress "hydra";
+    smtpHost = common.email.smtp.address;
     useSubstitutes = true;
     environmentFile = config.secrets.hydra;
     extraEnv = {
-      EMAIL_SENDER_TRANSPORT_sasl_username = config.common.email.outgoing;
-      EMAIL_SENDER_TRANSPORT_port = builtins.toString config.common.email.smtp.SSLTLS;
+      EMAIL_SENDER_TRANSPORT_sasl_username = common.email.outgoing;
+      EMAIL_SENDER_TRANSPORT_port = toString common.email.smtp.SSLTLS;
       EMAIL_SENDER_TRANSPORT_ssl = "ssl";
     };
     extraConfig = ''

hosts/Infini-DL360/jellyfin.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, common, ... }:
 let
   address = "127.0.0.1";
   port = 8096;
@@ -13,7 +13,7 @@ let
   '';
 in
 {
-  services.nginx.virtualHosts."jellyfin.inx.moe" = config.common.nginx.ssl // {
+  services.nginx.virtualHosts."jellyfin.inx.moe" = common.nginx.ssl // {
     extraConfig = ''
       client_max_body_size 20M;
     '';

hosts/Infini-DL360/jitsi.nix

@@ -1,12 +1,12 @@
 # Unused
-{ config, pkgs, lib, ... }:
+{ config, common, ... }:
 let
   cfg = config.services.jitsi-meet;
 in
 {
   services.jitsi-meet = {
     enable = true;
-    hostName = config.common.subdomain "meet";
+    hostName = common.subdomain "meet";
     config = {
       prejoinPageEnabled = true;
       disableModeratorIndicator = true;

hosts/Infini-DL360/jupyter.nix

@@ -1,5 +1,7 @@
-{ config, pkgs, ... }:
+{ config, common, pkgs, ... }:
 let
+  cfg = config.services.jupyter;
+
   mkPythonKernel = displayName: env: {
     inherit displayName;
     language = "python";
@@ -53,10 +55,10 @@ in
     })
   ];
 
-  services.nginx.virtualHosts."jupyter.internal.inx.moe" = config.common.nginx.ssl // {
+  services.nginx.virtualHosts."jupyter.internal.inx.moe" = common.nginx.ssl // {
     listenAddresses = [ "100.101.102.124" ];
     locations."/" = {
-      proxyPass = "http://localhost:${toString config.services.jupyter.port}";
+      proxyPass = "http://localhost:${toString cfg.port}";
       proxyWebsockets = true;
     };
   };

hosts/Infini-DL360/postgresql.nix

@@ -1,5 +1,6 @@
-{ pkgs, config, lib, ... }:
+{ config, pkgs, ... }:
 let
+  cfg = config.services.postgresql;
   directory = "/srv/postgresql";
 in
 {
@@ -8,6 +9,6 @@ in
   services.postgresql = {
     enable = true;
     package = pkgs.postgresql_16;
-    dataDir = "${directory}/${config.services.postgresql.package.psqlSchema}";
+    dataDir = "${directory}/${cfg.package.psqlSchema}";
   };
 }

hosts/Infini-DL360/ssh.nix

@@ -1,19 +1,22 @@
-{ pkgs, config, ... }:
+{ config, pkgs, ... }:
+let
+  cfg = config.services.openssh;
+in
 {
-  users.users.incoming = {
+  users.users = {
+    incoming = {
       description = "User for incoming files with a chroot jail";
       isSystemUser = true;
       group = "incoming";
     };
-  users.groups.incoming = { };
 
-  users.users.jump = {
+    jump = {
       description = "User for ssh jumping";
       isSystemUser = true;
       group = "nogroup";
     };
 
-  users.users.neofetch = {
+    neofetch = {
       description = "SSH Neofetch";
       isSystemUser = true;
       group = "nogroup";
@@ -21,12 +24,16 @@
       shell = pkgs.bash;
     };
 
-  users.users.guest = {
+    guest = {
       description = "Guest shell account for temporary access";
       group = "users";
       isNormalUser = true;
       shell = pkgs.bash;
     };
+  };
+  users.groups = {
+    incoming = { };
+  };
 
   security.pam.services.sshd.allowNullPassword = true;
 
@@ -41,7 +48,7 @@
     Match user incoming
       AuthorizedKeysFile /etc/ssh/authorized_keys.d/infinidoge /etc/ssh/authorized_keys.d/%u
       ChrootDirectory /srv/external
-      ForceCommand ${config.services.openssh.sftpServerExecutable} -d incoming -u 007
+      ForceCommand ${cfg.sftpServerExecutable} -d incoming -u 007
       X11Forwarding no
       AllowTcpForwarding no
       KbdInteractiveAuthentication no

hosts/Infini-DL360/thelounge.nix

@@ -1,7 +1,7 @@
-{ config, pkgs, ... }:
+{ config, common, pkgs, ... }:
 
 {
-  services.nginx.virtualHosts."thelounge.inx.moe" = config.common.nginx.ssl // {
+  services.nginx.virtualHosts."thelounge.inx.moe" = common.nginx.ssl // {
     locations."/" = {
       proxyPass = "http://localhost:${toString config.services.thelounge.port}";
     };

hosts/Infini-DL360/vaultwarden.nix

@@ -1,11 +1,11 @@
-{ config, lib, pkgs, ... }:
+{ config, common, lib, pkgs, ... }:
 let
-  domain = config.common.subdomain "bitwarden";
+  domain = common.subdomain "bitwarden";
 in
 {
   persist.directories = [ config.services.vaultwarden.dataDir ];
 
-  services.nginx.virtualHosts.${domain} = config.common.nginx.ssl // {
+  services.nginx.virtualHosts.${domain} = common.nginx.ssl // {
     locations."/" = {
       proxyPass = "http://127.0.0.1:${toString config.services.vaultwarden.config.ROCKET_PORT}";
     };
@@ -15,7 +15,7 @@ in
     enable = true;
     environmentFile = config.secrets."vaultwarden";
     dataDir = "/srv/vaultwarden";
-    config = with config.common.email; {
+    config = with common.email; {
       DOMAIN = "https://${domain}";
       SIGNUPS_ALLOWED = false;
 

hosts/Infini-DL360/web.nix

@@ -1,6 +1,6 @@
-{ config, pkgs, lib, ... }:
+{ config, common, pkgs, lib, ... }:
 let
-  inherit (config.common.nginx) ssl ssl-optional;
+  inherit (common.nginx) ssl ssl-optional;
 
   tryFiles = "$uri $uri.html $uri/ =404";
   websiteConfig = ''

hosts/Infini-FRAMEWORK/hardware-configuration.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];

hosts/Infini-OPTIPLEX/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, private, ... }: {
+{ ... }: {
   imports = [
     ./hardware-configuration.nix
     ./filesystems.nix

hosts/Infini-OPTIPLEX/filesystems.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ ... }:
 let
   uuid = uuid: "/dev/disk/by-uuid/${uuid}";
   main = uuid "9d4bf2d8-f139-42e7-937a-541a7870d806";

hosts/Infini-OPTIPLEX/hardware-configuration.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   boot.initrd.availableKernelModules = [ "ahci" "nvme" "sd_mod" "usb_storage" "usbhid" "xhci_pci" ];

hosts/Infini-SD/default.nix

@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }: {
+{ pkgs, ... }: {
   imports = [
     ./hardware-configuration.nix
     ./filesystems.nix

hosts/Infini-SD/filesystems.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ ... }:
 
 let
   uuid = uuid: "/dev/disk/by-uuid/${uuid}";

hosts/Infini-SD/hardware-configuration.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{ lib, modulesPath, ... }:
 
 {
   imports = [

hosts/Infini-SERVER/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, private, ... }: {
+{ ... }: {
   imports = [
     ./hardware-configuration.nix
     ./filesystems.nix

hosts/Infini-SERVER/filesystems.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 let
   uuid = uuid: "/dev/disk/by-uuid/${uuid}";

hosts/Infini-SERVER/hardware-configuration.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   boot.initrd.availableKernelModules = [ "nvme" "usb_storage" "xhci_pci" "ahci" "usbhid" "sd_mod" ];

hosts/Infini-STICK/default.nix

@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }: {
+{ pkgs, ... }: {
   imports = [
     ./hardware-configuration.nix
     ./filesystems.nix

hosts/Infini-STICK/hardware-configuration.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{ lib, modulesPath, ... }:
 
 {
   imports = [

hosts/Infini-SWIFT/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 {
   imports = [
     ./hardware-configuration.nix

hosts/Infini-SWIFT/hardware-configuration.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{ lib, modulesPath, ... }:
 
 {
   imports =

hosts/Infini-WSL/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ ... }:
 {
   system.stateVersion = "22.05";
 

hosts/vulcan/default.nix

@@ -1,4 +1,4 @@
-{ private, config, lib, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   modules.hardware.form.server = true;

modules/global/general.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, ... }:
 {
   programs = {
     # Enable dconf for programs that need it

modules/global/graphical.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, config, ... }:
+{ config, lib, ... }:
 
 lib.mkIf config.info.graphical {
   boot.extraModulePackages = with config.boot.kernelPackages; [

modules/global/networking.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, private, ... }:
+{ config, pkgs, private, ... }:
 {
   imports = [ private.nixosModules.networking ];
 

modules/global/options.nix

@@ -1,5 +1,5 @@
 # Heavily inspired by hlissner: https://github.com/hlissner/dotfiles/blob/master/modules/options.nix
-{ config, options, lib, home-manager, ... }:
+{ config, options, lib, ... }:
 with lib;
 with lib.our;
 let

modules/global/ssh.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ common, lib, ... }:
 with lib;
 {
   # For rage encryption, all hosts need a ssh key pair
@@ -17,7 +17,7 @@ with lib;
   };
 
   programs.ssh = {
-    extraConfig = with config.common; ''
+    extraConfig = with common; ''
       Host rsync.net
           Hostname ${rsyncnet.host}
           User ${rsyncnet.user}

modules/modules/desktop/wm.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ config, common, pkgs, lib, ... }:
 with lib;
 with lib.our;
 let
@@ -30,7 +30,7 @@ in
 
       programs.xss-lock = {
         enable = true;
-        lockerCommand = lib.getExe config.common.wm.locker;
+        lockerCommand = lib.getExe common.wm.locker;
       };
 
       # Automatically attach/detatch connected/disconnected monitors
@@ -64,7 +64,7 @@ in
 
         pavucontrol
 
-        config.common.wm.locker
+        common.wm.locker
       ];
     }
     (mkIf cfg.qtile.enable {

modules/modules/hardware/audio.nix

@@ -1,4 +1,4 @@
-{ options, config, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 with lib.our;

modules/modules/hardware/form.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, ... }:
 with lib;
 with lib.our;
 let

modules/modules/hardware/peripherals/printing.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, private, ... }:
+{ config, lib, private, ... }:
 with lib;
 with lib.our;
 let

modules/modules/services/apcupsd.nix

@@ -1,4 +1,4 @@
-{ config, options, lib, pkgs, ... }:
+{ config, lib, ... }:
 with lib;
 with lib.our;
 let

modules/vendored/thelounge.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ config, pkgs, lib, ... }:
 
 with lib;
 

users/infinidoge/default.nix

@@ -1,4 +1,4 @@
-{ config, self, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, ... }:
 let
   inherit (lib) flatten optional mkIf;
   ifGraphical = lib.optionals config.info.graphical;

users/modules/functionality/bindmounts.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }:
+{ config, pkgs, lib, ... }:
 
 # Modified from https://github.com/nix-community/impermanence/blob/master/home-manager.nix
 

users/modules/global/flameshot.nix

@@ -1,4 +1,4 @@
-{ config, main, pkgs, lib, ... }:
+{ main, ... }:
 {
   services.flameshot = {
     enable = main.info.graphical;

users/modules/global/git.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   home.packages = with pkgs; [
     gh
     git-absorb

users/modules/global/htop.nix

@@ -1,4 +1,5 @@
-{ config, ... }: {
+{ config, ... }:
+{
   programs.htop = {
     enable = true;
     settings = {

users/modules/global/keychain.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 {
   programs.keychain = {
     enable = true;

users/modules/global/kitty.nix

@@ -1,10 +1,9 @@
-{ main, pkgs, lib, ... }:
+{ pkgs, ... }:
 {
-  config = {
   programs.kitty = {
     enable = true;
-      font = {
-        package = (pkgs.nerdfonts.override { fonts = [ "DejaVuSansMono" ]; });
+    font = rec {
+      package = (pkgs.nerdfonts.override { fonts = [ name ]; });
       name = "DejaVuSansMono";
       size = 12;
     };
@@ -19,5 +18,4 @@
     #ssh = "kitty +kitten ssh";
     icat = "kitty +kitten icat";
   };
-  };
 }

users/modules/global/music.nix

@@ -1,4 +1,4 @@
-{ main, config, lib, pkgs, ... }:
+{ main, lib, pkgs, ... }:
 lib.mkIf main.info.graphical
 {
   services = {

users/modules/global/neovim.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, ... }:
 {
   programs.nixvim = {
     enable = true;

users/modules/global/obs-studio.nix

@@ -1,4 +1,4 @@
-{ pkgs, main, config, ... }:
+{ main, pkgs, ... }:
 
 {
   programs.obs-studio = {

users/modules/global/shells/all.nix

@@ -1,9 +0,0 @@
-{ ... }: {
-  imports = [
-    ./bash.nix
-    ./fish.nix
-    ./ion.nix
-    ./nushell.nix
-    ./zsh.nix
-  ];
-}

users/modules/global/shells/bash.nix

@@ -1,15 +1,10 @@
-{ config, pkgs, lib, ... }: {
-  imports = [ ./common.nix ];
-
-  programs = {
-    bash = {
+{ config, lib, ... }:
+{
+  programs.bash = {
     enable = true;
     enableVteIntegration = true;
     initExtra = ''
       source <(${lib.getExe config.programs.kitty.package} + complete setup bash)
     '';
   };
-
-    starship.enableBashIntegration = true;
-  };
 }

users/modules/global/shells/common.nix

@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
   programs.nix-index = {
     enable = true;
     enableBashIntegration = false;

users/modules/global/shells/fish.nix

@@ -1,8 +1,6 @@
-{ config, lib, pkgs, ... }: {
-  imports = [ ./common.nix ];
-
-  programs = {
-    fish = {
+{ config, lib, ... }:
+{
+  programs.fish = {
     enable = true;
     functions = { };
     shellAbbrs = { };
@@ -11,7 +9,4 @@
       set -U fish_greeting
     '';
   };
-
-    starship.enableFishIntegration = lib.mkIf config.programs.starship.enable true;
-  };
 }

users/modules/global/shells/ion.nix

@@ -1,11 +1,6 @@
-{ config, pkgs, ... }: {
-  imports = [ ./common.nix ];
-
-  programs = {
-    ion = {
+{ ... }:
+{
+  programs.ion = {
     enable = true;
   };
-
-    starship.enableIonIntegration = true;
-  };
 }

users/modules/global/shells/nushell.nix

@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
   programs.nushell = {
     enable = true;
     extraConfig = ''

users/modules/global/shells/zsh.nix

@@ -1,8 +1,6 @@
-{ config, lib, pkgs, main, ... }: {
-  imports = [ ./common.nix ];
-
-  programs = {
-    zsh = rec {
+{ config, main, pkgs, ... }:
+{
+  programs.zsh = rec {
     enable = true;
 
     enableCompletion = true;
@@ -112,7 +110,4 @@
       ];
     };
   };
-
-    starship.enableZshIntegration = lib.mkIf config.programs.starship.enable true;
-  };
 }

users/modules/global/ssh.nix

@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
   programs.ssh = {
     enable = true;
     controlMaster = "auto";

users/modules/global/starship.nix

@@ -1,7 +1,7 @@
-{ ... }: {
+{ ... }:
+{
   programs.starship = {
     enable = true;
-    enableBashIntegration = true;
 
     settings =
       let

users/modules/global/themeing.nix

@@ -1,4 +1,4 @@
-{ lib, main, config, pkgs, ... }:
+{ config, main, lib, pkgs, ... }:
 lib.mkIf main.info.graphical
 {
   gtk = {

users/modules/global/tmux.nix

@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
   programs.tmux = {
     enable = true;
     mouse = true;

users/root/default.nix

@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }: {
+{ config, lib, pkgs, ... }: {
   users.users.root = {
     shell = pkgs.zsh;
     hashedPasswordFile = lib.mkIf config.modules.secrets.enable config.secrets.root-password;