rearrange imports

flake.nix

@@ -15,30 +15,36 @@
     };
   };
 
-  outputs = {
-    nixpkgs,
-    home-manager,
-    stylix,
-    ...
-  } @ inputs: let
+  outputs = inputs: let
     system = "x86_64-linux";
-    mkConf = import ./lib/mkconf.nix;
-    pkgs = import nixpkgs {inherit system;};
+    pkgs = import inputs.nixpkgs {inherit system;};
     user = "tristan";
-    userName = "Tristan Beedell";
+    userFullname = "Tristan Beedell";
+
+    mkConf = import ./lib/mkconf.nix {inherit inputs system user userFullname;};
   in {
     formatter.${system} = pkgs.alejandra;
     nixosConfigurations = {
-      zenix = mkConf "zenix" {
-        inherit inputs nixpkgs system user userName home-manager;
-      };
-      vm = mkConf "vm" {
-        inherit inputs nixpkgs system user userName home-manager;
-      };
-      FCS-Tristan-Nixbook = mkConf "work" {
-        inherit inputs nixpkgs system user userName home-manager;
-        work = true;
-      };
+      zenix =
+        mkConf [
+          ./hardware/zenix.nix
+          ./nixos/programs/hyprland.nix
+          ./nixos/programs/gamer.nix
+          ./nixos/programs/personal.nix
+        ] [
+          ./home/programs/gamer.nix
+          ./home/programs/personal.nix
+        ];
+
+      vm = mkConf [
+        ./hardware/vm.nix
+      ] [];
+
+      FCS-Tristan-Nixbook = mkConf [
+        ./hardware/fcs-tristan-nixbook.nix
+        ./nixos/programs/hyprland.nix
+        ./nixos/modules/work.nix
+      ] [];
     };
   };
 }

hardware/fcs-tristan-nixbook.nix

@@ -1,10 +1,12 @@
-{user}: {
+{
   config,
   lib,
   pkgs,
   modulesPath,
   ...
-}: {
+}: let
+  user = config.user;
+in {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];

hardware/g920.nix

@@ -1,14 +1,7 @@
-{
-  pkgs,
-  user,
-}: {
-  home-manager.users.${user}.imports = [
-    {
-      home.packages = with pkgs; [
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
     oversteer
   ];
-    }
-  ];
 
   environment.etc.logitechG920 = {
     target = "usb_modeswitch.d/046d:c261";

hardware/vm.nix

@@ -1,18 +1,11 @@
-{user}: {
-  modulesPath,
-  lib,
-  config,
-  ...
-}: {
-  imports = [
-  ];
-
+{config, ...}: let
+  user = config.user;
+in {
   system.stateVersion = "24.05";
 
   home-manager.users.${user}.imports = [
     {
       home.stateVersion = "24.05";
     }
-    ../home/programs/sway.nix
   ];
 }

hardware/zenix.nix

@@ -1,14 +1,16 @@
-{user}: {
+{
   config,
   lib,
   pkgs,
   modulesPath,
   ...
-}: {
+}: let
+  user = config.user;
+in {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
     ./ddc.nix
-    (import ./g920.nix {inherit user pkgs;})
+    ./g920.nix
   ];
 
   boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
@@ -79,12 +81,6 @@
 
   system.stateVersion = "22.11"; # do not change
 
-  virtualisation = {
-    podman = {
-      enable = true;
-    };
-  };
-
   home-manager.users.${user}.imports = [
     {
       home.stateVersion = "22.05";

home/default.nix

@@ -3,30 +3,8 @@
   pkgs,
   ...
 }:
-# https://nix-community.github.io/home-manager/options.html
-let
-  my-deps = {
-    notify-send = "${pkgs.libnotify}/bin/notify-send";
-    playerctl = "${pkgs.playerctl}/bin/playerctl";
-    grim = "${pkgs.grim}/bin/grim";
-    slurp = "${pkgs.slurp}/bin/slurp";
-    amixer = "${pkgs.alsa-utils}/bin/amixer";
-    swaybg = "${pkgs.swaybg}/bin/swaybg";
-    terminal = "${config.programs.terminal}/bin/${config.programs.terminal.pname}";
-    chafa = "${pkgs.chafa}/bin/chafa";
-    exiftool = "${pkgs.exiftool}/bin/exiftool";
-    wc = "${pkgs.coreutils}/bin/wc";
-    jq = "${pkgs.jq}/bin/jq";
-    hyprctl = "${pkgs.hyprland}/bin/hyprctl";
-    xargs = "${pkgs.findutils}/bin/xargs";
-    menu = "${config.programs.menu.package}${config.programs.menu.dmenuCommand}";
-    fileman = "${pkgs.pcmanfm}/bin/pcmanfm";
-    gawk = "${pkgs.gawk}/bin/awk";
-    glow = "${pkgs.glow}/bin/glow";
-    ffmpegthumbnailer = "${pkgs.ffmpegthumbnailer}/bin/ffmpegthumbnailer";
-  };
-  # lf-sixel = pkgs.callPackage ../custom/lf-sixel/. {};
-in {
+# https://nix-community.github.io/home-manager/options.xhtml
+{
   imports = [
     ./modules/terminal.nix
     ./modules/scripts.nix
@@ -36,6 +14,7 @@ in {
     ./modules/menu.nix
     ./modules/scripts.nix
 
+    ./programs/hyprland.nix
     ./programs/graphical.nix
     ./programs/scripts.nix
     ./programs/neovim/.

home/programs/git.nix

@@ -4,6 +4,7 @@
     aliases = {
       graph = "log --oneline --all --graph";
       amend = "commit --amend --no-edit";
+      sdiff = "diff --staged";
     };
     delta = {
       enable = true;

home/programs/personal.nix

@@ -0,0 +1,32 @@
+{pkgs, ...}: {
+  roles.email = {
+    enable = true;
+    email = "tristan@tristans.cloud";
+    terminal = true;
+  };
+
+  services.nextcloud-client.enable = true;
+  services.gnome-keyring.enable = true;
+
+  home.language = {
+    base = "eo.UTF-8";
+  };
+
+  home.packages = with pkgs; [
+    godot_4
+    ardour
+    blender
+    musescore
+    jellyfin-media-player
+    monero-gui
+    electrum
+    xmrig
+    transmission-remote-gtk
+    krita
+    organicmaps
+    anki
+    hugo
+    libsForQt5.neochat
+    bookworm
+  ];
+}

lib/mkconf.nix

@@ -1,45 +1,45 @@
-name: {
-  nixpkgs,
+{
   inputs,
-  home-manager,
   system,
   user,
-  laptop ? false,
-  work ? false,
-  userName,
+  userFullname,
   ...
-}:
-nixpkgs.lib.nixosSystem {
+}: modules: home-modules:
+with inputs;
+  nixpkgs.lib.nixosSystem {
     specialArgs = {inherit inputs;};
 
     inherit system;
 
-  modules = [
-    inputs.stylix.nixosModules.stylix
+    modules =
+      modules
+      ++ [
+        stylix.nixosModules.stylix
         home-manager.nixosModules.home-manager
         {
           home-manager = {
             useGlobalPkgs = true;
             useUserPackages = true;
-        users.${user}.imports = [
+            users.${user}.imports =
+              home-modules
+              ++ [
                 ../home/.
                 {
-            options.home.userFullname = nixpkgs.lib.mkOption {default = userName;};
+                  options.home.userFullname = nixpkgs.lib.mkOption {default = userFullname;};
                   config.home.username = user;
                 }
               ];
           };
           nixpkgs.config.packageOverrides = pkgs: {
-        hycov = inputs.hycov.packages.${system}.hycov;
+            hycov = hycov.packages.${system}.hycov;
           };
 
           imports = [
-        (import ../hardware/${name}.nix {inherit user;})
-        (import ../nixos/. user)
+            {
+              options.user = nixpkgs.lib.mkOption {default = user;};
+            }
+            ../nixos/.
           ];
-
-      roles.work.enable = work;
-      roles.personal.enable = !work;
         }
       ];
-}
+  }

nixos/default.nix

@@ -1,19 +1,17 @@
 # https://search.nixos.org/options
-user: {
+{
   inputs,
   config,
   pkgs,
   lib,
   ...
-}: {
+}: let
+  user = config.user;
+in {
   imports = [
-    (import ./modules/gamer.nix {inherit user;})
-    (import ./modules/keyboard.nix {inherit user;})
-    (import ./modules/display.nix {inherit user;})
-    (import ./modules/work.nix {inherit user;})
-    (import ./modules/laptop.nix {inherit user;})
-    (import ./modules/personal.nix {inherit user;})
-    (import ./programs/hyprland.nix {inherit user;})
+    ./modules/keyboard.nix
+    ./modules/display.nix
+    ./modules/laptop.nix
     ../hardware/displays.nix
   ];
 
@@ -121,7 +119,7 @@ user: {
 
   users.users.${user} = {
     isNormalUser = true;
-    extraGroups = ["wheel" "video" "networkmanager"];
+    extraGroups = ["wheel" "video" "networkmanager" "kvm"];
     initialPassword = "pass";
     shell = pkgs.zsh;
   };

nixos/modules/display.nix

@@ -1,12 +1,13 @@
-{user}: {
+{
   lib,
   pkgs,
   config,
   ...
 }:
 with lib; let
-  cfg = config.displays;
+  user = config.user;
 
+  cfg = config.displays;
   renderDisplaysForHyprland = displays: (map displayHyprlandSetting (builtins.filter (d: d.enable) displays));
 
   displayHyprlandSetting = display:

nixos/modules/gamer.nix

@@ -1,35 +0,0 @@
-{user}: {
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-with lib; {
-  options.roles.gamer = {
-    enable = mkEnableOption "gamer packages";
-  };
-
-  config = mkIf config.roles.gamer.enable {
-    # required for heroic launcher
-    nixpkgs.config.permittedInsecurePackages = [
-      "electron-25.9.0"
-    ];
-
-    home-manager.users.${user}.imports = [ ../../home/programs/gamer.nix ];
-
-    nixpkgs.config.allowUnfreePredicate = pkg:
-      builtins.elem (lib.getName pkg) [
-        "steam"
-        "steam-run"
-        "steam-original"
-        "osu-lazer"
-      ];
-
-    programs.steam = {
-      enable = true;
-      remotePlay.openFirewall = true;
-      dedicatedServer.openFirewall = true;
-    };
-    programs.gamemode.enable = true;
-  };
-}

nixos/modules/keyboard.nix

@@ -1,9 +1,9 @@
-{user}: {
+{
   lib,
-  pkgs,
   config,
   ...
 }:
+let user = config.user; in
 with lib; {
   options.keyboard = {
     dvorak = {

nixos/modules/laptop.nix

@@ -1,11 +1,11 @@
-{user}: {
+{
   lib,
-  pkgs,
   config,
   ...
 }:
 with lib; let
   cfg = config.roles.laptop;
+  user = config.user;
 in {
   options.roles = {
     laptop = {

nixos/modules/personal.nix

@@ -1,56 +0,0 @@
-{user}: {
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-with lib; {
-  options.roles.personal = {
-    enable = mkEnableOption "personal packages";
-  };
-
-  config = mkIf config.roles.personal.enable {
-    roles.gamer.enable = true;
-
-    i18n.supportedLocales = [
-      "eo/UTF-8"
-      "en_GB.UTF-8/UTF-8"
-      "en_US.UTF-8/UTF-8"
-    ];
-
-    home-manager.users.${user}.imports = [
-      {
-        roles.email = {
-          enable = true;
-          email = "tristan@tristans.cloud";
-          terminal = true;
-        };
-
-        services.nextcloud-client.enable = true;
-        services.gnome-keyring.enable = true;
-
-        home.language = {
-          base = "eo.UTF-8";
-        };
-
-        home.packages = with pkgs; [
-          godot_4
-          ardour
-          blender
-          musescore
-          jellyfin-media-player
-          monero-gui
-          electrum
-          xmrig
-          transmission-remote-gtk
-          krita
-          organicmaps
-          anki
-          hugo
-          libsForQt5.neochat
-          bookworm
-        ];
-      }
-    ];
-  };
-}

nixos/modules/work.nix

@@ -1,15 +1,9 @@
-{user}: {
+user: {
   lib,
   pkgs,
   config,
   ...
-}:
-with lib; {
-  options.roles.work = {
-    enable = mkEnableOption "work packages";
-  };
-
-  config = mkIf config.roles.work.enable {
+}: {
   home-manager.users.${user}.imports = [
     {
       roles.email = {
@@ -98,5 +92,4 @@ with lib; {
       };
     };
   };
-  };
 }

nixos/programs/gamer.nix

@@ -0,0 +1,16 @@
+{lib, ...}: {
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) [
+      "steam"
+      "steam-run"
+      "steam-original"
+      "osu-lazer"
+    ];
+
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true;
+    dedicatedServer.openFirewall = true;
+  };
+  programs.gamemode.enable = true;
+}

nixos/programs/hyprland.nix

@@ -1,8 +1,6 @@
-{user}: {
-  lib,
-  pkgs,
-  ...
-}: {
+{config, ...}: let
+  user = config.user;
+in {
   services.greetd = {
     enable = true;
     settings = rec {
@@ -14,5 +12,9 @@
     };
   };
 
-  home-manager.users.${user}.imports = [../../home/programs/hyprland.nix];
+  home-manager.users.${user}.imports = [
+    {
+      wayland.windowManager.hyprland.enable = true;
+    }
+  ];
 }

nixos/programs/personal.nix

@@ -0,0 +1,12 @@
+{...}: {
+  i18n.supportedLocales = [
+    "eo/UTF-8"
+    "en_GB.UTF-8/UTF-8"
+    "en_US.UTF-8/UTF-8"
+  ];
+  virtualisation = {
+    podman = {
+      enable = true;
+    };
+  };
+}