From 75c4ad23834f527bc62f488ff09defcb413de6bb Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Fri, 27 Sep 2024 10:28:57 -0400
Subject: [PATCH] update things

---
 etcnixos/common.nix           | 2 ++
 etcnixos/flake.lock           | 6 +++---
 home-manager/progs/borg.nix   | 1 -
 home-manager/progs/fish.nix   | 2 ++
 home-manager/system-nixos.nix | 2 ++
 justfile                      | 4 ++--
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/etcnixos/common.nix b/etcnixos/common.nix
index f555fdb..29ecf53 100644
--- a/etcnixos/common.nix
+++ b/etcnixos/common.nix
@@ -190,6 +190,8 @@
     dmidecode
 
     (inputs.agenix.packages.${pkgs.system}.default.override { ageBin = "${pkgs.rage}/bin/rage"; })
+
+    doas-sudo-shim
   ];
 
   #wayland with electron/chromium applications
diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock
index c371580..15b4c18 100644
--- a/etcnixos/flake.lock
+++ b/etcnixos/flake.lock
@@ -316,11 +316,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1727040444,
-        "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=",
+        "lastModified": 1727437159,
+        "narHash": "sha256-v4qLwEw5OmprgQZTT7KZMNU7JjXJzRypw8+Cw6++fWk=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac",
+        "rev": "d830ad47cc992b4a46b342bbc79694cbd0e980b2",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/progs/borg.nix b/home-manager/progs/borg.nix
index b928cd3..a5fce86 100644
--- a/home-manager/progs/borg.nix
+++ b/home-manager/progs/borg.nix
@@ -14,7 +14,6 @@
             ".wallpaper.png"
             ".ssh"
 
-            "dotfiles"
             "Documents"
             "projects"
             "Pictures"
diff --git a/home-manager/progs/fish.nix b/home-manager/progs/fish.nix
index 25e6ac0..f7a809a 100644
--- a/home-manager/progs/fish.nix
+++ b/home-manager/progs/fish.nix
@@ -44,6 +44,8 @@ in
     #aliases for (I think) macos commands
     pbcopy = "${pkgs.wl-clipboard}/bin/wl-copy";
     pbpaste = "${pkgs.wl-clipboard}/bin/wl-paste";
+
+    nix-cleanup = "doas nix-collect-garbage --delete-older-than 1d && doas nix-store --optimise && doas nix-store --gc";
   };
 
   shellInit = ''
diff --git a/home-manager/system-nixos.nix b/home-manager/system-nixos.nix
index 1435381..4c0cb8c 100644
--- a/home-manager/system-nixos.nix
+++ b/home-manager/system-nixos.nix
@@ -11,6 +11,8 @@
   nixpkgs.overlays = [
     # Add a protontricks-beta package so we can use protontricks with latest steam beta
     # https://github.com/Matoking/protontricks/issues/304#issuecomment-2280920826
+
+    # nixpkgs update: https://github.com/NixOS/nixpkgs/pull/343068
     (
       final: prev:
       let
diff --git a/justfile b/justfile
index 8db2e74..a52d954 100644
--- a/justfile
+++ b/justfile
@@ -16,6 +16,6 @@ home_update:
     home-manager switch --impure
 
 sync_configs: format_home format_system
-    rsync -a --delete /etc/nixos/ ~/projects/configs/dotfiles/nix/etcnixos/
-    rsync -a --delete ~/.config/home-manager/ ~/projects/configs/dotfiles/nix/home-manager/
+    rsync -a --delete /etc/nixos/ ~/projects/configs/dotfiles/etcnixos/
+    rsync -a --delete ~/.config/home-manager/ ~/projects/configs/dotfiles/home-manager/