temp

5 files changed, 22 insertions, 72 deletions

diff --git a/flake.lock b/flake.lock
index 5c684b1..c225dc2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,26 +17,6 @@
         "type": "github"
       }
     },
-    "clipboard-sync": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1759253700,
-        "narHash": "sha256-pDsDzWEBaZlT9lHsBZMGm8aBJGncMxqerKwkzjEM/EI=",
-        "owner": "dnut",
-        "repo": "clipboard-sync",
-        "rev": "138a59b8f3044dd9e7dcccd9607bbbb48c14bae6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "dnut",
-        "repo": "clipboard-sync",
-        "type": "github"
-      }
-    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -58,21 +38,6 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -96,11 +61,11 @@
     "homebrew-cask": {
       "flake": false,
       "locked": {
-        "lastModified": 1785732563,
-        "narHash": "sha256-g96wDRb5AZOFjmdMDWMHB/00N/cXAdqh3sB/TYJDwaU=",
+        "lastModified": 1785635183,
+        "narHash": "sha256-m5oRXbzWWRmdr1hwfzRcK6vvvT5qiaDG3M4blTWdCRQ=",
         "owner": "homebrew",
         "repo": "homebrew-cask",
-        "rev": "bee069693a0d8407ea8e2bd746a5109a6930a5d0",
+        "rev": "dae004070bf51388a7f9a5160ff5e7da78feeae5",
         "type": "github"
       },
       "original": {
@@ -112,11 +77,11 @@
     "homebrew-core": {
       "flake": false,
       "locked": {
-        "lastModified": 1785729508,
-        "narHash": "sha256-u40Hmtr6mLTyydI+JKHCzyzIemIk8tYEZbaCe1OfvZA=",
+        "lastModified": 1785632252,
+        "narHash": "sha256-cPRVTvfzohGsJqrytd6QSDn10O00q1NxMajK7pkqPbI=",
         "owner": "homebrew",
         "repo": "homebrew-core",
-        "rev": "5ec2eaf8b84b6f3bdc4872f74014c050bb4b439d",
+        "rev": "bb71705fd502d9d1b6b20be0febe5d4984077336",
         "type": "github"
       },
       "original": {
@@ -195,34 +160,13 @@
         "type": "github"
       }
     },
-    "nixgl": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1736159088,
-        "narHash": "sha256-WDBc35XdHCdmgVYbPOtd2IeUtUHCYwNyEpIr5vLZMng=",
-        "owner": "ryan77627",
-        "repo": "nixGL",
-        "rev": "3865170cbc23b32ec7cc8df1ec811fd44b6c2a58",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ryan77627",
-        "repo": "nixGL",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1785602060,
-        "narHash": "sha256-z7D96eESRM4CPV/XtwpwFn8IDdfLAmxz6lVWrGYXvR4=",
+        "lastModified": 1785542685,
+        "narHash": "sha256-sjfvXMbG5pCFgpvw2OZAFcZiTvrppCWvnB6cuGrSY08=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a5cbcfe954791221bfffe2307f7d1a1bf61a871e",
+        "rev": "f8e81fc7eb063db454f563cdd596fb96a5ad1497",
         "type": "github"
       },
       "original": {
@@ -250,7 +194,6 @@
     },
     "root": {
       "inputs": {
-        "clipboard-sync": "clipboard-sync",
         "darwin": "darwin",
         "home-manager": "home-manager",
         "homebrew-cask": "homebrew-cask",
@@ -259,7 +202,6 @@
         "homebrew-netbird": "homebrew-netbird",
         "netbird-tui": "netbird-tui",
         "nix-homebrew": "nix-homebrew",
-        "nixgl": "nixgl",
         "nixpkgs": "nixpkgs",
         "virby": "virby",
         "zen-browser": "zen-browser"
@@ -293,11 +235,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1785652409,
-        "narHash": "sha256-0273OvIPfkJcdv0+Z3iPL8+eSRavAwGRCnr+Y6tRjYY=",
+        "lastModified": 1785569296,
+        "narHash": "sha256-ux2+60xcjl4LloKPevqrkP+uY4DNZXhzVd+TYrfE2+w=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "12224626d0d1cead79603f19601666360c715379",
+        "rev": "945e834a12a97a5e3b08869960e35c7ccfde6f69",
         "type": "github"
       },
       "original": {
diff --git a/hosts/RyanMac/configuration.nix b/hosts/RyanMac/configuration.nix
index e19490d..e8339e6 100644
--- a/hosts/RyanMac/configuration.nix
+++ b/hosts/RyanMac/configuration.nix
@@ -179,7 +179,7 @@ in {
     enable = true;
 
     onActivation = {
-      cleanup = "zap";
+      #extraFlags = [ "--force-cleanup" ];
     };
 
     global.brewfile = true;
@@ -197,6 +197,9 @@ in {
       "netbird-ui"
       "ubersicht"
       "hammerspoon"
+      "gimp"
+      "kdenlive"
+      "rustdesk"
     ];
   };
 
@@ -419,7 +422,7 @@ in {
 
     # this is fragile so it goes at the bottom
     echo "Reloading skhd..."
-    sudo -iu ${username} ${pkgs.skhd}/bin/skhd -r
+    sudo -iu ${username} ${pkgs.skhd}/bin/skhd -r || echo "Failed to reload skhd; continuing anyway..."
 
     # Notes if we are running for the first time and writes a message for actions that may need to be done on macOS or linux
     MARK="/opt/.nix-complete"
diff --git a/users/ryan/common.nix b/users/ryan/common.nix
index 2e7505f..4f692a2 100644
--- a/users/ryan/common.nix
+++ b/users/ryan/common.nix
@@ -139,6 +139,7 @@
     shellAliases = {
       cat = "bat --paging=never";
       diff = "delta";
+      brew = "env -u XDG_CONFIG_HOME brew";
       # Merged from guix-dotfiles' bash aliases (home-bash-service-type) -
       # bash is being retired there in favor of this zsh config. `ls`/`spt`/
       # `python` are Linux-only (BSD ls on darwin doesn't take --color/-p,
@@ -164,6 +165,7 @@
     kubectl
     talhelper
     talosctl
+    prismlauncher
   ];
 
   xdg.configFile."aerc" = {
diff --git a/users/ryan/darwin.nix b/users/ryan/darwin.nix
index 72467ee..9dd6576 100644
--- a/users/ryan/darwin.nix
+++ b/users/ryan/darwin.nix
@@ -26,6 +26,8 @@
   # Add hammerspoon
   home.file.".hammerspoon".source = ./hammerspoon;
 
+  home.file.".config/homebrew".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.homebrew";
+
   home.packages = with pkgs; [
     bat
     pass
diff --git a/users/ryan/zen/zenPolicies.nix b/users/ryan/zen/zenPolicies.nix
index 1fbb5e1..8d39689 100644
--- a/users/ryan/zen/zenPolicies.nix
+++ b/users/ryan/zen/zenPolicies.nix
@@ -117,6 +117,7 @@ in
         "xpinstall.whitelist.required" = lock-true;
         "dom.webgpu.enabled" = lock-true;
         "media.eme.enabled" = lock-true;
+        "ui.preferReducedMotion" = lock-false;
         "general.autoScroll" = lock-true;
         "general.smoothScroll" = lock-true;
         "browser.crashReports.unsubmittedCheck.autoSubmit2" = lock-false;