more moving

hosts/default.nix

@@ -4,7 +4,16 @@ in {
   imports = [ ../modules ../share ];
 
   # Enable nix flakes and nix-command tools
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nix = {
+    settings.experimental-features = [ "nix-command" "flakes" ];
+
+    # Garbage collect automatically every week
+    gc.automatic = true;
+  };
+
+  # Configure nixpkgs
+  # Enable non free
+  nixpkgs.config.allowUnfree = true;
 
   # Hardware configs
   hardware = {
@@ -54,4 +63,8 @@ in {
       magicOrExtension = "\\x7fELF....AI\\x02";
     };
   };
+
+  programs = {
+    fish.enable = true;
+  };
 }

hosts/desktop/configuration.nix

@@ -8,15 +8,6 @@ let
   password =
     "$y$j9T$EkPXmsmIMFFZ.WRrBYCxS1$P0kwo6e4.WM5DsqUcEqWC3MrZp5KfCjxffraMFZWu06";
   hostname = "matt-nixos";
-  # discover-wrapper is needed as of 1/24/24 since PackageKit does not work correctly so this removes error messages.
-  discover-wrapped = pkgs.symlinkJoin {
-    name = "discover-flatpak-backend";
-    paths = [ pkgs.libsForQt5.discover ];
-    buildInputs = [ pkgs.makeWrapper ];
-    postBuild = ''
-      wrapProgram $out/bin/plasma-discover --add-flags "--backends flatpak"
-    '';
-  };
 in {
   imports = [ # Include the results of the hardware scan.
     ./hardware-configuration.nix
@@ -30,6 +21,10 @@ in {
     corectrl.enablePolkit = true;
   };
 
+  share.gaming.enable = true;
+
+  apps.discover-wrapped.enable = true;
+
   # Configure bootloader with lanzaboot and secureboot
   boot = {
     loader = {
@@ -61,22 +56,6 @@ in {
 
     consoleLogLevel = 3;
     bootspec.enable = true;
-
-    # Network option required using sysctl to let Ubisoft Connect work as of 7-12-2023
-    kernel.sysctl."net.ipv4.tcp_mtu_probing" = 1;
-  };
-
-  # Hardware configs
-  hardware = {
-    # Xbox controllers
-    xpadneo.enable = true;
-
-    # Steam udev rules for remote play
-    steam-hardware.enable = true;
-
-    # opengl.enable = true;
-    # # Enables support for 32bit libs that steam uses
-    # opengl.driSupport32Bit = true; 
   };
 
   # Services configs
@@ -191,7 +170,6 @@ in {
       efibootmgr
       sbctl
       gparted
-      discover-wrapped
       pciutils
       papirus-icon-theme
       vulkan-tools
@@ -204,51 +182,25 @@ in {
     ];
   };
 
-  # Configure programs
-  programs = {
-    fish.enable = true;
-    java.enable = true;
-
-    # Steam
-    steam = {
-      enable = true;
-      remotePlay.openFirewall =
-        true; # Open ports in the firewall for Steam Remote Play
-      dedicatedServer.openFirewall =
-        true; # Open ports in the firewall for Source Dedicated Server
-    };
-  };
 
   # Configure nixpkgs
-  nixpkgs = {
-    config = {
-      # Enable non free
-      allowUnfree = true;
+  nixpkgs.config.permittedInsecurePackages = [
+    # allow insecure electron for etcher
+    "electron-19.1.9"
+  ];
 
-      permittedInsecurePackages = [
-        # allow insecure electron for etcher
-        "electron-19.1.9"
-      ];
+  # # Configure nixpkgs
+  # nixpkgs = {
+  #   config = {
+  #     # Enable non free
+  #     allowUnfree = true;
 
-      packageOverrides = pkgs: {
-        steam = pkgs.steam.override {
-          extraPkgs = pkgs:
-            with pkgs; [
-              xorg.libXcursor
-              xorg.libXi
-              xorg.libXinerama
-              xorg.libXScrnSaver
-              libpng
-              libpulseaudio
-              libvorbis
-              stdenv.cc.cc.lib
-              libkrb5
-              keyutils
-            ];
-        };
-      };
-    };
-  };
+  #     permittedInsecurePackages = [
+  #       # allow insecure electron for etcher
+  #       "electron-19.1.9"
+  #     ];
+  #   };
+  # };
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users."${user}" = {

hosts/desktop/home.nix

@@ -15,8 +15,11 @@ in {
   home.stateVersion = "23.11";
   programs.home-manager.enable = true;
 
-  programs.fish.enable = true;
-  programs.mangohud.enable = true;
+  programs = {
+    fish.enable = true;
+    mangohud.enable = true;
+    java.enable = true;
+  };
 
   programs.git = {
     enable = true;
@@ -57,7 +60,4 @@ in {
     # Other packages
     vulkan-hdr-layer
   ];
-
-  # Garbage collect automatically every week
-  nix.gc.automatic = true;
 }