From d400e840925f715cf6149364e6d51e768c326a31 Mon Sep 17 00:00:00 2001 From: Callum Leslie Date: Fri, 2 Jan 2026 10:30:48 +0000 Subject: [PATCH 1/4] fish changes and paperless folder --- home/c/programs/fish/default.nix | 2 +- hosts/hermes/copyparty.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home/c/programs/fish/default.nix b/home/c/programs/fish/default.nix index 4268b18..69178c3 100644 --- a/home/c/programs/fish/default.nix +++ b/home/c/programs/fish/default.nix @@ -13,6 +13,7 @@ in { enable = true; interactiveShellInit = '' + set sponge_purge_only_on_exit true set fish_greeting trap __trap_exit_tmux EXIT ''; @@ -31,7 +32,6 @@ in { }; plugins = with pkgs.fishPlugins; [ - (mkFishPlug z) (mkFishPlug hydro) (mkFishPlug sponge) (mkFishPlug grc) diff --git a/hosts/hermes/copyparty.nix b/hosts/hermes/copyparty.nix index 345f198..cd2e10b 100644 --- a/hosts/hermes/copyparty.nix +++ b/hosts/hermes/copyparty.nix @@ -20,7 +20,7 @@ in { }; }; "/paperless" = { - path = "/var/lib/media/library"; + path = "/var/lib/paperless"; access = { rw = ["c"]; }; From ba4f1bcfccb795d5e0ac00c6a29e9b005635aba2 Mon Sep 17 00:00:00 2001 From: Callum Leslie Date: Thu, 29 Jan 2026 15:37:13 +0000 Subject: [PATCH 2/4] lots of updates from the past few months --- flake.lock | 549 ++++++++--------------- flake.nix | 13 +- home/c/default.nix | 2 +- home/c/programs/git/default.nix | 56 +-- home/c/programs/hypr/default.nix | 2 +- home/c/programs/rofi/default.nix | 2 +- hosts/artemis/configuration.nix | 2 +- hosts/artemis/hardware-configuration.nix | 9 +- hosts/hermes/headscale.nix | 5 +- hosts/hermes/media.nix | 2 +- hosts/hermes/n8n.nix | 6 +- secrets/wg-conf.age | Bin 697 -> 696 bytes 12 files changed, 228 insertions(+), 420 deletions(-) diff --git a/flake.lock b/flake.lock index 0521586..13e98d1 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1754433428, - "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", + "lastModified": 1770165109, + "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=", "owner": "ryantm", "repo": "agenix", - "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", + "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb", "type": "github" }, "original": { @@ -44,11 +44,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1746562888, - "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", "type": "github" }, "original": { @@ -60,27 +60,28 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1622559957, - "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", "owner": "tomyun", "repo": "base16-fish", - "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" } }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1748408240, - "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -114,11 +115,11 @@ ] }, "locked": { - "lastModified": 1757898317, - "narHash": "sha256-bsaY6m/fEfJY9l0KU+tkMM+QwggNwS/GVw9jl8bHOF8=", + "lastModified": 1775866625, + "narHash": "sha256-NfzRZ5DZo8Mwb31ocimy3IMhr3kmYGQ3/ImfnEQkQLw=", "owner": "9001", "repo": "copyparty", - "rev": "fd331a545d6ac9c94287663f79a3379b5171d048", + "rev": "a5d859d2b18f53ccf236bc6229856f79139d531c", "type": "github" }, "original": { @@ -128,21 +129,6 @@ } }, "crane": { - "locked": { - "lastModified": 1731098351, - "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", - "owner": "ipetkov", - "repo": "crane", - "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_2": { "locked": { "lastModified": 1751562746, "narHash": "sha256-smpugNIkmDeicNz301Ll1bD7nFOty97T79m4GUMUczA=", @@ -157,13 +143,13 @@ "type": "github" } }, - "crane_3": { + "crane_2": { "locked": { - "lastModified": 1736566337, - "narHash": "sha256-SC0eDcZPqISVt6R0UfGPyQLrI0+BppjjtQ3wcSlk0oI=", + "lastModified": 1766774972, + "narHash": "sha256-8qxEFpj4dVmIuPn9j9z6NTbU+hrcGjBOvaxTzre5HmM=", "owner": "ipetkov", "repo": "crane", - "rev": "9172acc1ee6c7e1cbafc3044ff850c568c75a5a3", + "rev": "01bc1d404a51a0a07e9d8759cd50a7903e218c82", "type": "github" }, "original": { @@ -175,11 +161,11 @@ "devour-flake": { "flake": false, "locked": { - "lastModified": 1738639461, - "narHash": "sha256-R7MHvTh5fskzxNLBe9bher+GQBZ8ZHjz75CPQG3fSRI=", + "lastModified": 1770055559, + "narHash": "sha256-peb6VlxIDoqaHkGPanQ35p8SXy9t54NIJ8XJHgMSuFg=", "owner": "srid", "repo": "devour-flake", - "rev": "9fe4db872c107ea217c13b24527b68d9e4a4c01b", + "rev": "e65d15fd4ef46dbde90ac59be581b2a286c35d0f", "type": "github" }, "original": { @@ -211,11 +197,11 @@ ] }, "locked": { - "lastModified": 1757508292, - "narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=", + "lastModified": 1773889306, + "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=", "owner": "nix-community", "repo": "disko", - "rev": "146f45bee02b8bd88812cfce6ffc0f933788875a", + "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347", "type": "github" }, "original": { @@ -269,11 +255,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1757995413, - "narHash": "sha256-vaU/7/PXoym6vnspGxhR29V9klGe9iy9zmp6x7w38f8=", + "lastModified": 1776139376, + "narHash": "sha256-rBykvCL5GRT6VmiY39XnxAR10cohBsLeAENP0+3JM/0=", "owner": "rycee", "repo": "nur-expressions", - "rev": "4ae8996b3e139926c784acd22824cde46cd28833", + "rev": "ccfaa2303117e22752bda4e1a1bb07d17f38ea2d", "type": "gitlab" }, "original": { @@ -286,11 +272,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1748383148, - "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", + "lastModified": 1764873433, + "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", + "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", "type": "github" }, "original": { @@ -301,11 +287,11 @@ }, "flake-compat": { "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { @@ -315,22 +301,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1688025799, @@ -346,6 +316,22 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1751685974, + "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=", + "ref": "refs/heads/main", + "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1", + "revCount": 92, + "type": "git", + "url": "https://git.lix.systems/lix-project/flake-compat.git" + }, + "original": { + "type": "git", + "url": "https://git.lix.systems/lix-project/flake-compat.git" + } + }, "flake-compat_4": { "flake": false, "locked": { @@ -369,11 +355,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -383,27 +369,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -421,16 +386,20 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_3": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": [ + "nvf", + "nvf", + "nixpkgs" + ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -439,7 +408,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "omnix", @@ -460,7 +429,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -468,11 +437,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -513,25 +482,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -582,7 +533,7 @@ "git-hooks_2": { "inputs": { "flake-compat": "flake-compat_4", - "gitignore": "gitignore_3", + "gitignore": "gitignore_2", "nixpkgs": [ "scenics", "nixpkgs" @@ -603,28 +554,6 @@ } }, "gitignore": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "pre-commit-hooks-nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "pre-commit-hooks", @@ -645,7 +574,7 @@ "type": "github" } }, - "gitignore_3": { + "gitignore_2": { "inputs": { "nixpkgs": [ "scenics", @@ -670,18 +599,20 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1744584021, - "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", + "host": "gitlab.gnome.org", + "lastModified": 1767737596, + "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", - "type": "github" + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "48.1", + "ref": "gnome-49", "repo": "gnome-shell", - "type": "github" + "type": "gitlab" } }, "home-manager": { @@ -712,16 +643,16 @@ ] }, "locked": { - "lastModified": 1757808926, - "narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=", + "lastModified": 1775425411, + "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", "owner": "nix-community", "repo": "home-manager", - "rev": "f21d9167782c086a33ad53e2311854a8f13c281e", + "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -743,51 +674,48 @@ "type": "github" } }, - "lanzaboote": { - "inputs": { - "crane": "crane", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay" - }, + "mnw": { "locked": { - "lastModified": 1737639419, - "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", - "owner": "nix-community", - "repo": "lanzaboote", - "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", + "lastModified": 1770419553, + "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=", + "owner": "Gerg-L", + "repo": "mnw", + "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957", "type": "github" }, "original": { - "owner": "nix-community", - "ref": "v0.4.2", - "repo": "lanzaboote", + "owner": "Gerg-L", + "repo": "mnw", "type": "github" } }, - "mnw": { + "ndg": { + "inputs": { + "nixpkgs": [ + "nvf", + "nvf", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1748710831, - "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=", - "owner": "Gerg-L", - "repo": "mnw", - "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d", + "lastModified": 1768214250, + "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=", + "owner": "feel-co", + "repo": "ndg", + "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8", "type": "github" }, "original": { - "owner": "Gerg-L", - "repo": "mnw", + "owner": "feel-co", + "ref": "refs/tags/v2.6.0", + "repo": "ndg", "type": "github" } }, "nish": { "inputs": { "advisory-db": "advisory-db", - "crane": "crane_2", + "crane": "crane", "fenix": "fenix", "flake-parts": [ "flake-parts" @@ -806,11 +734,11 @@ ] }, "locked": { - "lastModified": 1751876103, - "narHash": "sha256-RdaB+ZyGJp9HYWVov8mv768dXVv63JnMWNql5dErWEE=", + "lastModified": 1776153266, + "narHash": "sha256-zQIU2Or1H/q3gGY/eqAPFWZScWGIg5QsBvQGArXbuTw=", "owner": "callumio", "repo": "nish", - "rev": "e0d8eec64f06f26fa474d27aec125ba9809c5f77", + "rev": "512135e90e5c9468ede6702a3f10766b55c7a72e", "type": "github" }, "original": { @@ -917,16 +845,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757810152, - "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", + "lastModified": 1776067740, + "narHash": "sha256-B35lpsqnSZwn1Lmz06BpwF7atPgFmUgw1l8KAV3zpVQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a094440e02a699be5c57453a092a8baf569bdad", + "rev": "7e495b747b51f95ae15e74377c5ce1fe69c1765f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -949,37 +877,6 @@ "type": "github" } }, - "nixpkgs-lib_2": { - "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1737469691, @@ -1014,27 +911,27 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1750215678, - "narHash": "sha256-Rc/ytpamXRf6z8UA2SGa4aaWxUXRbX2MAWIu2C8M+ok=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5395fb3ab3f97b9b7abca147249fa2e8ed27b192", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_5": { "locked": { - "lastModified": 1725194671, - "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", + "lastModified": 1767364772, + "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", "type": "github" }, "original": { @@ -1102,15 +999,14 @@ "nixpkgs": [ "stylix", "nixpkgs" - ], - "treefmt-nix": "treefmt-nix_2" + ] }, "locked": { - "lastModified": 1751320053, - "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=", + "lastModified": 1767886815, + "narHash": "sha256-pB2BBv6X9cVGydEV/9Y8+uGCvuYJAlsprs1v1QHjccA=", "owner": "nix-community", "repo": "NUR", - "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670", + "rev": "4ff84374d77ff62e2e13a46c33bfeb73590f9fef", "type": "github" }, "original": { @@ -1127,11 +1023,11 @@ "nvf": "nvf_2" }, "locked": { - "lastModified": 1752050492, - "narHash": "sha256-vSqGDFGeECMDAWt4NPJzwhQgjC8U5cNDsqndaBQFSB0=", + "lastModified": 1776156947, + "narHash": "sha256-oE9GmZmFLdtbIA7vs+wgJfcKA/UAOL/H3pWY0hcSSbI=", "owner": "callumio", "repo": "nvf", - "rev": "89fb54a7bb0220a28166a288cbab236948ae5477", + "rev": "a011f9fc050954789d9d501126204cdbd2d55b14", "type": "github" }, "original": { @@ -1142,18 +1038,19 @@ }, "nvf_2": { "inputs": { - "flake-parts": "flake-parts_4", - "flake-utils": "flake-utils_2", + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts_3", "mnw": "mnw", + "ndg": "ndg", "nixpkgs": "nixpkgs_4", - "systems": "systems_3" + "systems": "systems_2" }, "locked": { - "lastModified": 1752001027, - "narHash": "sha256-JgP8lW4QBr9v/U4ETaIOMvGCd/DAA1AjZ1lqjIwfWno=", + "lastModified": 1775892726, + "narHash": "sha256-1TK1pe33cEHNvGW41TP5xAzrbG1Gp7LfyFL6c3+xf+I=", "owner": "notashelf", "repo": "nvf", - "rev": "c4d80273aaefeadaad96db97d077c647942b0e96", + "rev": "5ab359ee7dfd3fa09a5c6f863efaf810bb9a9436", "type": "github" }, "original": { @@ -1166,7 +1063,7 @@ "inputs": { "devour-flake": "devour-flake_2", "false": "false", - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_4", "git-hooks": "git-hooks", "inspect": "inspect", "nix-systems-aarch64-darwin": "nix-systems-aarch64-darwin", @@ -1181,11 +1078,11 @@ "true": "true" }, "locked": { - "lastModified": 1757112869, - "narHash": "sha256-mYaj1ZiujvJkCYR2GK85A8Pr8azMrbj8abpDw4nEz5E=", + "lastModified": 1770391213, + "narHash": "sha256-onp7JqNzpTZyfS0WzCYMdsMS4yr96BcKzEjCN9E1G9g=", "owner": "juspay", "repo": "omnix", - "rev": "7e35ac51e30e94579cfc8f62c8318d4c198d5cb4", + "rev": "426302b981864b1ab6be42eb51d9487ad403ca36", "type": "github" }, "original": { @@ -1199,44 +1096,17 @@ "flake-compat": [ "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1757974173, - "narHash": "sha256-4DpXmct/2rcLgScT1CXOLr0TUeIlrBB1rnFqCOf5MUw=", + "lastModified": 1775585728, + "narHash": "sha256-8Psjt+TWvE4thRKktJsXfR6PA/fWWsZ04DVaY6PUhr4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "302af509428169db34f268324162712d10559f74", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks-nix": { - "inputs": { - "flake-compat": [ - "lanzaboote", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "580633fa3fe5fc0379905986543fd7495481913d", "type": "github" }, "original": { @@ -1255,7 +1125,6 @@ "flake-compat": "flake-compat", "flake-parts": "flake-parts", "home-manager": "home-manager_2", - "lanzaboote": "lanzaboote", "nish": "nish", "nixinate": "nixinate", "nixpkgs": "nixpkgs", @@ -1266,8 +1135,8 @@ "pre-commit-hooks": "pre-commit-hooks", "scenics": "scenics", "stylix": "stylix", - "systems": "systems_6", - "treefmt-nix": "treefmt-nix_3", + "systems": "systems_5", + "treefmt-nix": "treefmt-nix_2", "unstable": "unstable" } }, @@ -1290,19 +1159,19 @@ }, "rust-flake": { "inputs": { - "crane": "crane_3", + "crane": "crane_2", "nixpkgs": [ "omnix", "nixpkgs" ], - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1741121204, - "narHash": "sha256-oMJsdsRzvO6l5oHqzXjhSe7D8ld06yAXwRPPrX/n/KI=", + "lastModified": 1767025855, + "narHash": "sha256-mcbcu5x0oSHBZFD4/XxUK7saMvi345u1W/+7ql12PpQ=", "owner": "juspay", "repo": "rust-flake", - "rev": "ea753dade9e283809d11c63082840657eb766e97", + "rev": "77d6e2bc25ad09557e4be614c45e7c56f431c1d6", "type": "github" }, "original": { @@ -1312,27 +1181,6 @@ } }, "rust-overlay": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1731897198, - "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "nixpkgs": [ "omnix", @@ -1341,11 +1189,11 @@ ] }, "locked": { - "lastModified": 1736700680, - "narHash": "sha256-9gmWIb8xsycWHEYpd2SiVIAZnUULX6Y+IMMZBcDUCQU=", + "lastModified": 1766803264, + "narHash": "sha256-eGK6He8BR6L7N73kyyjz/vGxZX1Usnr8Gwfs3D18KgE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5d1865c0da63b4c949f383d982b6b43519946e8f", + "rev": "6b5c52313aaf3f3e1a0a6757bb89846edfb5195c", "type": "github" }, "original": { @@ -1356,8 +1204,8 @@ }, "sbomnix": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_3", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_2", "flake-root": "flake-root", "nix-visualize": "nix-visualize", "nixpkgs": "nixpkgs_3", @@ -1380,7 +1228,7 @@ }, "scenics": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "git-hooks": "git-hooks_2", "nixpkgs": [ "unstable" @@ -1407,13 +1255,13 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_5", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" ], "nur": "nur", - "systems": "systems_5", + "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1421,16 +1269,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1757957798, - "narHash": "sha256-FT4O5imFJ+FUIGhYj/aFwEEgyvLhuyJ2my8f6mCLtTY=", + "lastModified": 1775935110, + "narHash": "sha256-twTHKUFXjNNsaAvX0KoaIClt+923jXDRbfCd9PC/f0o=", "owner": "danth", "repo": "stylix", - "rev": "e6fc25cd12e8f461e402cf34649cc73ad93c7bdd", + "rev": "14f248ad1a7668e7858c6d9163608c208b7daf02", "type": "github" }, "original": { "owner": "danth", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "stylix", "type": "github" } @@ -1466,21 +1314,6 @@ } }, "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1495,7 +1328,7 @@ "type": "github" } }, - "systems_5": { + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1510,7 +1343,7 @@ "type": "github" } }, - "systems_6": { + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1561,11 +1394,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1750770351, - "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", + "lastModified": 1767817087, + "narHash": "sha256-eGE8OYoK6HzhJt/7bOiNV2cx01IdIrHL7gXgjkHRdNo=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", + "rev": "bd99656235aab343e3d597bf196df9bc67429507", "type": "github" }, "original": { @@ -1577,11 +1410,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1751159871, - "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", + "lastModified": 1767489635, + "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", + "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", "type": "github" }, "original": { @@ -1593,11 +1426,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1751158968, - "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", + "lastModified": 1767488740, + "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", + "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", "type": "github" }, "original": { @@ -1631,37 +1464,15 @@ "treefmt-nix_2": { "inputs": { "nixpkgs": [ - "stylix", - "nur", "nixpkgs" ] }, "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_3": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1756662192, - "narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", "type": "github" }, "original": { @@ -1687,11 +1498,11 @@ }, "unstable": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1775710090, + "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "4c1018dae018162ec878d42fec712642d214fdfa", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9ec84a4..8fd892f 100644 --- a/flake.nix +++ b/flake.nix @@ -39,7 +39,7 @@ inherit (mods) homeManagerModules nixosModules; # TODO: use ./hosts/ nixosConfigurations = { - artemis = mkLinuxSystem [./hosts/artemis inputs.lanzaboote.nixosModules.lanzaboote] []; + artemis = mkLinuxSystem [./hosts/artemis] []; hermes = mkLinuxSystem [./hosts/hermes inputs.nocodb.nixosModules.nocodb inputs.copyparty.nixosModules.default] [inputs.copyparty.overlays.default]; }; diskoConfigurations = {}; # maybe? @@ -88,7 +88,7 @@ }; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; scenics.url = "github:callumio/scenics"; @@ -117,12 +117,12 @@ }; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; stylix = { - url = "github:danth/stylix/release-25.05"; + url = "github:danth/stylix/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -161,11 +161,6 @@ treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; - lanzaboote = { - url = "github:nix-community/lanzaboote/v0.4.2"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nish = { url = "github:callumio/nish"; inputs = { diff --git a/home/c/default.nix b/home/c/default.nix index 1ca5bcd..7755114 100644 --- a/home/c/default.nix +++ b/home/c/default.nix @@ -24,7 +24,7 @@ adwaita-icon-theme networkmanagerapplet libsecret - bitwarden + bitwarden-desktop #betterbird wl-clipboard discord diff --git a/home/c/programs/git/default.nix b/home/c/programs/git/default.nix index 8e5f9f5..216b91e 100644 --- a/home/c/programs/git/default.nix +++ b/home/c/programs/git/default.nix @@ -1,39 +1,41 @@ {...}: { - programs.git = { - enable = true; + programs = { + git = { + enable = true; - userName = "Callum Leslie"; - userEmail = "git@cleslie.uk"; - signing.key = "03B01F427831BCFD!"; - signing.signByDefault = true; + userName = "Callum Leslie"; + userEmail = "git@cleslie.uk"; + signing.key = "03B01F427831BCFD!"; + signing.signByDefault = true; - ignores = [".direnv/"]; + ignores = [".direnv/"]; - includes = [ - { - condition = "gitdir:~/repos/projects.cs.nott.ac.uk/"; - contents = { - user = { - email = "psycl6@nottingham.ac.uk"; - signingKey = "14861F1282EFB5C8!"; + includes = [ + { + condition = "gitdir:~/repos/projects.cs.nott.ac.uk/"; + contents = { + user = { + email = "psycl6@nottingham.ac.uk"; + signingKey = "14861F1282EFB5C8!"; + }; + credential = {helper = "store";}; }; - credential = {helper = "store";}; + } + ]; + + extraConfig = { + core = { + longpaths = true; + autocrlf = false; }; - } - ]; - extraConfig = { - core = { - longpaths = true; - autocrlf = false; + init = {defaultBranch = "main";}; + + push = {autoSetupRemote = true;}; + ghq = {root = "~/repos";}; }; - - init = {defaultBranch = "main";}; - - push = {autoSetupRemote = true;}; - ghq = {root = "~/repos";}; }; - delta.enable = true; + delta.enableGitIntegration = true; }; } diff --git a/home/c/programs/hypr/default.nix b/home/c/programs/hypr/default.nix index fccc19f..ac0c57e 100644 --- a/home/c/programs/hypr/default.nix +++ b/home/c/programs/hypr/default.nix @@ -11,7 +11,7 @@ chat = getProgFor "discord"; media = getProgFor "spotify"; terminal = getProgFor "alacritty"; - runner = getProgFor' "rofi-wayland" "rofi"; + runner = getProgFor "rofi"; rofi-rbw = getProgFor' "rofi-rbw-wayland" "rofi-rbw"; tmux = getProgFor "tmux"; slurp = getProgFor "slurp"; diff --git a/home/c/programs/rofi/default.nix b/home/c/programs/rofi/default.nix index 71b92f8..f4dffc6 100644 --- a/home/c/programs/rofi/default.nix +++ b/home/c/programs/rofi/default.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { programs.rofi = { enable = true; - package = pkgs.rofi-wayland; + package = pkgs.rofi; #theme = "Arc-Dark"; }; } diff --git a/hosts/artemis/configuration.nix b/hosts/artemis/configuration.nix index faffddd..aa16d80 100644 --- a/hosts/artemis/configuration.nix +++ b/hosts/artemis/configuration.nix @@ -32,7 +32,7 @@ adwaita-icon-theme apple-cursor wget - pinentry + pinentry-gnome3 fzf nil killall diff --git a/hosts/artemis/hardware-configuration.nix b/hosts/artemis/hardware-configuration.nix index e23395b..7f3ee67 100644 --- a/hosts/artemis/hardware-configuration.nix +++ b/hosts/artemis/hardware-configuration.nix @@ -18,11 +18,8 @@ ]; #kernelPackages = pkgs.linuxPackages_latest; - loader.systemd-boot.enable = lib.mkForce false; - lanzaboote = { - enable = true; - pkiBundle = "/etc/secureboot"; - }; + # loader.systemd-boot.enable = lib.mkForce false; + loader.systemd-boot.enable = true; }; hardware = { bluetooth = { @@ -39,7 +36,7 @@ #intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) intel-ocl libvdpau-va-gl - vaapiVdpau + libva-vdpau-driver intel-compute-runtime vpl-gpu-rt ]; diff --git a/hosts/hermes/headscale.nix b/hosts/hermes/headscale.nix index 0160ead..ddb4205 100644 --- a/hosts/hermes/headscale.nix +++ b/hosts/hermes/headscale.nix @@ -8,7 +8,10 @@ in { port = 8080; settings = { server_url = "https://${domain}"; - dns = {base_domain = "net.cleslie.uk";}; + dns = { + base_domain = "net.cleslie.uk"; + override_local_dns = false; + }; ip_prefixes = "100.64.0.0/10"; }; diff --git a/hosts/hermes/media.nix b/hosts/hermes/media.nix index b2745c2..b47c4bd 100644 --- a/hosts/hermes/media.nix +++ b/hosts/hermes/media.nix @@ -40,7 +40,7 @@ in { extraPackages = with pkgs; [ intel-media-driver intel-vaapi-driver # previously vaapiIntel - vaapiVdpau + libva-vdpau-driver libvdpau-va-gl intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in) unstable.vpl-gpu-rt # QSV on 11th gen or newer diff --git a/hosts/hermes/n8n.nix b/hosts/hermes/n8n.nix index 5054b60..99cd512 100644 --- a/hosts/hermes/n8n.nix +++ b/hosts/hermes/n8n.nix @@ -5,9 +5,9 @@ in { cloudflare-dyndns.domains = [domain]; n8n = { enable = true; - webhookUrl = "https://" + domain + "/"; - settings = { - port = 5678; + environment = { + PORT = "5678"; + WEBHOOK_URL = "https://" + domain + "/"; }; }; caddy.virtualHosts.${domain}.extraConfig = '' diff --git a/secrets/wg-conf.age b/secrets/wg-conf.age index 3ec2d79bffe032f6cc5a6d5e36b750724c09faa3..7a67aabdc2c881fe98520e90a720fb864fa457ee 100644 GIT binary patch delta 644 zcmdnVx`TCsPJLB*PC#CwMVP5al$T|dSAa`kdZtB%aZyyRZ+T#7hG|e)U}{(n08cwFPE;JLUD11 zZfc5=si~o*LTXl)PeHmuS&?zFskfO|W|qHsURsiVsGDiJw~uy;sb5inS(uNBt9EXN zp=(rRPEJ@cSDEyT8d?$cZ9x~aagdy z#E;_jQQ`ij+AgI<`Ho)3`Cf^M7LnmD+7%JT5ryFuAr?ucS%Ib%xqgM&c@e%`re^vP z`R?A9F2>rf6$QrHK^bM?`R>}Y5oY?XKB?tVPUYFTg?Wx#y1Kdw29+V<`bLG` z&beV}rMZa_zGnWZg(W!|W|{hKIexxH1%~eR6|RvUnSo}GTox%)9&Uel@TT1VH{2OF zALqKq-+8p;o8?xyYDUI_MVVqB9~@`sdizhT@`{Yz|M`nw%nM8Xy1Hglx90c#`<7lj zn)jq=mT79lj=CyI;g&DQS9rC5STZ3@M&m#9{|Y^Vym&tREjqT+|KR!S5i|C* z!eTe~8Uoh>Wea_r(1j|&{*&-TX(P8kDV#=^%Z+qnH8DruNa@1QoC<{Yj4V*sT}T1 sT3QL=!rN}O-d75^dcS{z2J6}-4mZ24_tyqr+5G8xf}()}>zn1Q0H`AfbpQYW delta 645 zcmdnNx|4N+PQ9C7dALcCYn7X~p=n@cQEqvWiDg!nNrY);aX?{eXrMuadsa?GQE6Uo zGFO0cazIFUnVY*|c9nl#W|3z|NtUO9letG#YGsL~ab}vgL5YE9ijhl*BbTn7LUD11 zZfc5=si~o*LTXl)PeHnZiHD?lACs3kyDDPsgqA+QF^FRmT^^) zQ9)5eiJzk{S43q}X-R63Nkmabg_D0(S!r=lKz^B*vAcIbmSvcBn3F|DcCc@Tp+$!0 z#E;_jmEjgyMuA@DfzH`x1^HzeAt_F)Es*e?mVmH#f1skjKAhBh~6n@EHUAZlG2KR$E!>(=Oo4ci7=83zp+uP uuC#EA-P{aC=F00GZ Date: Tue, 14 Apr 2026 15:00:35 +0100 Subject: [PATCH 3/4] format --- home/c/programs/direnv/default.nix | 2 +- home/c/programs/jj/default.nix | 2 +- hosts/hermes/media.nix | 6 +----- modules/tailscale.nix | 1 - packages/default.nix | 2 +- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/home/c/programs/direnv/default.nix b/home/c/programs/direnv/default.nix index 6409914..479884f 100644 --- a/home/c/programs/direnv/default.nix +++ b/home/c/programs/direnv/default.nix @@ -1,4 +1,4 @@ -{config, ...}: { +{...}: { programs.direnv = { enable = true; nix-direnv.enable = true; diff --git a/home/c/programs/jj/default.nix b/home/c/programs/jj/default.nix index 3029dea..f0c5e57 100644 --- a/home/c/programs/jj/default.nix +++ b/home/c/programs/jj/default.nix @@ -1,4 +1,4 @@ -{lib, ...}: { +{...}: { programs.jujutsu = { enable = true; settings = { diff --git a/hosts/hermes/media.nix b/hosts/hermes/media.nix index b47c4bd..177c503 100644 --- a/hosts/hermes/media.nix +++ b/hosts/hermes/media.nix @@ -1,8 +1,4 @@ -{ - pkgs, - config, - ... -}: let +{pkgs, ...}: let mediaDir = "/var/lib/media"; in { users = { diff --git a/modules/tailscale.nix b/modules/tailscale.nix index cf915c6..c495029 100644 --- a/modules/tailscale.nix +++ b/modules/tailscale.nix @@ -1,6 +1,5 @@ { config, - options, lib, ... }: diff --git a/packages/default.nix b/packages/default.nix index ad6f316..6ab2d74 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -7,7 +7,7 @@ om = inputs'.omnix.packages.default; nvf = inputs'.nvf.packages.default; agenix = inputs'.agenix.packages.default; - vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;}; + vaapiIntel = pkgs.intel-vaapi-driver.override {enableHybridCodec = true;}; devour-flake = pkgs.callPackage inputs.devour-flake {}; nish = inputs'.nish.packages.default; nsbm = inputs'.nsbm.packages.default; From b8f1924a4cf12af3e844424424f1637d5478e771 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 18 Apr 2026 06:10:22 +0000 Subject: [PATCH 4/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'copyparty': 'github:9001/copyparty/a5d859d2b18f53ccf236bc6229856f79139d531c?narHash=sha256-NfzRZ5DZo8Mwb31ocimy3IMhr3kmYGQ3/ImfnEQkQLw%3D' (2026-04-11) → 'github:9001/copyparty/a997455b5a3d937f53ad40f431534a0e3865e9f7?narHash=sha256-6V6fHUYCwM8SajDQVp9/X3AwLZGltve32mVqbin3awA%3D' (2026-04-16) • Updated input 'firefox-addons': 'gitlab:rycee/nur-expressions/ccfaa2303117e22752bda4e1a1bb07d17f38ea2d?dir=pkgs/firefox-addons&narHash=sha256-rBykvCL5GRT6VmiY39XnxAR10cohBsLeAENP0%2B3JM/0%3D' (2026-04-14) → 'gitlab:rycee/nur-expressions/d02b22b3511f25943c6e938b673626764b74b5b2?dir=pkgs/firefox-addons&narHash=sha256-nx7CgawAdPzBHjve8pFv1K4nmlVpEF2wAe8ApkDcJwU%3D' (2026-04-18) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/7e495b747b51f95ae15e74377c5ce1fe69c1765f?narHash=sha256-B35lpsqnSZwn1Lmz06BpwF7atPgFmUgw1l8KAV3zpVQ%3D' (2026-04-13) → 'github:NixOS/nixpkgs/c7f47036d3df2add644c46d712d14262b7d86c0c?narHash=sha256-gyqXNMgk3sh%2BogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk%3D' (2026-04-17) • Updated input 'nvf': 'github:callumio/nvf/a011f9fc050954789d9d501126204cdbd2d55b14?narHash=sha256-oE9GmZmFLdtbIA7vs%2BwgJfcKA/UAOL/H3pWY0hcSSbI%3D' (2026-04-14) → 'github:callumio/nvf/f39b69918059fecf09932fefacef8e3cd33e232d?narHash=sha256-LcvDdDvhNspLeO5hzywpo%2Bg8O%2BhoMPpy/Tqtk9azELM%3D' (2026-04-14) • Updated input 'unstable': 'github:NixOS/nixpkgs/4c1018dae018162ec878d42fec712642d214fdfa?narHash=sha256-ar3rofg%2BawPB8QXDaFJhJ2jJhu%2BKqN/PRCXeyuXR76E%3D' (2026-04-09) → 'github:NixOS/nixpkgs/4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9?narHash=sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM%3D' (2026-04-14) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 13e98d1..f4c1060 100644 --- a/flake.lock +++ b/flake.lock @@ -115,11 +115,11 @@ ] }, "locked": { - "lastModified": 1775866625, - "narHash": "sha256-NfzRZ5DZo8Mwb31ocimy3IMhr3kmYGQ3/ImfnEQkQLw=", + "lastModified": 1776339486, + "narHash": "sha256-6V6fHUYCwM8SajDQVp9/X3AwLZGltve32mVqbin3awA=", "owner": "9001", "repo": "copyparty", - "rev": "a5d859d2b18f53ccf236bc6229856f79139d531c", + "rev": "a997455b5a3d937f53ad40f431534a0e3865e9f7", "type": "github" }, "original": { @@ -255,11 +255,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1776139376, - "narHash": "sha256-rBykvCL5GRT6VmiY39XnxAR10cohBsLeAENP0+3JM/0=", + "lastModified": 1776484970, + "narHash": "sha256-nx7CgawAdPzBHjve8pFv1K4nmlVpEF2wAe8ApkDcJwU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "ccfaa2303117e22752bda4e1a1bb07d17f38ea2d", + "rev": "d02b22b3511f25943c6e938b673626764b74b5b2", "type": "gitlab" }, "original": { @@ -845,11 +845,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776067740, - "narHash": "sha256-B35lpsqnSZwn1Lmz06BpwF7atPgFmUgw1l8KAV3zpVQ=", + "lastModified": 1776434932, + "narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e495b747b51f95ae15e74377c5ce1fe69c1765f", + "rev": "c7f47036d3df2add644c46d712d14262b7d86c0c", "type": "github" }, "original": { @@ -1023,11 +1023,11 @@ "nvf": "nvf_2" }, "locked": { - "lastModified": 1776156947, - "narHash": "sha256-oE9GmZmFLdtbIA7vs+wgJfcKA/UAOL/H3pWY0hcSSbI=", + "lastModified": 1776183398, + "narHash": "sha256-LcvDdDvhNspLeO5hzywpo+g8O+hoMPpy/Tqtk9azELM=", "owner": "callumio", "repo": "nvf", - "rev": "a011f9fc050954789d9d501126204cdbd2d55b14", + "rev": "f39b69918059fecf09932fefacef8e3cd33e232d", "type": "github" }, "original": { @@ -1498,11 +1498,11 @@ }, "unstable": { "locked": { - "lastModified": 1775710090, - "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", + "lastModified": 1776169885, + "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c1018dae018162ec878d42fec712642d214fdfa", + "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", "type": "github" }, "original": {