From 63782cad44d17cb9cca54bb8545d36c94dca7bfe Mon Sep 17 00:00:00 2001
From: shibedrill <shibedrill1@gmail.com>
Date: Sun, 4 Oct 2026 16:58:00 -0400
Subject: [PATCH] Fix SSH agent socket

---
 macbook/home-manager/home.nix   | 21 ++++++++++-----------
 macbook/nixos/configuration.nix | 27 ++++++++++++++++-----------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/macbook/home-manager/home.nix b/macbook/home-manager/home.nix
index 77ebd0a..6ab5098 100644
--- a/macbook/home-manager/home.nix
+++ b/macbook/home-manager/home.nix
@@ -34,22 +34,22 @@
     # (pkgs.writeShellScriptBin "my-hello" ''
     #   echo "Hello, ${config.home.username}!"
     # '')
-    rustup
     helix
     vscodium
     fish
-    bitwarden-desktop
     starship
     fastfetch
     file
-    virt-manager
-    vesktop
     gcc
     nil
     kdePackages.kcolorchooser
+    virt-manager
+    vesktop
     wireshark
+    direnv
     orca-slicer
-];
+    printrun
+  ];
 
   programs.chromium = {
     enable = true;
@@ -87,10 +87,6 @@
   #
   #  /etc/profiles/per-user/august/etc/profile.d/hm-session-vars.sh
   #
-  home.sessionVariables = {
-    # EDITOR = "emacs";
-    SSH_AUTH_SOCK = "/home/august/.bitwarden-ssh-agent.sock";
-  };
 
   home.sessionPath = [
     "/home/august/.cargo/bin"
@@ -116,7 +112,7 @@
   programs.git = {
     enable = true;
     signing = {
-      key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKOdWx2P1BpqO57ceOdYfhE+aL+D+/KrUqnt3Ohg7qg6 august@macbookpro";
+      key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKOdWx2P1BpqO57ceOdYfhE+aL+D+/KrUqnt3Ohg7qg6 august@bazzite";
       signByDefault = true;
     };
     settings = {
@@ -140,13 +136,16 @@
     };
   };
 
+  programs.direnv.enable = true;
+
   services.ssh-agent = {
     enable = true;
     socket = ".bitwarden-ssh-agent.sock";
   };
 
   systemd.user.tmpfiles.rules = [
-    "L /home/august/.bitwarden-ssh-agent.sock - - - - /run/user/1000/.bitwarden-ssh-agent.sock"
+    "L+ /home/august/.bitwarden-ssh-agent.sock - - - - /home/august/.var/app/com.bitwarden.desktop/data/.bitwarden-ssh-agent.sock"
+    "L+ /run/user/1000/.bitwarden-ssh-agent.sock - - - - /home/august/.var/app/com.bitwarden.desktop/data/.bitwarden-ssh-agent.sock"
   ];
 
 }
diff --git a/macbook/nixos/configuration.nix b/macbook/nixos/configuration.nix
index 837c30e..8bf05de 100644
--- a/macbook/nixos/configuration.nix
+++ b/macbook/nixos/configuration.nix
@@ -22,7 +22,7 @@
   boot.initrd.systemd.enable = true;
 
   # Use latest kernel.
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.kernelPackages = pkgs.linuxPackages_6_18;
 
   # Enable wl kernel driver.
   boot.kernelModules = ["wl"];
@@ -98,7 +98,7 @@
   users.users.august = {
     isNormalUser = true;
     description = "August";
-    extraGroups = [ "libvirtd" "networkmanager" "wheel" "wireshark" ];
+    extraGroups = [ "libvirtd" "networkmanager" "wheel" "wireshark" "dialout" ];
     packages = with pkgs; [
       kdePackages.kate
     #  thunderbird
@@ -113,16 +113,21 @@
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-    wget
-    podman-compose
-    distrobox
-    kdePackages.partitionmanager
-    kdePackages.plymouth-kcm
-    kdePackages.sddm-kcm
+  environment.systemPackages = [
+    pkgs.vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+    pkgs.wget
+    pkgs.podman-compose
+    pkgs.distrobox
+    pkgs.kdePackages.partitionmanager
+    pkgs.kdePackages.plymouth-kcm
+    pkgs.kdePackages.sddm-kcm
+    pkgs.kdePackages.qtstyleplugin-kvantum
+    pkgs.libsForQt5.qtstyleplugin-kvantum
+    pkgs.catppuccin-sddm
   ];
 
+  services.flatpak.enable = true;
+
   programs.wireshark.enable = true;
   programs.kdeconnect.enable = true;
 
@@ -146,7 +151,7 @@
   # networking.firewall.enable = false;
 
   nixpkgs.config.permittedInsecurePackages = [
-    "broadcom-sta-6.30.223.271-59-7.0.10"
+    "broadcom-sta-6.30.223.271-59-6.18.54"
   ];
 
   hardware.bluetooth = {