| author |  Fish <77413091+JulianBarbera@users.noreply.github.com> 2025-09-30 21:54:01-07:00 |
| committer | Fish <77413091+JulianBarbera@users.noreply.github.com> 2025-09-30 21:54:01-07:00 |
| log | 3b80f030b5e98f38f37725c19088d862d8cbc6c1 |
| tree | d233f6603f0db412fdc91e804c705ea06172e38b |
| parent | 94fcf2aaa0ea020ce7c3b9b0589b5eb39a738f62 |
| parent | 7fd3f19d2b7d0c7ccd42d903f574ccfab32ac07d |
Merge branch 'main' of paperclover.dev:nix/config
6 files changed, 60 insertions(+), 25 deletions(-)
.gitignore+2-1
| ... | ... | @@ -1,4 +1,5 @@ |
| 1 | flake.lock | |
| 2 | 1 | .DS_STORE |
| 2 | .hostname | |
| 3 | flake.lock | |
| 3 | 4 | result |
| 4 | 5 | result-* |
flake.nix+6
| ... | ... | @@ -133,6 +133,12 @@ |
| 133 | 133 | host = "paperback"; |
| 134 | 134 | system = "aarch64-darwin"; |
| 135 | 135 | }; |
| 136 | # clover's work macbook pro | |
| 137 | darwinConfigurations.clover-work-mac = mkSystem "clover-work-mac" { | |
| 138 | user = "clover"; | |
| 139 | host = "work"; | |
| 140 | system = "aarch64-darwin"; | |
| 141 | }; | |
| 136 | 142 | |
| 137 | 143 | # fish's cattop |
| 138 | 144 | nixosConfigurations.cattop = mkSystem "cattop" { |
switch+16-5
| ... | ... | @@ -1,12 +1,23 @@ |
| 1 | 1 | #!/bin/sh |
| 2 | 2 | nh_subcommand="os" |
| 3 | 3 | fallback_command="nixos-rebuild" |
| 4 | if [ "$(uname -o)" = "darwin" ]; then | |
| 5 | nh_subcommand="darwin" | |
| 6 | fallback_command="nix run .#darwin-rebuild" | |
| 4 | hostname_file="$(dirname "$0")/.hostname" | |
| 5 | if [ -n "$1" ]; then | |
| 6 | hostname="$1" | |
| 7 | elif [ -f "$hostname_file" ]; then | |
| 8 | hostname=$(cat "$hostname_file") | |
| 9 | fi | |
| 10 | if [ -z "$hostname" ]; then | |
| 11 | hostname="$(hostname)" | |
| 12 | fi | |
| 13 | printf "%s" "$hostname" >"$hostname_file" | |
| 14 | if [ "$(uname -o)" = "Darwin" ]; then | |
| 15 | nh_subcommand="darwin" | |
| 16 | fallback_command="nix run .#darwin-rebuild" | |
| 17 | hostname="darwinConfigurations.$hostname" | |
| 7 | 18 | fi |
| 8 | 19 | if command -v nh >/dev/null; then |
| 9 | nh $nh_subcommand switch . | |
| 20 | nh $nh_subcommand switch '.#'"$hostname" | |
| 10 | 21 | else |
| 11 | $fallback_command -- switch --flake . | |
| 22 | $fallback_command -- switch --flake '.#'"$hostname" | |
| 12 | 23 | fi |
users/clover/home.nix+9-15
| ... | ... | @@ -10,9 +10,7 @@ in |
| 10 | 10 | let |
| 11 | 11 | # packages to always install |
| 12 | 12 | all = [ |
| 13 | (ffmpeg.override { | |
| 14 | withSvtav1 = true; | |
| 15 | }) | |
| 13 | ffmpeg-full | |
| 16 | 14 | ripgrep |
| 17 | 15 | uv |
| 18 | 16 | nh |
| ... | ... | @@ -22,6 +20,7 @@ in |
| 22 | 20 | desktop = [ |
| 23 | 21 | git-town |
| 24 | 22 | lazygit |
| 23 | jjui | |
| 25 | 24 | ]; |
| 26 | 25 | # packages to install on all servers |
| 27 | 26 | server = [ ]; |
| ... | ... | @@ -49,7 +48,7 @@ in |
| 49 | 48 | shader = "cursor-smear-black.glsl"; |
| 50 | 49 | package = null; |
| 51 | 50 | settings = { |
| 52 | theme = "light:farmhouse-light,dark:ChallengerDeep"; | |
| 51 | theme = "light:Farmhouse Light,dark:Challenger Deep"; | |
| 53 | 52 | font-family = "AT Name Mono"; |
| 54 | 53 | adjust-cursor-thickness = 1; |
| 55 | 54 | background-opacity = 0.9; |
| ... | ... | @@ -61,7 +60,7 @@ in |
| 61 | 60 | zsh = { |
| 62 | 61 | enable = true; |
| 63 | 62 | shellAliases = { |
| 64 | switch = "nh darwin switch ~/config"; | |
| 63 | switch = "~/config/switch"; | |
| 65 | 64 | gg = "lazygit"; |
| 66 | 65 | ga = "git add"; |
| 67 | 66 | g = "git status"; |
| ... | ... | @@ -147,7 +146,7 @@ in |
| 147 | 146 | }; |
| 148 | 147 | muted = "bright black"; |
| 149 | 148 | }; |
| 150 | ui.graph.style = "square"; | |
| 149 | # ui.graph.style = "square"; | |
| 151 | 150 | revsets = { |
| 152 | 151 | log = "ancestors(description(regex:\"^(WIP:|\\\\s*$)\"), 3) | ancestors(immutable_heads(), 2) | ancestors(visible_heads(), 2)"; |
| 153 | 152 | short-prefixes = "(trunk()..@)::"; |
| ... | ... | @@ -158,8 +157,10 @@ in |
| 158 | 157 | # log template, highlighting the WIP commits by making everything else faded out |
| 159 | 158 | "hl_wip(commit)" = '' |
| 160 | 159 | if(commit.root(), format_root_commit(commit), |
| 161 | format_short_commit_header(commit) ++ "\n" ++ | |
| 162 | format_commit_description(commit) | |
| 160 | label("__commit__", | |
| 161 | format_short_commit_header(commit) ++ "\n" ++ | |
| 162 | format_commit_description(commit) | |
| 163 | ) | |
| 163 | 164 | ) |
| 164 | 165 | ''; |
| 165 | 166 | |
| ... | ... | @@ -276,12 +277,5 @@ in |
| 276 | 277 | "nas.paperclover.net" = zenith; |
| 277 | 278 | }; |
| 278 | 279 | }; |
| 279 | neovide = { | |
| 280 | enable = !hostServer; | |
| 281 | settings = { | |
| 282 | font.normal = "AT Name Mono"; | |
| 283 | font.size = 13; | |
| 284 | }; | |
| 285 | }; | |
| 286 | 280 | }; |
| 287 | 281 | } |
users/clover/paperback/home.nix-4
| ... | ... | @@ -3,7 +3,6 @@ |
| 3 | 3 | # these programs are not globally installed to reduce distractions. |
| 4 | 4 | # most of these are needed for my work environment. |
| 5 | 5 | programs = { |
| 6 | bun.enable = true; | |
| 7 | 6 | zsh.profileExtra = '' |
| 8 | 7 | _bun() { |
| 9 | 8 | local context state line |
| ... | ... | @@ -12,7 +11,6 @@ |
| 12 | 11 | ''; |
| 13 | 12 | }; |
| 14 | 13 | home.packages = with pkgs; [ |
| 15 | doppler | |
| 16 | 14 | deno |
| 17 | 15 | nodejs_22 |
| 18 | 16 | rustup |
| ... | ... | @@ -22,7 +20,5 @@ |
| 22 | 20 | yt-dlp |
| 23 | 21 | spotdl |
| 24 | 22 | zig |
| 25 | ssm-session-manager-plugin | |
| 26 | awscli | |
| 27 | 23 | ]; |
| 28 | 24 | } |
users/clover/work/home.nix created+27
| ... | ... | @@ -0,0 +1,27 @@ |
| 1 | { pkgs, ... }: | |
| 2 | { | |
| 3 | programs = { | |
| 4 | zsh.profileExtra = '' | |
| 5 | _bun() { | |
| 6 | local context state line | |
| 7 | _arguments -C '*:file:_files' | |
| 8 | } | |
| 9 | ''; | |
| 10 | }; | |
| 11 | home.packages = with pkgs; [ | |
| 12 | (bun.overrideAttrs (_: rec { | |
| 13 | version = "1.1.17"; | |
| 14 | src = fetchurl { | |
| 15 | url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; | |
| 16 | hash = "sha256-aULgRZ9evcGUhKJ6slLJOg3IEzUeNfIkJF8RDP3YUlo="; | |
| 17 | }; | |
| 18 | })) | |
| 19 | doppler | |
| 20 | deno | |
| 21 | nodejs_24 | |
| 22 | rustup | |
| 23 | typescript | |
| 24 | ssm-session-manager-plugin | |
| 25 | awscli | |
| 26 | ]; | |
| 27 | } |