From 2326853c536c0d8cd5cf5dfd3a28a5894d266a64 Mon Sep 17 00:00:00 2001
From: Jimbo <jimjam4real@gmail.com>
Date: Wed, 21 Aug 2024 21:21:33 -0400
Subject: [PATCH] Make some changes and implement ddclient for cloudflare

---
 PC/configuration.nix | 28 +++++++++++-----------------
 PC/jimbo.nix         | 19 +++++++++----------
 2 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/PC/configuration.nix b/PC/configuration.nix
index 7bba7a5..7839555 100644
--- a/PC/configuration.nix
+++ b/PC/configuration.nix
@@ -17,9 +17,6 @@ let
     # Isolate devices into IOMMU groups
     "pcie_acs_override=downstream,multifunction"
     "pci=routeirq"
-
-    # Provide less context messages
-    "quiet"
   ];
 in
 
@@ -202,29 +199,22 @@ in
     #networkmanager.enable = true;
     #enableB43Firmware = true;
 
-    # Enable nftables over iptables
-    nftables.enable = true;
-
     # Enable firewall
     firewall = {
       allowPing = false;
       extraInputRules = ''
-        ip saddr 192.168.2.11 accept comment "Accept Server Connections"
+        ip saddr 10.0.0.2 accept comment "Accept Server Connections"
       '';
     };
     
+    # Enable nftables over iptables
+    nftables.enable = true;
+
     # Set hostnames
     hosts = {
-      "192.168.2.10" = [ "pc" ];
-      "192.168.2.11" = [ "server" ];
-      "172.16.0.2" = [ "vm" ];
+      "10.0.0.2" = [ "server" ];
+      "10.0.0.3" = [ "pc" ];
     };
-
-    # Set nameserver
-    nameservers = [ 
-      "9.9.9.9" 
-      "1.1.1.1"
-    ];
   };
 
   # Enable Bluetooth
@@ -271,6 +261,11 @@ in
     alsa.support32Bit = true;
     pulse.enable = true;
     #jack.enable = true;
+    wireplumber.configPackages = [
+      (pkgs.writeTextDir "share/wireplumber/wireplumber.conf.d/11-bluetooth-policy.conf" ''
+        wireplumber.settings = { bluetooth.autoswitch-to-headset-profile = false }
+      '')
+    ];
   };
 
   # Fonts
@@ -380,7 +375,6 @@ in
   # Enable SSH
   services.openssh = {
     enable = true;
-    openFirewall = false;
     settings = {
       LogLevel = "VERBOSE";
       PermitRootLogin = "no";
diff --git a/PC/jimbo.nix b/PC/jimbo.nix
index 7a9eeba..a75e1b5 100644
--- a/PC/jimbo.nix
+++ b/PC/jimbo.nix
@@ -84,7 +84,7 @@ let
       case $SCRATCHPADS in
         Gotop) foot -a gotop -T Gotop gotop;;
         Music) foot -a music -T Music ncmpcpp;;
-        Sound) foot -a sound -T Sound ncpamixer;;
+        Sound) foot -a sound -T Sound pulsemixer;;
         EasyEffects) easyeffects;;
       esac
     }
@@ -1100,7 +1100,7 @@ in
 
 	# Terminal programs
 	dua vimv p7zip fastfetch gotop pciutils usbutils
-	ncpamixer tcptrack mpc-cli protonvpn-cli_2
+	pulsemixer tcptrack mpc-cli protonvpn-cli_2
 
 	# Scripts as global programs
 	rofiScripts makoToggle swayLock screenShot pFetch
@@ -1192,7 +1192,7 @@ in
 	    # Scratchpads
 	    { command = "foot -a gotop -T Gotop gotop"; }
 	    { command = "foot -a music -T Music ncmpcpp"; }
-	    { command = "foot -a sound -T Sound ncpamixer"; }
+	    { command = "foot -a sound -T Sound pulsemixer"; }
 	    { command = "easyeffects"; }
 
 	    # Daemons and tray apps
@@ -1535,7 +1535,7 @@ in
 	    # Scratchpads
 	    "Ctrl+Shift+Escape" = ''[app_id="gotop"] scratchpad show, move position center, resize set 1216 888'';
 	    "${primeMod}+Shift+m" = ''[app_id="music"] scratchpad show, move position center, resize set 1006 657'';
-	    "${primeMod}+Shift+v" = ''[app_id="audio"] scratchpad show, move position center, resize set 1000 800'';
+	    "${primeMod}+Shift+v" = ''[app_id="sound"] scratchpad show, move position center, resize set 1000 800'';
 	    "${primeMod}+Shift+Backslash" = ''[app_id="com.github.wwmm.easyeffects"] scratchpad show, move position center, resize set 1000 800'';
 	  };
 	  window = {
@@ -1549,7 +1549,7 @@ in
 	      command = ''mark scratchpad''; }
 	      { criteria = { app_id = "music"; };
 	      command = ''mark scratchpad''; }
-	      { criteria = { app_id = "audio"; }; 
+	      { criteria = { app_id = "sound"; }; 
 	      command = ''mark scratchpad''; }
 	      { criteria = { app_id = "com.github.wwmm.easyeffects"; };
 	      command = ''mark scratchpad, opacity 0.9''; }
@@ -1574,13 +1574,12 @@ in
 	    # Browsers
 	    "${w1}" = [{ app_id = "JimBrowser"; }];
 	    "${w1a}" = [{ app_id = "SchoolBrowser"; }];
-	    "${w7}" = [{ app_id = "MiscBrowser"; }];
 	    
 	    # Communication
 	    "${w3a}" = [{ class = "zoom"; }];
-	    "${w8}" = [{ app_id = "vesktop"; }];
-	    "${w9}" = [{ class = "Element"; }];
-	    "${w7a}" = [{ app_id = "thunderbird"; }];
+	    "${w7}" = [{ app_id = "MiscBrowser"; } { app_id = "vesktop"; }];
+	    "${w8}" = [{ class = "Element"; }];
+	    "${w9}" = [{ app_id = "thunderbird"; }];
 
 	    # Else
 	    "${w2}" = [{ class = "SDL Application"; } { class = "heroic"; }];
@@ -2410,7 +2409,7 @@ in
         };
 	rifle = [
 	  # Text editing
-	  { condition = ''ext xml|json|jsonc|m3u|m3u8|csv|tex|py|pl|rb|js|sh|php|nix''; command = ''vim -- "$@"''; }
+	  { condition = ''ext xml|json|jsonc|m3u|m3u8|csv|tex|py|pl|rb|js|sh|php|md|nix''; command = ''vim -- "$@"''; }
 
 	  # Media
 	  { condition = ''mime ^image, has imv, X, flag f''; command = ''imv -- "$@"''; }