From ef40fb1f4b2c5040914bbc4372728036731ace5c Mon Sep 17 00:00:00 2001
From: Jimbo <jimjam4real@gmail.com>
Date: Fri, 9 Aug 2024 01:44:32 -0400
Subject: [PATCH] Not sure why it did an older version but ok

---
 PC/configuration.nix | 21 +++++++++++++--------
 PC/jimbo.nix         | 25 ++++++++++---------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/PC/configuration.nix b/PC/configuration.nix
index 29d10fd..9ac06cb 100644
--- a/PC/configuration.nix
+++ b/PC/configuration.nix
@@ -69,7 +69,7 @@ in
     # Set a kernel version and load/blacklist drivers
     kernelPackages = pkgs.unstable.linuxPackages_zen;
     blacklistedKernelModules = [ "pcspkr" ];
-    kernelParams = commonKernelParams ++ [ "vfio-pci.ids=10de:13c2,10de:0fbb" ];
+    kernelParams = commonKernelParams ++ [ "vfio-pci.ids=10de:1f82,10de:10fa" ];
     initrd.kernelModules = [ "vfio" "vfio_pci" "vfio_iommu_type1" ];
     kernel.sysctl."vm.max_map_count" = 2147483642;
 
@@ -102,12 +102,12 @@ in
   hardware.enableRedistributableFirmware = true;
 
   # Enable the Nouveau drivers
-  services.xserver.videoDrivers = [ "nvidia" ];
-  hardware.nvidia = {
-    modesetting.enable = true;
-    nvidiaSettings = false;
-    package = config.boot.kernelPackages.nvidiaPackages.beta;
-  };
+  services.xserver.videoDrivers = [ "nouveau" ];
+  #hardware.nvidia = {
+  #  modesetting.enable = true;
+  #  nvidiaSettings = false;
+  #  package = config.boot.kernelPackages.nvidiaPackages.beta;
+  #};
 
   # Enable a permissioning system
   security = {
@@ -139,7 +139,7 @@ in
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIKC8Uqxb09V3msBgDv6lD/nETMYr/X0OgtpDo8ldcMK jimbo@JimDebianServer"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDLe/HioxCOkszFQdm1vb3ZwuzLzsOThqHNvEI4IXeXZ JimPhone"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEuCYrIZlD6LNpFh3XTYbXaPQWYysr1oZAX4DL3gF28l jimbo@DV-JHAMPTON"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPeqiMCRXtpoP+BvKBmzvkL7oLKKCmbfdaQIF3yk/S8I jimbo@DV-JHAMPTON-NIXOS"
     ];
     extraGroups = [ 
       "wheel" "audio" "video" "input" "disk" 
@@ -174,6 +174,8 @@ in
     enable = true;
     driSupport = true;
     driSupport32Bit = true;
+    package = pkgs.unstable.mesa.drivers;
+    package32 = pkgs.unstable.pkgsi686Linux.mesa.drivers;
     extraPackages = with pkgs; [
       vulkan-loader
       vulkan-validation-layers
@@ -196,6 +198,9 @@ in
     #networkmanager.enable = true;
     #enableB43Firmware = true;
 
+    # Enable nftables over iptables
+    nftables.enable = true;
+
     # Enable firewall passthrough
     firewall = {
       allowedTCPPorts = [ 
diff --git a/PC/jimbo.nix b/PC/jimbo.nix
index b4aa3a9..fef2bfb 100644
--- a/PC/jimbo.nix
+++ b/PC/jimbo.nix
@@ -25,21 +25,24 @@ let
     };
   };
 
+  # Git repo alias
+  gitRepo = ''https://git.JimbosFiles.com/Jimbo/NixOS-Config'';
+
   # Wallpapers
   wallpaper1 = pkgs.fetchurl { 
-    url = "https://git.JimbosFiles.com/Jimbo/NixOS-Config/raw/branch/main/Extras/Wallpapers/wallpaper1.png";
+    url = "${gitRepo}/raw/branch/main/Extras/Wallpapers/wallpaper1.png";
     sha256 = "1zxb0p0fjsmccy4xv8yk3c4kc313k3lc3xhqmiv452f7sjqqbp25";
   };
   wallpaper2 = pkgs.fetchurl { 
-    url = "https://git.JimbosFiles.com/Jimbo/NixOS-Config/raw/branch/main/Extras/Wallpapers/wallpaper2.png";
+    url = "${gitRepo}/raw/branch/main/Extras/Wallpapers/wallpaper2.png";
     sha256 = "13jcllrs05d26iz2isvh1f8fqf20m23sps32kw7qz5iav8nhvsx7";
   };
   wallpaper3 = pkgs.fetchurl { 
-    url = "https://git.JimbosFiles.com/Jimbo/NixOS-Config/raw/branch/main/Extras/Wallpapers/wallpaper3.png";
+    url = "${gitRepo}/raw/branch/main/Extras/Wallpapers/wallpaper3.png";
     sha256 = "16r65qnr7f0md4bbjnzq6av4dgmqr3avkilw72qdmyrmh3xj03yw";
   };
   lockpaper = pkgs.fetchurl { 
-    url = "https://git.JimbosFiles.com/Jimbo/NixOS-Config/raw/branch/main/Extras/Wallpapers/lockpaper.png";
+    url = "${gitRepo}/raw/branch/main/Extras/Wallpapers/lockpaper.png";
     sha256 = "1mqvp4bic46gc994fawkraqj76hxd11wdd43qakligchzd20xjd5";
   };
 
@@ -508,12 +511,6 @@ let
       search-start=Control+f
   '';
 
-  # Dashboard for my Debian server
-  serverDash = pkgs.writeScriptBin "serverdash" ''
-    ${terminalClass} serverdash ssh -p 2222 jimbo@server -t \
-    "tmux new-session -d -s control; tmux attach -t control"
-  '';
-
   # An Easyeffects equalizer profile that sounds good to me
   easyEffectsProfile = ''
     {
@@ -1563,7 +1560,7 @@ in
 	usbutils tcptrack mpc-cli ncmpcpp protonvpn-cli_2
 
 	# Scripts as global programs
-	serverDash beScripts makoToggle swayLock
+	beScripts makoToggle swayLock
 	screenShot alarmScript iommuCheck pFetch
 
         # Production tools
@@ -1641,7 +1638,7 @@ in
         '';
       in {
         enable = true;
-	package = pkgs.sway; # swayfx
+	package = pkgs.unstable.sway; # swayfx
         wrapperFeatures.gtk = true;
 	checkConfig = false;
 	config = {
@@ -1672,7 +1669,6 @@ in
 	    { command = "vesktop --ozone-platform-hint=auto"; }
 	    { command = "element-desktop"; }
 	    { command = "thunderbird"; }
-	    { command = "serverdash"; }
 	  ];
 
 	  # Use Waybar rather than Sway's
@@ -2053,7 +2049,6 @@ in
 	    # Else
 	    "${w2}" = [{ class = "SDL Application"; } { class = "heroic"; }];
 	    "${w2a}" = [{ app_id = "looking-glass-client"; }];
-	    "${w4}" = [{ app_id = "serverdash"; }];
 	    "${w4a}" = [{ app_id = "com.obsproject.Studio"; }];
 	  };
 	};
@@ -3028,7 +3023,7 @@ in
 	  copycat = "wl-copy <";
           sunshinehost = "WAYLAND_DISPLAY=wayland-1 DISPLAY=:1 sunshine -0";
 	  alarmlist = "cat ${alarmScript}/bin/alarms";
-          seneca=''ssh jhampton1@matrix.senecapolytechnic.ca'';
+          seneca = "ssh jhampton1@matrix.senecapolytechnic.ca";
 
           # Curl tools
           myip = "curl ifconfig.co";