Big, might break stuff

homeConfig/modules/bash/config/alias.nix

@@ -1,7 +1,5 @@
-{ flakePath, ... }:
-
 {
-  nixup = "sudo nixos-rebuild switch --flake ${flakePath}/.#desktop";
+  nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#desktop";
   chat = "weechat";
   open = "xdg-open";
 }

homeConfig/modules/bash/default.nix

@@ -3,7 +3,6 @@
 with lib;
 let
   cfg = config.modules.bash;
-  flakePath = builtins.toString config.user.defaultFlakePath;
 
 in
 { options.modules.bash = { enable = mkEnableOption "bash"; };
@@ -15,7 +14,7 @@ in
       initExtra = import ./config/prompt.nix;
       profileExtra = import ./config/bashprofile.nix;
       bashrcExtra = import ./config/bashrc.nix;
-      shellAliases = import ./config/alias.nix { inherit flakePath; };
+      shellAliases = import ./config/alias.nix;
     };
 
     programs = {

sysConfig/desktop/default.nix

@@ -1 +1,7 @@
-{ imports = [ ./hardware.nix ./system.nix ../../user ]; }
+{
+  imports = [
+    ../../user
+    ./hardware.nix
+    ./system.nix
+  ];
+}

sysConfig/desktop/hardware.nix

@@ -10,37 +10,23 @@
   boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.kernelParams = [ "intel_iommu=on" ];
   boot.kernelModules = [ "kvm-intel" "virtio" "vfio-pci" "coretemp" ];
-  
-# Bootloader
-  boot.loader = {
-    timeout = null;
-    grub = {
-      enable = true;
-      useOSProber = true;
-      devices = [ "nodev" ];
-      efiSupport = true;
-      configurationLimit = 5;
-    };
-
-    efi = {
-      canTouchEfiVariables = true;
-    };
-  };
 
 # FStab
-  fileSystems."/" = {
+  fileSystems = {
-    device = "/dev/disk/by-uuid/af24c5b3-8a6e-4333-a61d-922a97928cae";
+    "/" = {
-    fsType = "ext4";
+      device = "/dev/disk/by-uuid/af24c5b3-8a6e-4333-a61d-922a97928cae";
-  };
+      fsType = "ext4";
+    };
 
-  fileSystems."/home" = {
+    "/home" = {
-    device = "/dev/disk/by-uuid/1639ee20-28d6-4649-814d-ba981c138b35";
+      device = "/dev/disk/by-uuid/1639ee20-28d6-4649-814d-ba981c138b35";
-    fsType = "ext4";
+      fsType = "ext4";
-  };
+    };
 
-  fileSystems."/boot" = {
+    "/boot" = {
-    device = "/dev/disk/by-uuid/74B9-4AAF";
+      device = "/dev/disk/by-uuid/74B9-4AAF";
-    fsType = "vfat";
+      fsType = "vfat";
+    };
   };
 
 # GPU
@@ -48,7 +34,10 @@
 
 # Virtualisation
   nix.settings.system-features = [ "kvm" ];
-  environment.systemPackages = [ pkgs.virt-manager ];
+
+  environment.systemPackages = with pkgs; [
+    virt-manager
+  ];
 
   virtualisation.libvirtd = {
     enable = true;

sysConfig/desktop/system.nix

@@ -2,6 +2,11 @@
 
 { system.stateVersion = "22.11";
 
+# Users
+  users.users = {
+    ${config.user.name} = config.user;
+  };
+
 # Nix
   nix = {
     channel.enable = false;
@@ -18,6 +23,22 @@
     };
   };
 
+# Bootloader
+  boot.loader = {
+    timeout = null;
+    grub = {
+      enable = true;
+      useOSProber = true;
+      devices = [ "nodev" ];
+      efiSupport = true;
+      configurationLimit = 5;
+    };
+
+    efi = {
+      canTouchEfiVariables = true;
+    };
+  };
+
   environment.systemPackages = with pkgs; [
     pavucontrol
 
@@ -50,17 +71,7 @@
     alsa.support32Bit = true;
   };
 
-# Users
+# Sudo Options
-  users.users = {
-    ${config.user.name} = {
-      isNormalUser = true;
-      extraGroups = config.user.groups;
-      openssh.authorizedKeys = lib.mkIf (config.user.name == "bryan") {
-        keys = config.user.sshKeys;
-      };
-    };
-  };
-
   security.sudo = {
     wheelNeedsPassword = false;
     execWheelOnly = true;
@@ -100,7 +111,7 @@
 
 # Networking
   networking = {
-    hostName = "${config.user.host}";
+    hostName = "socrates";
     useDHCP = lib.mkDefault true;
     networkmanager.enable = true;
     firewall = {

user/default.nix

@@ -6,15 +6,18 @@
       type = lib.types.attrs;
       default = {
         name = "bryan";
-        host = "socrates";
+        isNormalUser = true;
-        groups = [ "wheel" "networkmanager" "home-manager" "input" "video" "audio" "kvm" "libvirtd" "docker" ];
 
-        sshKeys = [
+        extraGroups = [
+          "wheel" "networkmanager" "home-manager"
+          "input" "video" "audio"
+          "kvm" "libvirtd" "docker"
+        ];
+
+        openssh.authorizedKeys.keys = [
           "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDl4895aB9P5p/lp8Hq5rHun4clvhyTSHFi3U2d6OOBoW5Fm+VcQnW/xbjmCBsXk5BdiowsBxQhwnzdfz/KJL7J5RobomUEaVRwb9UwT88eJveLp14BG8j2J3SjfyhrCX+4jkPx0bPQk1HGcuYY+tPEXf1q/ps88Dhu0CARBIzYQOTYY6b1qWzxpDoFZGHjKG8g5iY6FIu65yKKvvVy1f8IgZ3l3IpwBWVamxgkTcYY0QYSrmzo1n7TXxwrWbvenAqBsQ0cBPs+gVa3uIr+1TJl0Az5SElBVGu3LvUdlk58trtPUj6TQR3YUkg7Vjll7WHOdqhux5ZQNhjkOsHerf0Tw86e6cEzgeTuIbQHIb0LcsUunwKcuh2+au7RO599cvHn0+xZE5MZBxloDDaJ3JsiliM8kyPP/U3ERj03cWLW7BqbT+sfjAOl21RCzk0iQxk1wt/8VmtCr9Adv7IyrtaYvf/bwRP+g+9ldmzKGt8Mdb605uVzZ70H/LLm17f40Te+QHaex5by/6p6cuwEEZtgIg53Wpglu0rA6UxrBfQEHKl/Jt3FLeE0mnEyYkkR2MnHNtyWRIXtuqYZMAm2Ub1pFHH7jQV1gGiDVTw6a2eIwK21a/hXtRjFUpFd1nB1n+KNfJBE4zT3wm3Ud7mKw/6rWnoRyhYZvGXkFdp+iEs49Q=="
           "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK2ROz7EVvE+nzF5k9EYZ2v3JhBzk058uh3QJTzcG4t70fkZgh9y56AOx26eXlKQWuuV05e8EkWRuVI8gfA2ROI="
         ];
-
-        defaultFlakePath = /etc/nixos;
       };
     };
   };