diff options
| -rw-r--r-- | flake.lock | 62 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| m--------- | private | 0 | ||||
| -rw-r--r-- | system/linde.nix | 6 | ||||
| -rw-r--r-- | system/settings/services/git-server.nix | 1 | ||||
| -rw-r--r-- | user/server.nix | 2 |
6 files changed, 40 insertions, 33 deletions
diff --git a/flake.lock b/flake.lock index de79ae59..81d820da 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1739302241, - "narHash": "sha256-NXQXFU6HOschZ+8ZKrNOlwlHelez8vPl+dCiUaJ82/U=", + "lastModified": 1739933872, + "narHash": "sha256-UhuvTR4OrWR+WBaRCZm4YMkvjJhZ1KZo/jRjE41m+Ek=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a6746213b138fe7add88b19bafacd446de574ca7", + "rev": "6ab392f626a19f1122d1955c401286e1b7cf6b53", "type": "github" }, "original": { @@ -92,11 +92,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1739380704, - "narHash": "sha256-pIv4L+fvaaOHa1SsH2ePECvChmcr6T3AheFMtyn5rMI=", + "lastModified": 1740333969, + "narHash": "sha256-zkLwCGw1PylyV0cGywnYF/duox1gC45BcV5XtkXD6zM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "88f3cba36d23f40c7e6b868d0b80555c55cdc3a5", + "rev": "84420d1963cada13bc63be2e118082586690728a", "type": "github" }, "original": { @@ -269,11 +269,11 @@ ] }, "locked": { - "lastModified": 1739381933, - "narHash": "sha256-4gvobxITgcrNGfwsVG5a46QzQCX89btIYw23p0ilbcc=", + "lastModified": 1740318342, + "narHash": "sha256-fjr9+3Iru6O5qE+2oERQkabqAUXx4awm0+i2MBcta1U=", "owner": "nix-community", "repo": "home-manager", - "rev": "15b59d4191b993ebdfcb1f61b834fced217882ba", + "rev": "b5ab2c7fdaa807cf425066ab7cd34b073946b1ca", "type": "github" }, "original": { @@ -289,11 +289,11 @@ ] }, "locked": { - "lastModified": 1739071773, - "narHash": "sha256-/Ak+Quinhmdxa9m3shjm4lwwwqmzG8zzGhhhhgR1k9I=", + "lastModified": 1740281615, + "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "895d81b6228bbd50a6ef22f5a58a504ca99763ea", + "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023", "type": "github" }, "original": { @@ -304,11 +304,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738816619, - "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", + "lastModified": 1740089251, + "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", + "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30", "type": "github" }, "original": { @@ -335,11 +335,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1739206421, - "narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=", + "lastModified": 1740162160, + "narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44534bc021b85c8d78e465021e21f33b856e2540", + "rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9", "type": "github" }, "original": { @@ -367,11 +367,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1740126099, + "narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "32fb99ba93fea2798be0e997ea331dd78167f814", "type": "github" }, "original": { @@ -415,11 +415,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1739097848, - "narHash": "sha256-bbdQB0Y4mB2msqbyQ9QC+YPDZGt1evUK53AwQSyShHM=", + "lastModified": 1739928959, + "narHash": "sha256-ZroNoSIYC1trtuUpWlWGRCrvYt9QBEiut7DC1GHKmT4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a0b855695c31ea653181b742c65e026bada3881", + "rev": "9228994eca7cc0e00f8318e015d4dfbbf7ad41e2", "type": "github" }, "original": { @@ -478,11 +478,11 @@ "simple-css": "simple-css" }, "locked": { - "lastModified": 1738336982, - "narHash": "sha256-E5NHIz2MITy35v7dh1Z+sP9ckdW0Go0JubhJvgzp+cA=", + "lastModified": 1739493400, + "narHash": "sha256-pdKTt5M13n9dgg5S6+ZsQd52aAxFayHbVUoqhzR0puA=", "ref": "refs/heads/main", - "rev": "3ee8248656c089594ea8a3be41945c408ab39aa4", - "revCount": 320, + "rev": "ea8c3053006e67210e16ed55febbcb0c6a374b54", + "revCount": 321, "type": "git", "url": "https://git.alanpearce.eu/searchix" }, @@ -508,11 +508,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1739149457, - "narHash": "sha256-777RrYhdblwYBDruc5xaRdheTGyBMOdjcJmc67d98es=", + "lastModified": 1740012831, + "narHash": "sha256-u6Y5ttXBuQ+tyyCei07QnbNL6Gydv55OpoGh4fXzTqg=", "owner": "nix-community", "repo": "srvos", - "rev": "8e257cc0810b5aa0f1a8841d8bdbb10eda07ae16", + "rev": "f6ddf92bc61e021ea05c971a055624509ffac429", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b92e7941..46e55e3b 100644 --- a/flake.nix +++ b/flake.nix @@ -124,6 +124,7 @@ modules = [ ./user/marvin.nix ./private/default.nix + ./private/tabnine.nix ./private/ssh.nix nix-index-database.hmModules.nix-index ]; @@ -133,6 +134,7 @@ modules = [ ./user/prefect.nix ./private/default.nix + ./private/tabnine.nix ./private/ssh.nix nix-index-database.hmModules.nix-index ]; diff --git a/private b/private -Subproject e3332f2321b33fd063e539199e60ba5c18f6340 +Subproject 41fa979a2a1eabf917cf89428cfdc94c7252cde diff --git a/system/linde.nix b/system/linde.nix index 5fbed51b..af9bcc37 100644 --- a/system/linde.nix +++ b/system/linde.nix @@ -606,6 +606,10 @@ in useACMEHost = "alanpearce.eu"; extraConfig = '' reverse_proxy ${srv.settings.bindHTTP} + handle_path /archive/* { + root * ${srv.homeDir}/archive + file_server browse + } ''; }; "stats.alanpearce.eu" = @@ -991,11 +995,13 @@ in settings = { bindHTTP = "[::1]:8002"; keepRundirs = 1; + archiveURL = "https://ci.alanpearce.eu/archive/"; }; }; users.users.laminar = { homeMode = "770"; }; + users.groups.laminar.members = [ "caddy" ]; virtualisation.containers = { enable = true; diff --git a/system/settings/services/git-server.nix b/system/settings/services/git-server.nix index df3c0ea2..5919ab87 100644 --- a/system/settings/services/git-server.nix +++ b/system/settings/services/git-server.nix @@ -27,6 +27,7 @@ let nixfiles = [ "sourcehut" ]; searchix = [ "sourcehut" ]; website = [ "sourcehut" ]; + homestead = [ "sourcehut" ]; nix-packages = [ "sourcehut" "github" ]; zola-bearblog = [ "sourcehut" "codeberg" ]; }; diff --git a/user/server.nix b/user/server.nix index 235e6908..e1946206 100644 --- a/user/server.nix +++ b/user/server.nix @@ -6,9 +6,7 @@ ./settings/base.nix ./settings/git.nix ./settings/fish.nix - ./settings/nix.nix ./settings/nixos.nix - ./settings/development/base.nix ]; home = { username = "alan"; |