diff options
| author | Ryan Schanzenbacher <ryan@rschanz.org> | 2026-07-17 01:37:11 -0400 |
|---|---|---|
| committer | Ryan Schanzenbacher <ryan@rschanz.org> | 2026-07-17 01:37:11 -0400 |
| commit | 2bead7efb473f0202dc6ef189fbc0e4a5401d41f (patch) | |
| tree | 86d08a6b2980f4889054bc43500471b133450bf8 | |
| parent | a6ca159fc55d3e989eb9de85daa396c593bb0a00 (diff) | |
add virby and adjust yabai
| -rw-r--r-- | README.md | 7 | ||||
| -rw-r--r-- | flake.lock | 35 | ||||
| -rw-r--r-- | flake.nix | 3 | ||||
| -rw-r--r-- | hosts/RyanMac/configuration.nix | 21 |
4 files changed, 64 insertions, 2 deletions
diff --git a/README.md b/README.md new file mode 100644 index 0000000..25cd24e --- /dev/null +++ b/README.md | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | # Bootstrap | ||
| 2 | |||
| 3 | ``` | ||
| 4 | sudo nix run --extra-experimental-features "nix-command flakes" github:nix-darwin/nix-darwin -- switch --flake .#<hostname> \ | ||
| 5 | --option "extra-substituters" "https://virby-nix-darwin.cachix.org" \ | ||
| 6 | --option "extra-trusted-public-keys" "virby-nix-darwin.cachix.org-1:z9GiEZeBU5bEeoDQjyfHPMGPBaIQJOOvYOOjGMKIlLo=" | ||
| 7 | ``` | ||
| @@ -124,6 +124,22 @@ | |||
| 124 | "type": "github" | 124 | "type": "github" |
| 125 | } | 125 | } |
| 126 | }, | 126 | }, |
| 127 | "nixpkgs_2": { | ||
| 128 | "locked": { | ||
| 129 | "lastModified": 1782821651, | ||
| 130 | "narHash": "sha256-D5jO0ME1lA9bDHnd5kVawBwItG/N4oZr3FlXmMzLec8=", | ||
| 131 | "owner": "nixos", | ||
| 132 | "repo": "nixpkgs", | ||
| 133 | "rev": "e52c192be9d7b2c4bd4aed326c8731b35f8bb75c", | ||
| 134 | "type": "github" | ||
| 135 | }, | ||
| 136 | "original": { | ||
| 137 | "owner": "nixos", | ||
| 138 | "ref": "nixpkgs-unstable", | ||
| 139 | "repo": "nixpkgs", | ||
| 140 | "type": "github" | ||
| 141 | } | ||
| 142 | }, | ||
| 127 | "root": { | 143 | "root": { |
| 128 | "inputs": { | 144 | "inputs": { |
| 129 | "darwin": "darwin", | 145 | "darwin": "darwin", |
| @@ -132,9 +148,28 @@ | |||
| 132 | "homebrew-core": "homebrew-core", | 148 | "homebrew-core": "homebrew-core", |
| 133 | "nix-homebrew": "nix-homebrew", | 149 | "nix-homebrew": "nix-homebrew", |
| 134 | "nixpkgs": "nixpkgs", | 150 | "nixpkgs": "nixpkgs", |
| 151 | "virby": "virby", | ||
| 135 | "zen-browser": "zen-browser" | 152 | "zen-browser": "zen-browser" |
| 136 | } | 153 | } |
| 137 | }, | 154 | }, |
| 155 | "virby": { | ||
| 156 | "inputs": { | ||
| 157 | "nixpkgs": "nixpkgs_2" | ||
| 158 | }, | ||
| 159 | "locked": { | ||
| 160 | "lastModified": 1782970342, | ||
| 161 | "narHash": "sha256-5oVThXJjEFPiCTm6jzAmSCVRuDRi4AG3HgLLjpgLYXA=", | ||
| 162 | "owner": "quinneden", | ||
| 163 | "repo": "virby-nix-darwin", | ||
| 164 | "rev": "a52216470a97ef5970939acf697a00ec61beb0c6", | ||
| 165 | "type": "github" | ||
| 166 | }, | ||
| 167 | "original": { | ||
| 168 | "owner": "quinneden", | ||
| 169 | "repo": "virby-nix-darwin", | ||
| 170 | "type": "github" | ||
| 171 | } | ||
| 172 | }, | ||
| 138 | "zen-browser": { | 173 | "zen-browser": { |
| 139 | "inputs": { | 174 | "inputs": { |
| 140 | "home-manager": [ | 175 | "home-manager": [ |
| @@ -27,6 +27,8 @@ | |||
| 27 | url = "github:homebrew/homebrew-cask"; | 27 | url = "github:homebrew/homebrew-cask"; |
| 28 | flake = false; | 28 | flake = false; |
| 29 | }; | 29 | }; |
| 30 | # Linux builder on macos | ||
| 31 | virby.url = "github:quinneden/virby-nix-darwin"; | ||
| 30 | }; | 32 | }; |
| 31 | 33 | ||
| 32 | outputs = { nixpkgs, home-manager, ... }@inputs: { | 34 | outputs = { nixpkgs, home-manager, ... }@inputs: { |
| @@ -35,6 +37,7 @@ | |||
| 35 | specialArgs = { inherit inputs; }; | 37 | specialArgs = { inherit inputs; }; |
| 36 | modules = [ | 38 | modules = [ |
| 37 | { nixpkgs.config.allowUnfree = true; } | 39 | { nixpkgs.config.allowUnfree = true; } |
| 40 | inputs.virby.darwinModules.default | ||
| 38 | ./hosts/RyanMac/configuration.nix | 41 | ./hosts/RyanMac/configuration.nix |
| 39 | home-manager.darwinModules.home-manager | 42 | home-manager.darwinModules.home-manager |
| 40 | { | 43 | { |
diff --git a/hosts/RyanMac/configuration.nix b/hosts/RyanMac/configuration.nix index bb180dd..4383b15 100644 --- a/hosts/RyanMac/configuration.nix +++ b/hosts/RyanMac/configuration.nix | |||
| @@ -77,7 +77,7 @@ in { | |||
| 77 | bottom_padding = "10"; | 77 | bottom_padding = "10"; |
| 78 | left_padding = "10"; | 78 | left_padding = "10"; |
| 79 | right_padding = "10"; | 79 | right_padding = "10"; |
| 80 | window_gap = "5"; | 80 | window_gap = "10"; |
| 81 | mouse_modifier = "alt"; | 81 | mouse_modifier = "alt"; |
| 82 | mouse_drop_action = "swap"; | 82 | mouse_drop_action = "swap"; |
| 83 | mouse_action1 = "move"; | 83 | mouse_action1 = "move"; |
| @@ -124,11 +124,28 @@ in { | |||
| 124 | ../../files/CACerts/RyanCA.crt | 124 | ../../files/CACerts/RyanCA.crt |
| 125 | ]; | 125 | ]; |
| 126 | 126 | ||
| 127 | # Virby linux builder | ||
| 128 | services.virby = { | ||
| 129 | enable = true; | ||
| 130 | cores = 4; | ||
| 131 | diskSize = "50GiB"; | ||
| 132 | onDemand = { | ||
| 133 | enable = true; | ||
| 134 | ttl = 30; | ||
| 135 | }; | ||
| 136 | rosetta = true; | ||
| 137 | }; | ||
| 138 | |||
| 127 | nix = { | 139 | nix = { |
| 128 | enable = true; | 140 | enable = true; |
| 129 | settings = { | 141 | settings = { |
| 130 | flake-registry = "/etc/nix/flake-registry.json"; | 142 | flake-registry = "/etc/nix/flake-registry.json"; |
| 131 | trusted-users = [ "@admin" ]; | 143 | extra-substituters = [ |
| 144 | "https://virby-nix-darwin.cachix.org" | ||
| 145 | ]; | ||
| 146 | extra-trusted-public-keys = [ | ||
| 147 | "virby-nix-darwin.cachix.org-1:z9GiEZeBU5bEeoDQjyfHPMGPBaIQJOOvYOOjGMKIlLo=" | ||
| 148 | ]; | ||
| 132 | "extra-experimental-features" = [ "nix-command" "flakes" ]; | 149 | "extra-experimental-features" = [ "nix-command" "flakes" ]; |
| 133 | }; | 150 | }; |
| 134 | }; | 151 | }; |
