diff options
| -rw-r--r-- | flake.lock | 82 | ||||
| -rw-r--r-- | hosts/RyanMac/configuration.nix | 7 | ||||
| -rw-r--r-- | users/ryan/common.nix | 2 | ||||
| -rw-r--r-- | users/ryan/darwin.nix | 2 | ||||
| -rw-r--r-- | users/ryan/zen/zenPolicies.nix | 1 |
5 files changed, 22 insertions, 72 deletions
| @@ -17,26 +17,6 @@ | |||
| 17 | "type": "github" | 17 | "type": "github" |
| 18 | } | 18 | } |
| 19 | }, | 19 | }, |
| 20 | "clipboard-sync": { | ||
| 21 | "inputs": { | ||
| 22 | "nixpkgs": [ | ||
| 23 | "nixpkgs" | ||
| 24 | ] | ||
| 25 | }, | ||
| 26 | "locked": { | ||
| 27 | "lastModified": 1759253700, | ||
| 28 | "narHash": "sha256-pDsDzWEBaZlT9lHsBZMGm8aBJGncMxqerKwkzjEM/EI=", | ||
| 29 | "owner": "dnut", | ||
| 30 | "repo": "clipboard-sync", | ||
| 31 | "rev": "138a59b8f3044dd9e7dcccd9607bbbb48c14bae6", | ||
| 32 | "type": "github" | ||
| 33 | }, | ||
| 34 | "original": { | ||
| 35 | "owner": "dnut", | ||
| 36 | "repo": "clipboard-sync", | ||
| 37 | "type": "github" | ||
| 38 | } | ||
| 39 | }, | ||
| 40 | "darwin": { | 20 | "darwin": { |
| 41 | "inputs": { | 21 | "inputs": { |
| 42 | "nixpkgs": [ | 22 | "nixpkgs": [ |
| @@ -58,21 +38,6 @@ | |||
| 58 | "type": "github" | 38 | "type": "github" |
| 59 | } | 39 | } |
| 60 | }, | 40 | }, |
| 61 | "flake-utils": { | ||
| 62 | "locked": { | ||
| 63 | "lastModified": 1659877975, | ||
| 64 | "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", | ||
| 65 | "owner": "numtide", | ||
| 66 | "repo": "flake-utils", | ||
| 67 | "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", | ||
| 68 | "type": "github" | ||
| 69 | }, | ||
| 70 | "original": { | ||
| 71 | "owner": "numtide", | ||
| 72 | "repo": "flake-utils", | ||
| 73 | "type": "github" | ||
| 74 | } | ||
| 75 | }, | ||
| 76 | "home-manager": { | 41 | "home-manager": { |
| 77 | "inputs": { | 42 | "inputs": { |
| 78 | "nixpkgs": [ | 43 | "nixpkgs": [ |
| @@ -96,11 +61,11 @@ | |||
| 96 | "homebrew-cask": { | 61 | "homebrew-cask": { |
| 97 | "flake": false, | 62 | "flake": false, |
| 98 | "locked": { | 63 | "locked": { |
| 99 | "lastModified": 1785732563, | 64 | "lastModified": 1785635183, |
| 100 | "narHash": "sha256-g96wDRb5AZOFjmdMDWMHB/00N/cXAdqh3sB/TYJDwaU=", | 65 | "narHash": "sha256-m5oRXbzWWRmdr1hwfzRcK6vvvT5qiaDG3M4blTWdCRQ=", |
| 101 | "owner": "homebrew", | 66 | "owner": "homebrew", |
| 102 | "repo": "homebrew-cask", | 67 | "repo": "homebrew-cask", |
| 103 | "rev": "bee069693a0d8407ea8e2bd746a5109a6930a5d0", | 68 | "rev": "dae004070bf51388a7f9a5160ff5e7da78feeae5", |
| 104 | "type": "github" | 69 | "type": "github" |
| 105 | }, | 70 | }, |
| 106 | "original": { | 71 | "original": { |
| @@ -112,11 +77,11 @@ | |||
| 112 | "homebrew-core": { | 77 | "homebrew-core": { |
| 113 | "flake": false, | 78 | "flake": false, |
| 114 | "locked": { | 79 | "locked": { |
| 115 | "lastModified": 1785729508, | 80 | "lastModified": 1785632252, |
| 116 | "narHash": "sha256-u40Hmtr6mLTyydI+JKHCzyzIemIk8tYEZbaCe1OfvZA=", | 81 | "narHash": "sha256-cPRVTvfzohGsJqrytd6QSDn10O00q1NxMajK7pkqPbI=", |
| 117 | "owner": "homebrew", | 82 | "owner": "homebrew", |
| 118 | "repo": "homebrew-core", | 83 | "repo": "homebrew-core", |
| 119 | "rev": "5ec2eaf8b84b6f3bdc4872f74014c050bb4b439d", | 84 | "rev": "bb71705fd502d9d1b6b20be0febe5d4984077336", |
| 120 | "type": "github" | 85 | "type": "github" |
| 121 | }, | 86 | }, |
| 122 | "original": { | 87 | "original": { |
| @@ -195,34 +160,13 @@ | |||
| 195 | "type": "github" | 160 | "type": "github" |
| 196 | } | 161 | } |
| 197 | }, | 162 | }, |
| 198 | "nixgl": { | ||
| 199 | "inputs": { | ||
| 200 | "flake-utils": "flake-utils", | ||
| 201 | "nixpkgs": [ | ||
| 202 | "nixpkgs" | ||
| 203 | ] | ||
| 204 | }, | ||
| 205 | "locked": { | ||
| 206 | "lastModified": 1736159088, | ||
| 207 | "narHash": "sha256-WDBc35XdHCdmgVYbPOtd2IeUtUHCYwNyEpIr5vLZMng=", | ||
| 208 | "owner": "ryan77627", | ||
| 209 | "repo": "nixGL", | ||
| 210 | "rev": "3865170cbc23b32ec7cc8df1ec811fd44b6c2a58", | ||
| 211 | "type": "github" | ||
| 212 | }, | ||
| 213 | "original": { | ||
| 214 | "owner": "ryan77627", | ||
| 215 | "repo": "nixGL", | ||
| 216 | "type": "github" | ||
| 217 | } | ||
| 218 | }, | ||
| 219 | "nixpkgs": { | 163 | "nixpkgs": { |
| 220 | "locked": { | 164 | "locked": { |
| 221 | "lastModified": 1785602060, | 165 | "lastModified": 1785542685, |
| 222 | "narHash": "sha256-z7D96eESRM4CPV/XtwpwFn8IDdfLAmxz6lVWrGYXvR4=", | 166 | "narHash": "sha256-sjfvXMbG5pCFgpvw2OZAFcZiTvrppCWvnB6cuGrSY08=", |
| 223 | "owner": "nixos", | 167 | "owner": "nixos", |
| 224 | "repo": "nixpkgs", | 168 | "repo": "nixpkgs", |
| 225 | "rev": "a5cbcfe954791221bfffe2307f7d1a1bf61a871e", | 169 | "rev": "f8e81fc7eb063db454f563cdd596fb96a5ad1497", |
| 226 | "type": "github" | 170 | "type": "github" |
| 227 | }, | 171 | }, |
| 228 | "original": { | 172 | "original": { |
| @@ -250,7 +194,6 @@ | |||
| 250 | }, | 194 | }, |
| 251 | "root": { | 195 | "root": { |
| 252 | "inputs": { | 196 | "inputs": { |
| 253 | "clipboard-sync": "clipboard-sync", | ||
| 254 | "darwin": "darwin", | 197 | "darwin": "darwin", |
| 255 | "home-manager": "home-manager", | 198 | "home-manager": "home-manager", |
| 256 | "homebrew-cask": "homebrew-cask", | 199 | "homebrew-cask": "homebrew-cask", |
| @@ -259,7 +202,6 @@ | |||
| 259 | "homebrew-netbird": "homebrew-netbird", | 202 | "homebrew-netbird": "homebrew-netbird", |
| 260 | "netbird-tui": "netbird-tui", | 203 | "netbird-tui": "netbird-tui", |
| 261 | "nix-homebrew": "nix-homebrew", | 204 | "nix-homebrew": "nix-homebrew", |
| 262 | "nixgl": "nixgl", | ||
| 263 | "nixpkgs": "nixpkgs", | 205 | "nixpkgs": "nixpkgs", |
| 264 | "virby": "virby", | 206 | "virby": "virby", |
| 265 | "zen-browser": "zen-browser" | 207 | "zen-browser": "zen-browser" |
| @@ -293,11 +235,11 @@ | |||
| 293 | ] | 235 | ] |
| 294 | }, | 236 | }, |
| 295 | "locked": { | 237 | "locked": { |
| 296 | "lastModified": 1785652409, | 238 | "lastModified": 1785569296, |
| 297 | "narHash": "sha256-0273OvIPfkJcdv0+Z3iPL8+eSRavAwGRCnr+Y6tRjYY=", | 239 | "narHash": "sha256-ux2+60xcjl4LloKPevqrkP+uY4DNZXhzVd+TYrfE2+w=", |
| 298 | "owner": "0xc000022070", | 240 | "owner": "0xc000022070", |
| 299 | "repo": "zen-browser-flake", | 241 | "repo": "zen-browser-flake", |
| 300 | "rev": "12224626d0d1cead79603f19601666360c715379", | 242 | "rev": "945e834a12a97a5e3b08869960e35c7ccfde6f69", |
| 301 | "type": "github" | 243 | "type": "github" |
| 302 | }, | 244 | }, |
| 303 | "original": { | 245 | "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 { | |||
| 179 | enable = true; | 179 | enable = true; |
| 180 | 180 | ||
| 181 | onActivation = { | 181 | onActivation = { |
| 182 | cleanup = "zap"; | 182 | #extraFlags = [ "--force-cleanup" ]; |
| 183 | }; | 183 | }; |
| 184 | 184 | ||
| 185 | global.brewfile = true; | 185 | global.brewfile = true; |
| @@ -197,6 +197,9 @@ in { | |||
| 197 | "netbird-ui" | 197 | "netbird-ui" |
| 198 | "ubersicht" | 198 | "ubersicht" |
| 199 | "hammerspoon" | 199 | "hammerspoon" |
| 200 | "gimp" | ||
| 201 | "kdenlive" | ||
| 202 | "rustdesk" | ||
| 200 | ]; | 203 | ]; |
| 201 | }; | 204 | }; |
| 202 | 205 | ||
| @@ -419,7 +422,7 @@ in { | |||
| 419 | 422 | ||
| 420 | # this is fragile so it goes at the bottom | 423 | # this is fragile so it goes at the bottom |
| 421 | echo "Reloading skhd..." | 424 | echo "Reloading skhd..." |
| 422 | sudo -iu ${username} ${pkgs.skhd}/bin/skhd -r | 425 | sudo -iu ${username} ${pkgs.skhd}/bin/skhd -r || echo "Failed to reload skhd; continuing anyway..." |
| 423 | 426 | ||
| 424 | # 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 | 427 | # 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 |
| 425 | MARK="/opt/.nix-complete" | 428 | 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 @@ | |||
| 139 | shellAliases = { | 139 | shellAliases = { |
| 140 | cat = "bat --paging=never"; | 140 | cat = "bat --paging=never"; |
| 141 | diff = "delta"; | 141 | diff = "delta"; |
| 142 | brew = "env -u XDG_CONFIG_HOME brew"; | ||
| 142 | # Merged from guix-dotfiles' bash aliases (home-bash-service-type) - | 143 | # Merged from guix-dotfiles' bash aliases (home-bash-service-type) - |
| 143 | # bash is being retired there in favor of this zsh config. `ls`/`spt`/ | 144 | # bash is being retired there in favor of this zsh config. `ls`/`spt`/ |
| 144 | # `python` are Linux-only (BSD ls on darwin doesn't take --color/-p, | 145 | # `python` are Linux-only (BSD ls on darwin doesn't take --color/-p, |
| @@ -164,6 +165,7 @@ | |||
| 164 | kubectl | 165 | kubectl |
| 165 | talhelper | 166 | talhelper |
| 166 | talosctl | 167 | talosctl |
| 168 | prismlauncher | ||
| 167 | ]; | 169 | ]; |
| 168 | 170 | ||
| 169 | xdg.configFile."aerc" = { | 171 | 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 @@ | |||
| 26 | # Add hammerspoon | 26 | # Add hammerspoon |
| 27 | home.file.".hammerspoon".source = ./hammerspoon; | 27 | home.file.".hammerspoon".source = ./hammerspoon; |
| 28 | 28 | ||
| 29 | home.file.".config/homebrew".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.homebrew"; | ||
| 30 | |||
| 29 | home.packages = with pkgs; [ | 31 | home.packages = with pkgs; [ |
| 30 | bat | 32 | bat |
| 31 | pass | 33 | 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 | |||
| 117 | "xpinstall.whitelist.required" = lock-true; | 117 | "xpinstall.whitelist.required" = lock-true; |
| 118 | "dom.webgpu.enabled" = lock-true; | 118 | "dom.webgpu.enabled" = lock-true; |
| 119 | "media.eme.enabled" = lock-true; | 119 | "media.eme.enabled" = lock-true; |
| 120 | "ui.preferReducedMotion" = lock-false; | ||
| 120 | "general.autoScroll" = lock-true; | 121 | "general.autoScroll" = lock-true; |
| 121 | "general.smoothScroll" = lock-true; | 122 | "general.smoothScroll" = lock-true; |
| 122 | "browser.crashReports.unsubmittedCheck.autoSubmit2" = lock-false; | 123 | "browser.crashReports.unsubmittedCheck.autoSubmit2" = lock-false; |
