diff --git a/frame12/modules/niri/niri_conf.nix b/frame12/modules/niri/niri_conf.nix
index 5a7c859..7e685a1 100755
--- a/frame12/modules/niri/niri_conf.nix
+++ b/frame12/modules/niri/niri_conf.nix
@@ -105,7 +105,6 @@
           enable = true;
           terminal = "ghostty";
         };
-        programs.file-roller.enable = true;
         programs.xfconf.enable = true;
 
         services.syncthing = {
diff --git a/nate-work/dotfiles/sway/config.d/autostart_applications b/nate-work/dotfiles/sway/config.d/autostart_applications
index 1e35c37..cd4d799 100644
--- a/nate-work/dotfiles/sway/config.d/autostart_applications
+++ b/nate-work/dotfiles/sway/config.d/autostart_applications
@@ -16,7 +16,6 @@ exec hash dbus-update-activation-environment 2>/dev/null && \
 # exec python3 ~/.config/sway/scripts/swayfader.py      
 
 # gpu controller
-exec corectrl
 
 exec keepassxc
 exec kdeconnect-indicator
diff --git a/nate-work/modules/home-manager/home.nix b/nate-work/modules/home-manager/home.nix
index 941f879..90f81ac 100644
--- a/nate-work/modules/home-manager/home.nix
+++ b/nate-work/modules/home-manager/home.nix
@@ -187,7 +187,6 @@
           };
         };
       };
-
   };
   # Better git diffs with delta
   programs.delta = {
diff --git a/nate-work/modules/hypr/hyprland.nix b/nate-work/modules/hypr/hyprland.nix
index c75c3af..d34c47b 100644
--- a/nate-work/modules/hypr/hyprland.nix
+++ b/nate-work/modules/hypr/hyprland.nix
@@ -115,7 +115,6 @@ in
     #         thunar-volman
     #     ];
     # };
-    # programs.file-roller.enable = true;
     # For nautilus
     services.gnome.sushi.enable = true;
     programs.nautilus-open-any-terminal = {
diff --git a/nate-work/modules/sway/sway_conf.nix b/nate-work/modules/sway/sway_conf.nix
index ec788fe..068d8f2 100644
--- a/nate-work/modules/sway/sway_conf.nix
+++ b/nate-work/modules/sway/sway_conf.nix
@@ -102,7 +102,6 @@
                 thunar-volman
             ];
         };
-        programs.file-roller.enable = true;
         programs.xfconf.enable = true;
 
         programs.zsh.enable = true;
@@ -112,7 +111,7 @@
         programs.adb.enable = true;
         # programs.kdeconnect.enable = true;
         # service file to start the sshAgent
-        programs.ssh.startAgent = true;
+        programs.ssh.startAgent = false; # using gnome keyring
 
         ###
         ##  Services
diff --git a/nate/modules/home-manager/home.nix b/nate/modules/home-manager/home.nix
index d3ddb65..62be0ca 100644
--- a/nate/modules/home-manager/home.nix
+++ b/nate/modules/home-manager/home.nix
@@ -70,6 +70,7 @@
     # android-udev-rules
     # android-tools
     # sdkmanager
+    unstable.opencode
     unstable.claude-code
 
     #
@@ -97,6 +98,7 @@
     # Photo / Video
     #
     unstable.davinci-resolve-studio
+    obs-studio
     # davinciDesktop
     imv
     mpv
@@ -124,13 +126,6 @@
     recursive
   ];
 
-  # Home Manager is pretty good at managing dotfiles. The primary way to manage
-  # plain files is through 'home.file'.
-  # home.file."${config.xdg.configHome}" = {
-  #   source = ../../dotfiles;
-  #   recursive = true;
-  # };
-
   home.file = lib.mkMerge [
     # Shared dotfiles
     (let
@@ -182,18 +177,17 @@
     };
   };
 
-  # For applying custom styles
-  # home.file.".mozilla/firefox/default" = {
-  #   source = ../../misc/firefox_styles;
-  #   recursive = true;
-  # };
-  # location where stylus data is kept
-  # /home/nate/.mozilla/firefox/default/storage/default/moz-extension+++77a1d59f-183c-4439-b249-fdae98b7bd7b/idb
   services.kdeconnect = {
     enable = true;
     indicator = true;
   };
 
+  # enable saving ssh secrets (needed for go mod installing private packages)
+  services.gnome-keyring.enable = true;
+  services.gnome-keyring.components = [ "ssh" "secrets" ];
+  # Enable bluetooth headphone controls
+  services.mpris-proxy.enable = true;
+
   home.sessionVariables = {
     # MANPAGER="sh -c 'col -bx | bat -l man -p'";
     BAT_THEME="Catppuccin Macchiato";
@@ -205,35 +199,46 @@
   # Git setup
   programs.git = {
       enable = true;
-      userEmail = email;
-      userName = fullName;
-      extraConfig = {
-        include = { path = "${config.xdg.configHome}/macchiato.gitconfig"; };
+      settings = {
+        user.name = fullName;
+        user.email = email;
         init = { defaultBranch = "main"; };
-        pull = { ff = "only"; };
         merge = { conflictStyle="zdiff3"; };
+        pull = { ff = "only"; };
         push = { autoSetupRemote="true"; };
-        delta = { features = "Catppuccin Macchiato"; };
+        # Vasion rewrite rule
+        url = {
+          "git@github.com:" = {
+            insteadOf = "https://github.com/";
+          };
+        };
       };
-      delta.enable = true;
   };
-
+  # Better git diffs with delta
+  programs.delta = {
+    enable = true;
+    enableGitIntegration = true;
+    options = {
+      side-by-side = true;
+      hyperlinks = true;
+    };
+  };
+  # direnv for auto nix flake shells 
   programs = {
     direnv = {
       enable = true;
-      enableZshIntegration = true; # see note on other shells below
+      enableZshIntegration = true;
       nix-direnv.enable = true;
     };
 
-    bash.enable = true; # see note on other shells below
+    bash.enable = true;
   };
-
   # Zsh setup
   programs.zsh = {
       enable = true;
       oh-my-zsh = {
           enable = true;
-          plugins = [ "git" "ssh-agent" ];
+          plugins = [ "git" ];
           theme = "half-life";
           extraConfig =
           ''
@@ -241,6 +246,9 @@
           '';
       };
       initContent = ''
+          # integrate ssh-agent from gnome keyring
+          export SSH_AUTH_SOCK=/run/user/$UID/gcr/ssh
+
           eval "$(direnv hook zsh)"
 
           yt-audio() {
diff --git a/nate/modules/sway/sway_conf.nix b/nate/modules/sway/sway_conf.nix
index 74e13a9..78908a7 100644
--- a/nate/modules/sway/sway_conf.nix
+++ b/nate/modules/sway/sway_conf.nix
@@ -101,7 +101,6 @@
           enable = true;
           terminal = "foot";
         };
-        programs.file-roller.enable = true;
         programs.xfconf.enable = true;
 
         programs.zsh.enable = true;
@@ -120,15 +119,11 @@
                 };
             };
         };
-        programs.corectrl = {
-            enable = true;
-            gpuOverclock.enable = true;
-        };
 
         programs.adb.enable = true;
         # programs.kdeconnect.enable = true;
         # service file to start the sshAgent
-        programs.ssh.startAgent = true;
+        programs.ssh.startAgent = false; # using gnome keyring
 
         ###
         ##  Services
diff --git a/nate/modules/user/main_user.nix b/nate/modules/user/main_user.nix
index 1d56dae..ccdaa43 100644
--- a/nate/modules/user/main_user.nix
+++ b/nate/modules/user/main_user.nix
@@ -41,7 +41,6 @@ in
                     "adbusers"
                     "audio"
                     cfg.userName
-                    "corectrl"
                     "dialout"
                     "docker"
                     "networkmanager"
diff --git a/scrappy/desktop-configuration.nix b/scrappy/desktop-configuration.nix
index cff2e34..130230c 100644
--- a/scrappy/desktop-configuration.nix
+++ b/scrappy/desktop-configuration.nix
@@ -148,7 +148,6 @@ in
             thunar-volman
         ];
     };
-    programs.file-roller.enable = true;
     programs.xfconf.enable = true;
     # sound.enable = false;
     # services.xserver = {
diff --git a/scrappy/modules/home-manager/home.nix b/scrappy/modules/home-manager/home.nix
index 78d8256..e4a8326 100644
--- a/scrappy/modules/home-manager/home.nix
+++ b/scrappy/modules/home-manager/home.nix
@@ -191,7 +191,6 @@
     ### ---
 
     # nur.repos.crazazy.js.eslint
-    # inputs.nixpkgs-stable.legacyPackages.x86_64-linux.corectrl
     chromium
     #
     # Dev Tools
diff --git a/scrappy/modules/niri/niri_conf.nix b/scrappy/modules/niri/niri_conf.nix
index 27bb01b..c5e2e01 100644
--- a/scrappy/modules/niri/niri_conf.nix
+++ b/scrappy/modules/niri/niri_conf.nix
@@ -98,7 +98,6 @@
                 thunar-volman
             ];
         };
-        programs.file-roller.enable = true;
         programs.xfconf.enable = true;
 
         programs.zsh.enable = true;
diff --git a/scrappy/modules/sway/sway_conf.nix b/scrappy/modules/sway/sway_conf.nix
index cddb93b..69da78e 100644
--- a/scrappy/modules/sway/sway_conf.nix
+++ b/scrappy/modules/sway/sway_conf.nix
@@ -102,7 +102,6 @@
                 thunar-volman
             ];
         };
-        programs.file-roller.enable = true;
         programs.xfconf.enable = true;
 
         programs.zsh.enable = true;
diff --git a/shared/modules/user/main_user.nix b/shared/modules/user/main_user.nix
index 830f8c2..099cf8a 100644
--- a/shared/modules/user/main_user.nix
+++ b/shared/modules/user/main_user.nix
@@ -40,7 +40,6 @@ in
                 extraGroups = [
                     "wheel"
                     "networkmanager"
-                    "corectrl"
                     cfg.userName
                     "video"
                     "audio"