no clue really

flake.nix

@@ -14,22 +14,23 @@
     };
   };
 
-  outputs = { self, nixpkgs, ... } @ inputs: 
+  outputs =
-    let 
+    { self, nixpkgs, ... }@inputs:
+    let
       system = "x86_64-linux";
       username = "poslop";
-    in 
+    in
     {
-    nixosConfigurations = {
+      nixosConfigurations = {
-      nixos-vm2 = nixpkgs.lib.nixosSystem {
+        nixos-vm2 = nixpkgs.lib.nixosSystem {
-        inherit system;
+          inherit system;
-        modules = [ ./hosts/nixos-vm2/configuration.nix ];
+          modules = [ ./hosts/nixos-vm2/configuration.nix ];
-        specialArgs = {
+          specialArgs = {
-          host = "nixos-vm2";
+            host = "nixos-vm2";
-          inherit self inputs username;
+            inherit self inputs username;
+          };
         };
       };
-    };
 
     };
 }

hosts/nixos-vm1/configuration.nix

@@ -1,17 +1,19 @@
-{ config, lib, pkgs, ... }:
+{
+  pkgs,
+  ...
+}:
 
 {
   nix.settings = {
     experimental-features = "nix-command flakes";
   };
 
-  imports =
+  imports = [
-    [
+    ./hardware-configuration.nix
-      ./hardware-configuration.nix
+    ./modules
-      ./modules
+  ];
-    ];
+
-  
+  programs.hyprland.enable = true;
-  programs.hyprland.enable =  true;
 
   boot.loader.grub.enable = true;
   boot.loader.grub.device = "/dev/vda";
@@ -27,14 +29,6 @@
     pulse.enable = true;
   };
 
-  users.users.poslop = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" ];
-    packages = with pkgs; [
-      tree
-    ];
-  };
-
   environment.systemPackages = with pkgs; [
     kitty
     vim
@@ -46,4 +40,3 @@
 
   system.stateVersion = "24.11";
 }
-

hosts/nixos-vm1/hardware-configuration.nix

@@ -1,26 +1,32 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  lib,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
+  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
-    [ (modulesPath + "/profiles/qemu-guest.nix")
-    ];
 
-  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
+  boot.initrd.availableKernelModules = [
+    "ahci"
+    "xhci_pci"
+    "virtio_pci"
+    "sr_mod"
+    "virtio_blk"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/39b3801f-ffcd-421f-966f-46625fb8d4ca";
+    device = "/dev/disk/by-uuid/39b3801f-ffcd-421f-966f-46625fb8d4ca";
-      fsType = "ext4";
+    fsType = "ext4";
-    };
+  };
 
-  swapDevices =
+  swapDevices = [ { device = "/dev/disk/by-uuid/7043d338-93f0-40a7-9033-6616685e32f3"; } ];
-    [ { device = "/dev/disk/by-uuid/7043d338-93f0-40a7-9033-6616685e32f3"; }
-    ];
 
   networking.useDHCP = lib.mkDefault true;
 

hosts/nixos-vm2/configuration.nix

@@ -1,22 +1,20 @@
-{ config, lib, pkgs, ... }:
+{
+  ...
+}:
 
 {
-  imports =
+  imports = [
-    [
+    ./hardware-configuration.nix
-      ./hardware-configuration.nix
+    ../../modules
-      ../../modules
+  ];
-    ];
+
-  
+  programs.hyprland.enable = true;
-  programs.hyprland.enable =  true;
 
   boot.loader.grub.enable = true;
   boot.loader.grub.device = "/dev/vda";
 
-
   services.spice-vdagentd.enable = true;
   services.qemuGuest.enable = true;
 
-
   system.stateVersion = "24.11";
 }
-

hosts/nixos-vm2/hardware-configuration.nix

@@ -1,26 +1,32 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  lib,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
+  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
-    [ (modulesPath + "/profiles/qemu-guest.nix")
-    ];
 
-  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
+  boot.initrd.availableKernelModules = [
+    "ahci"
+    "xhci_pci"
+    "virtio_pci"
+    "sr_mod"
+    "virtio_blk"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/b8c66f3c-759d-4d4f-9d1a-3f2e04d91e23";
+    device = "/dev/disk/by-uuid/b8c66f3c-759d-4d4f-9d1a-3f2e04d91e23";
-      fsType = "ext4";
+    fsType = "ext4";
-    };
+  };
 
-  swapDevices =
+  swapDevices = [ { device = "/dev/disk/by-uuid/b7d73851-7f85-44fa-b62a-e35deb0ea98a"; } ];
-    [ { device = "/dev/disk/by-uuid/b7d73851-7f85-44fa-b62a-e35deb0ea98a"; }
-    ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

modules/core/default.nix

@@ -11,4 +11,3 @@
     ./ssh.nix
   ];
 }
-

modules/core/hjem.nix

@@ -1,14 +1,13 @@
-{
+{ inputs, username, lib, ... }:
-  inputs,
-  username,
-  ...
-}:
 
 {
-  imports = [inputs.hjem.nixosModules.default];
+  imports = [ 
+    inputs.hjem.nixosModules.default
+    (lib.modules.mkAliasOptionModule ["hj"] ["hjem" "users" username])
+  ];
 
   config.hjem = {
-    extraModules = [inputs.hjem-rum.hjemModules.default];
+    extraModules = [ inputs.hjem-rum.hjemModules.default ];
 
     users.${username} = {
       enable = true;

modules/core/packages.nix

@@ -1,7 +1,4 @@
-{
+{ pkgs, ... }:
-  pkgs,
-  ...
-}:
 {
   environment.systemPackages = with pkgs; [
     wl-clipboard

modules/core/program.nix

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

modules/core/ssh.nix

@@ -1,7 +1,4 @@
-{
+_:
-  pkgs,
-  ...
-}:
 {
   services.openssh = {
     enable = true;

modules/core/timezone.nix

@@ -1,3 +1 @@
-{
+{ time.timeZone = "America/Chicago"; }
-  time.timeZone = "America/Chicago";
-}

modules/core/user.nix

@@ -1,17 +1,10 @@
-{
+{ username, pkgs, ... }:
-  username,
-  pkgs,
-  ...
-}:
 
 {
   users.users.${username} = {
     isNormalUser = true;
     description = "${username}";
-    #group = "${username}";
+    extraGroups = [ "wheel" ];
-    extraGroups = [
-      "wheel"
-    ];
     shell = pkgs.zsh;
   };
   nix.settings.allowed-users = [ "@wheel" ];

modules/home/git.nix

@@ -1,6 +1,10 @@
-{ config, pkgs, username, ... }:
 {
-    config.hjem.users.username.rum.programs.git = {
+  config,
+  username,
+  ...
+}:
+{
+  hj.rum.programs.git = {
     enable = true;
     settings = {
       user = {

modules/home/hyprland/hyprland.nix

@@ -1,3 +1 @@
-{
+{ programs.hyprland.enable = true; }
-  programs.hyprland.enable = true;
-}

modules/home/hyprland/monitor.nix

@@ -1,5 +1 @@
-{
+{ config.me.rum.programs.hyprland.settings.monitor = [ ", 1920x1080@60, auto, 1" ]; }
-  config.me.rum.programs.hyprland.settings.monitor = [
-    ", 1920x1080@60, auto, 1"
-  ];
-}

modules/home/neovim.nix

@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }:
+_:
 {
   programs.neovim = {
     enable = true;

modules/home/packages.nix

@@ -1,7 +1,12 @@
-{ config, pkgs, username, ... }:
+{
+  pkgs,
+  username,
+  ...
+}:
 
 {
-  hjem.users.username.packages = with pkgs; [
+  hjem.users.${username}.packages = with pkgs; [
+    statix
     git
     zsh
     neofetch

modules/home/ssh.nix

@@ -1,7 +1,4 @@
-{
+_:
-  pkgs,
-  ...
-}:
 {
   services.openssh = {
     enable = true;

modules/home/zsh/default.nix

@@ -1,5 +1 @@
-{
+{ imports = [ ./zsh.nix ]; }
-  imports = [
-    ./zsh.nix
-  ];
-}

modules/home/zsh/plugins.nix

@@ -1,6 +0,0 @@
-{
-  programs.zsh.plugins = [
-    {
-      
-    }
-}

modules/home/zsh/zsh.nix

@@ -1,5 +1,6 @@
+{ username, ... }:
 {
-  config.hjem.users.username.rum.programs.zsh = {
+  config.hjem.users.${username}.rum.programs.zsh = {
     enable = true;
   };
 }