diff options
| -rw-r--r-- | .envrc | 2 | ||||
| -rw-r--r-- | npins/sources.json | 4 | ||||
| -rw-r--r-- | system/linde.nix | 52 | ||||
| -rw-r--r-- | user/settings/git.nix | 58 | ||||
| -rw-r--r-- | user/settings/workstation.nix | 44 |
5 files changed, 52 insertions, 108 deletions
diff --git a/.envrc b/.envrc index 8b202a81..709f62c7 100644 --- a/.envrc +++ b/.envrc @@ -1,3 +1,3 @@ +watch_file npins/sources.json use nix PATH_add bin -watch_file npins/sources.json diff --git a/npins/sources.json b/npins/sources.json index ff2a24ff..8a0a59cd 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -112,9 +112,9 @@ "url": "https://git.alanpearce.eu/searchix" }, "branch": "main", - "revision": "e8fbdf3bd12c8920a6e9bd84b34e787764b11eaf", + "revision": "9c9aa6b408812248c9f8c29ecc3546ef64947ea8", "url": null, - "hash": "02x3xmabdzhl3192c0vicz8fbd14g1wcjcj1q0m6wc89faxh013b" + "hash": "049whjyq25v1x9nskzknnfqgd79xv3pxvr2vgrd7s2wl1bdxlj6b" }, "srvos": { "type": "Git", diff --git a/system/linde.nix b/system/linde.nix index 31aa5766..ed45d774 100644 --- a/system/linde.nix +++ b/system/linde.nix @@ -480,7 +480,7 @@ in }; acceptTerms = true; certs."alanpearce.eu" = { - extraDomainNames = [ "*.alanpearce.eu" "*.linde.alanpearce.eu" ]; + domain = "*.alanpearce.eu"; }; certs."stats.alanpearce.eu" = { extraDomainNames = [ "*.stats.alanpearce.eu" ]; @@ -509,19 +509,6 @@ in "http://" = { # Needed for HTTP->HTTPS servers }; - "alanpearce.eu" = { - serverAliases = [ - "www.alanpearce.eu" - "alanpearce.uk" - "www.alanpearce.uk" - "aln.pe" - "test.alanpearce.eu" - ]; - useACMEHost = "alanpearce.eu"; - extraConfig = '' - reverse_proxy http://localhost:8080 - ''; - }; "${hostname}.alanpearce.eu" = { serverAliases = [ "https://" ]; useACMEHost = "alanpearce.eu"; @@ -547,20 +534,6 @@ in reverse_proxy http://${config.services.dex.settings.web.http} ''; }; - "dns.alanpearce.eu" = { - useACMEHost = "alanpearce.eu"; - extraConfig = '' - log { - output discard - } - encode zstd gzip - reverse_proxy localhost:443 { - transport http { - tls_server_name dns.alanpearce.eu - } - } - ''; - }; "files.alanpearce.eu" = { useACMEHost = "alanpearce.eu"; extraConfig = '' @@ -583,7 +556,6 @@ in }; "searchix.alanpearce.eu" = { useACMEHost = "alanpearce.eu"; - serverAliases = [ "searchix.linde.alanpearce.eu" ]; extraConfig = '' reverse_proxy localhost:${toString config.services.searchix.settings.web.port} { health_uri /health @@ -1041,28 +1013,6 @@ in enable = true; }; }; - virtualisation.oci-containers = { - containers.website = { - image = "ko.local/server:latest"; - ports = [ - "8080:8080" - "8443:8443" - ]; - volumes = [ - "data:/data" - ]; - environmentFiles = [ - config.age.secrets.powerdns.path - ]; - environment = { - SERVER_LISTEN_ADDRESS = "::"; - SERVER_TLS = "false"; - WEBSITE_SOURCE = "/data/website"; - WEBSITE_DESTINATION = "/data/public"; - WEBSITE_REMOTE_VCS_URL = "https://git.alanpearce.eu/website"; - }; - }; - }; fileSystems."/srv/transmission" = { device = "//u439959-sub4.your-storagebox.de/u439959-sub4"; diff --git a/user/settings/git.nix b/user/settings/git.nix index ae5947d5..d2721db4 100644 --- a/user/settings/git.nix +++ b/user/settings/git.nix @@ -1,26 +1,11 @@ { config , pkgs , ... -}: -let - name = "Alan Pearce"; - email = "alan@alanpearce.eu"; -in -{ +}: { programs.git = { enable = true; - userName = name; - userEmail = email; - delta = { - enable = false; - options = { - navigate = true; - light = true; - }; - }; - difftastic = { - enable = true; - }; + userName = "Alan Pearce"; + userEmail = "alan@alanpearce.eu"; extraConfig = { init = { defaultBranch = "main"; @@ -70,10 +55,6 @@ in merge = { conflictStyle = "zdiff3"; }; - "merge.mergiraf" = { - name = "mergiraf"; - driver = "${pkgs.mergiraf}/bin/mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L"; - }; diff = { algorithm = "histogram"; colorMoved = "plain"; @@ -143,39 +124,8 @@ in ".tabnine_root" ]; }; - programs.gh = { - enable = true; - settings = { - git_protocol = "ssh"; - aliases = { - fork = "repo fork --remote --remote-name alanpearce --default-branch-only"; - }; - }; - }; - programs.jujutsu = { - enable = true; - settings = { - user = { - inherit name email; - }; - ui = { - "diff.tool" = [ "${pkgs.difftastic}/bin/difft" "--color=always" "$left" "$right" ]; - }; - }; - }; - xdg.configFile."git/attributes" = { - source = (pkgs.runCommandLocal "mergiraf-gitattributes" { } '' - ${pkgs.mergiraf}/bin/mergiraf languages --gitattributes >> $out - ''); - }; home.packages = with pkgs; [ - git-extras # delete-merged-branches and friends - git-worktree-switcher ghq - # reduce these on server - mergiraf - gitui - gitstatus - hut # sourcehut tools + gst ]; } diff --git a/user/settings/workstation.nix b/user/settings/workstation.nix index 8ecf1cfb..44a6e6b4 100644 --- a/user/settings/workstation.nix +++ b/user/settings/workstation.nix @@ -14,6 +14,12 @@ home.packages = with pkgs; [ walk nuspell + git-extras # delete-merged-branches and friends + git-worktree-switcher + mergiraf + gitui + gitstatus + hut # sourcehut tools ] ++ (with pkgs.hunspellDicts; [ en-gb-large de-de @@ -22,4 +28,42 @@ home.shellAliases = { wprop = "xprop | egrep '^WM_(CLASS|NAME|WINDOW_ROLE|TYPE)'"; }; + + programs.git = { + difftastic = { + enable = true; + }; + extraConfig = { + "merge.mergiraf" = { + name = "mergiraf"; + driver = "${pkgs.mergiraf}/bin/mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L"; + }; + }; + }; + programs.gh = { + enable = true; + settings = { + git_protocol = "ssh"; + aliases = { + fork = "repo fork --remote --remote-name alanpearce --default-branch-only"; + }; + }; + }; + programs.jujutsu = { + enable = true; + settings = { + user = { + name = config.programs.git.userName; + email = config.programs.git.userEmail; + }; + ui = { + "diff.tool" = [ "${pkgs.difftastic}/bin/difft" "--color=always" "$left" "$right" ]; + }; + }; + }; + xdg.configFile."git/attributes" = { + source = (pkgs.runCommandLocal "mergiraf-gitattributes" { } '' + ${pkgs.mergiraf}/bin/mergiraf languages --gitattributes >> $out + ''); + }; } |