move more stuff

hosts/desktop/configuration.nix

@@ -26,6 +26,12 @@ in
       ../default.nix
     ];
 
+  share.hardware.amd = {
+    enable = true;
+    corectrl.enable = true;
+    corectrl.enablePolkit = true; 
+  };
+
   # Configure bootloader with lanzaboot and secureboot
   boot = {
     loader = {
@@ -54,7 +60,7 @@ in
     kernelPackages = pkgs.linuxPackages_latest;
 
     kernelParams = [
-      "quiet" "amdgpu.ppfeaturemask=0xffffffff"
+      "quiet"
     ];
 
     consoleLogLevel = 3;
@@ -72,9 +78,9 @@ in
     # Steam udev rules for remote play
     steam-hardware.enable = true;
     
-    opengl.enable = true;
-    # Enables support for 32bit libs that steam uses
-    opengl.driSupport32Bit = true; 
+    # opengl.enable = true;
+    # # Enables support for 32bit libs that steam uses
+    # opengl.driSupport32Bit = true; 
   };
 
   # Services configs
@@ -112,25 +118,25 @@ in
     ];
   };
 
-  systemd.services.fix-wifi = {
-    path = [ pkgs.bash ];
-    script = ''
-      sleep 5
-      if ping -q -c1 10.0.1.1 &>/dev/null; then
-        echo "No need to fix wifi"
-      else
-        echo 1 | tee /sys/bus/pci/devices/0000\:09\:00.0/reset
-        rmmod iwlwifi
-        modprobe iwlwifi
-      fi
-    '';
-    wantedBy = [ "multi-user.target" ];
-    after = [ "NetworkManager.target" ];
-    serviceConfig = {
-      Type="oneshot";
-      RemainAfterExit=true;
-    };
-  };
+  # systemd.services.fix-wifi = {
+  #   path = [ pkgs.bash ];
+  #   script = ''
+  #     sleep 5
+  #     if ping -q -c1 10.0.1.1 &>/dev/null; then
+  #       echo "No need to fix wifi"
+  #     else
+  #       echo 1 | tee /sys/bus/pci/devices/0000\:09\:00.0/reset
+  #       rmmod iwlwifi
+  #       modprobe iwlwifi
+  #     fi
+  #   '';
+  #   wantedBy = [ "multi-user.target" ];
+  #   after = [ "NetworkManager.target" ];
+  #   serviceConfig = {
+  #     Type="oneshot";
+  #     RemainAfterExit=true;
+  #   };
+  # };
 
   # Networking configs
   networking = {
@@ -177,22 +183,6 @@ in
         groups = [ "wheel" ];
       }];
     };
-
-    # Configure polkit
-    polkit = {
-      enable = true;
-      extraConfig = ''
-        polkit.addRule(function(action, subject) {
-          if ((action.id == "org.corectrl.helper.init" ||
-              action.id == "org.corectrl.helperkiller.init") &&
-              subject.local == true &&
-              subject.active == true &&
-              subject.isInGroup("wheel")) {
-                  return polkit.Result.YES;
-          }
-        });
-    '';
-    };
   };
 
   # Configure environment
@@ -205,7 +195,6 @@ in
       nano
       os-prober
       efibootmgr
-      git
       sbctl
       gparted
       discover-wrapped
@@ -218,26 +207,13 @@ in
       aspellDicts.en-science
       aha
       clinfo
-      neofetch
-      gamescope
-      gamescope-wsi
-      mangohud
-      goverlay
-      heroic
-      python3
-      virt-manager
-      orca-slicer
     ];
-
-    # Force radv
-    # variables.AMD_VULKAN_ICD = "RADV";
   };
 
   # Configure programs
   programs = {
     fish.enable = true;
     java.enable = true;
-    # corectrl.enable = true;
 
     # Steam
     steam = {
@@ -282,14 +258,6 @@ in
     isNormalUser = true;
     extraGroups = [ "wheel" "networkmanager" ]; # Enable ‘sudo’ for the user.
     shell = pkgs.fish;
-    packages = with pkgs; [
-      firefox
-      tree
-      lm_sensors
-      vmware-horizon-client
-      etcher
-      freerdp
-    ];
   };
 
   # This option defines the first version of NixOS you have installed on this particular machine,

hosts/desktop/home.nix

@@ -16,10 +16,40 @@ in
     enable = true;
     userName = "mjallen18";
     userEmail = "matt.l.jallen@gmail.com";
+    aliases = {
+      co = "checkout";
+      ci = "commit";
+      cia = "commit --amend";
+      s = "status";
+      st = "status";
+      b = "branch";
+      # p = "pull --rebase";
+      pu = "push";
+    };
   };
 
-  home.packages = [
+  programs.command-not-found.enable = true;
+
+  home.packages = with pkgs;  [
+    firefox
+    tree
+    lm_sensors
+    vmware-horizon-client
+    etcher
+    freerdp
+    neofetch
+    gamescope
+    gamescope-wsi
+    mangohud
+    goverlay
+    heroic
+    python3
+    virt-manager
+    orca-slicer
     # Other packages
     vulkan-hdr-layer
   ];
+
+  # Garbage collect automatically every week
+  nix.gc.automatic = true;
 }

hosts/desktop/impermanence.nix

@@ -1,21 +0,0 @@
-{ pkgs, lib, LT, config, utils, inputs, ... }@args:
-
-{
-# Set up impernance configuration for things like bluetooth
-# In this configuration with /etc and /var/log being persistent, only directories outside of that need to be done here. See hardware configuration for all mountpoints.
-
-    environment.persistence."/nix/persist/system" = {
-        hideMounts = true;
-        directories = [
-            "/var/lib/bluetooth"
-            "/var/lib/nixos"
-            "/var/lib/systemd/coredump"
-            "/etc/NetworkManager/system-connections"
-            "/etc/secureboot"
-            { directory = "/var/lib/colord"; user = "colord"; group = "colord"; mode = "u=rwx,g=rx,o="; }
-        ];
-        files = [
-            { file = "/etc/nix/id_rsa"; parentDirectory = { mode = "u=rwx,g=,o="; }; }
-        ];
-    };
-}