wip2

flake.nix

@@ -27,6 +27,7 @@
       specialArgs = { inherit inputs; };
       modules = [ 
         ./machines/z790prors/configuration.nix 
+        inputs.hyprland.homeManagerModules.default
         inputs.home-manager.nixosModules.home-manager
         {
           home-manager.useGlobalPkgs = true;

machines/z790prors/configuration.nix

@@ -22,27 +22,17 @@ in
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.grub.useOSProber = true;
 
+  networking.hostName = "z790prors-nix"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
   # Set your time zone.
   time.timeZone = "America/Los_Angeles";
 
-  networking = {
+  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
-    hostName = "z790prors-nix"; # Define your hostname.
+  # Per-interface useDHCP will be mandatory in the future, so this generated config
-    domain = "oglehome";
+  # replicates the default behaviour.
-    defaultGateway = "10.0.0.1";
+  networking.useDHCP = false;
-    nameservers = [ "10.0.0.1" ];
+  networking.interfaces.enp3s0.useDHCP = true;
-
-    # The global useDHCP flag is deprecated, therefore explicitly set to false here.
-    # Per-interface useDHCP will be mandatory in the future, so this generated config
-    # replicates the default behaviour.
-    useDHCP = false;
-    
-    interfaces.enp3s0.ipv4.addresses = [{
-      address = "10.0.0.37";
-      prefixLength = 24;
-    }];
-  };
 
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
@@ -80,12 +70,6 @@ in
     nvidiaSettings = true;
     package = config.boot.kernelPackages.nvidiaPackages.production;
   };
-  boot.initrd.kernelModules = [
-    "nvidia"
-    "nvidia_modeset"
-    "nvidia_uvm"
-    "nvidia_drm"
-  ];
 
   # Configure keymap in X11
   # services.xserver.layout = "us";
@@ -95,8 +79,7 @@ in
   # services.printing.enable = true;
 
   # Enable sound.
-  # TODO: Something is enabling pipewire (sunshine/moonlight maybe?) which is incompatible with pulseaudio
+  hardware.pulseaudio.enable = true;
-  hardware.pulseaudio.enable = false;
 
   # Enable touchpad support (enabled default in most desktopManager).
   # services.xserver.libinput.enable = true;
@@ -105,7 +88,7 @@ in
   users.users.johno = {
     isNormalUser = true;
     description = "John Ogle";
-    extraGroups = [ "wheel" "networkmanager" "audio" "libvirtd" "input" ]; # Enable ‘sudo’ for the user.
+    extraGroups = [ "wheel" "networkmanager" "audio" "libvirtd" ]; # Enable ‘sudo’ for the user.
   };
 
   users.users.eli = {
@@ -151,24 +134,10 @@ in
 
   services.displayManager = {
     sddm.enable = true;
-    sddm.wayland.enable = false;
+    sddm.wayland.enable = true;
     #defaultSession = "plasmax11";
   };
-
   services.desktopManager.plasma6.enable = true;
-
-  services.xserver.windowManager.i3 = {
-    enable = true;
-    extraPackages = with pkgs; [
-      dmenu
-      i3status
-      i3lock
-    ];
-  };
-  # Helps with i3. Not sure what dconf is though honestly
-  programs.dconf.enable = true;
-
-  programs.kdeconnect.enable = true;
   programs.hyprland = {
     enable = true;
     package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
@@ -185,12 +154,6 @@ in
       #extraPkgs = pkgs: [ bumblebee glxinfo ];
     #};
   };
-  services.sunshine = {
-    enable = true;
-    autoStart = true;
-    capSysAdmin = true;
-    openFirewall = true;
-  };
 
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];

roles/nfs-mounts/default.nix

@@ -4,10 +4,5 @@
   fileSystems."/media" = {
     device = "10.0.0.43:/media";
     fsType = "nfs";
-    options = [
-      "defaults"
-      "nofail"
-      "softreval"
-    ];
   };
 }