From 759eb7641d3ad46ef53f26eaf8bd8a52a74106ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Gro=C3=9Fmann?= Date: Mon, 15 Jan 2024 20:46:53 +0100 Subject: [PATCH] fix: update fucked shit --- flake.lock | 278 ++++++++++-------- flake.nix | 3 +- hosts/desktopnix/net.nix | 38 ++- hosts/desktopnix/secrets/secrets.nix.age | Bin 856 -> 1001 bytes modules/config/net.nix | 1 + modules/config/nix.nix | 2 +- modules/config/system.nix | 2 + modules/services/adguardhome.nix | 1 + modules/services/samba.nix | 17 +- modules/services/vaultwarden.nix | 2 +- .../programs/nvim/nixvim/plugins/alpha.nix | 2 +- .../programs/nvim/nixvim/plugins/lsp.nix | 2 +- users/common/programs/obs.nix | 2 +- users/patrick/smb.nix | 5 + 14 files changed, 222 insertions(+), 133 deletions(-) diff --git a/flake.lock b/flake.lock index 0729d81..2706421 100644 --- a/flake.lock +++ b/flake.lock @@ -50,28 +50,6 @@ "type": "github" } }, - "alejandra": { - "inputs": { - "flakeCompat": "flakeCompat", - "nixpkgs": [ - "wired-notify", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1652974241, - "narHash": "sha256-0AolxQtKj3Oek0WSbODDpPVO5Ih8PXHOA3qXEKPB4dQ=", - "owner": "kamadorueda", - "repo": "alejandra", - "rev": "0be1462419fc73270a5dc0f84f8092603890b029", - "type": "github" - }, - "original": { - "owner": "kamadorueda", - "repo": "alejandra", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -287,11 +265,11 @@ ] }, "locked": { - "lastModified": 1704648272, - "narHash": "sha256-zCDhWGl3bVpBKpDZ0p3NuGksZVg69BAChsY5W4KARL4=", + "lastModified": 1705240333, + "narHash": "sha256-s9h2h44fCi54sSIT9ktd3eDik9JDpQE9DeYuXcA44u4=", "owner": "numtide", "repo": "devshell", - "rev": "f54745fd4aae92443817ddc566ce06572b178b5a", + "rev": "ca1ff587c602b934afe830ea3cb26d0fbde4c395", "type": "github" }, "original": { @@ -329,11 +307,11 @@ ] }, "locked": { - "lastModified": 1704741201, - "narHash": "sha256-Y420NeqPWRSpxHpXsxhKILfTxT5exjtTgCgDwSpcEfU=", + "lastModified": 1705281959, + "narHash": "sha256-9NZiSMAduz4qbFu77Cg9RNFcrjgS9UOjriD+v8FeueY=", "owner": "nix-community", "repo": "disko", - "rev": "f0a3425a7b173701922e7959d8bfb136ef53aa54", + "rev": "2a561be6b5dd049182af1973bb7e28f7a0ac9be2", "type": "github" }, "original": { @@ -424,11 +402,11 @@ "flake-compat_6": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -503,6 +481,24 @@ "nixpkgs" ] }, + "locked": { + "lastModified": 1704982712, + "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, "locked": { "lastModified": 1704152458, "narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=", @@ -542,11 +538,11 @@ ] }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -645,19 +641,21 @@ "type": "github" } }, - "flakeCompat": { - "flake": false, + "flake-utils_8": { + "inputs": { + "systems": "systems_11" + }, "locked": { - "lastModified": 1648199409, - "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, @@ -773,11 +771,11 @@ ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", "type": "github" }, "original": { @@ -793,11 +791,11 @@ ] }, "locked": { - "lastModified": 1704809957, - "narHash": "sha256-Z8sBeoeeY2O+BNqh5C+4Z1h1F1wQ2mij7yPZ2GY397M=", + "lastModified": 1705269478, + "narHash": "sha256-j7Rp8Y3ckBHOlIzqe0g2+/BVce9SU/dVtn4Eb0rMuY4=", "owner": "nix-community", "repo": "home-manager", - "rev": "e13aa9e287b3365473e5897e3667ea80a899cdfb", + "rev": "846200eb574faa2af808ed02e653c2b8ed51fd71", "type": "github" }, "original": { @@ -814,11 +812,11 @@ ] }, "locked": { - "lastModified": 1704498488, - "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=", + "lastModified": 1705104164, + "narHash": "sha256-pllCu3Hcm1wP/B0SUxgUXvHeEd4w8s2aVrEQRdIL1yo=", "owner": "nix-community", "repo": "home-manager", - "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee", + "rev": "0912d26b30332ae6a90e1b321ff88e80492127dd", "type": "github" }, "original": { @@ -896,11 +894,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1704629345, - "narHash": "sha256-cWrno5kSY2cCaWIl97Ae4/iZ9rnMLlm0VrwRqdzIESk=", + "lastModified": 1705234148, + "narHash": "sha256-4jiDPebv7cksMlKUuDb9zOKuaTJEdY72L3nXuO9FEGc=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "3e408e7391e9d778f48861bb9da08ac54e01441a", + "rev": "26326a1330e15308df66f70e7133d0de9de0b657", "type": "github" }, "original": { @@ -933,11 +931,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1704120350, - "narHash": "sha256-s5BOPAnVc4e/4WvGDeeF3VSLAWzBUB+YW6fJb3pFbRw=", + "lastModified": 1705263072, + "narHash": "sha256-DCqqaNWn9G81U+0Myyr36JrOKitcmS34oBWxqiHjabk=", "owner": "astro", "repo": "microvm.nix", - "rev": "d5553b1388f2947915c4cec6249b89474046573a", + "rev": "088ba565537eaef1041a87be5a44ca0daa4e1908", "type": "github" }, "original": { @@ -975,11 +973,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1703466376, - "narHash": "sha256-Wy8iF8u5KSzrTxg1hStTBmUjzzKdKyCyMOg8b/eTvVQ=", + "lastModified": 1705242886, + "narHash": "sha256-TLj334vRwFtSym3m+NnKcNCnKKPNoTC/TDZL40vmOso=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "64104a3c55593c903af78af86a4c9d2e5487a2d7", + "rev": "6b03a93296faf174b97546fd573c8b379f523a8d", "type": "github" }, "original": { @@ -1017,11 +1015,11 @@ ] }, "locked": { - "lastModified": 1704596958, - "narHash": "sha256-BK3Ohsz7m8X6qVKFxDtr8KVcHipfr5hYE9PDIJevHbQ=", + "lastModified": 1705282324, + "narHash": "sha256-LnURMA7yCM5t7et9O2+2YfGQh0FKAfE5GyahNDDzJVM=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f46800ac5a6e9f892fe36e50821c5d85794ecc62", + "rev": "49aaeecf41ae0a0944e2c627cb515bcde428a1d1", "type": "github" }, "original": { @@ -1056,11 +1054,11 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1705280248, - "narHash": "sha256-lMuky4SlMGcc7Ok33Cp7mwx+k5WRxXCCP1Rit8vtfEA=", + "lastModified": 1705283066, + "narHash": "sha256-uYvo7hr28saTQuzZ+t0v2dPAxfcVLs4WirMuFl/ykAA=", "owner": "oddlama", "repo": "nixos-extra-modules", - "rev": "3057e049e731190def8e9c5bea5467b3edcdd93e", + "rev": "cab2f4b0408cc072a8f9405daa542298b11ea87b", "type": "github" }, "original": { @@ -1092,11 +1090,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1704786394, - "narHash": "sha256-aJM0ln9fMGWw1+tjyl5JZWZ3ahxAA2gw2ZpZY/hkEMs=", + "lastModified": 1705312285, + "narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "b34a6075e9e298c4124e35c3ccaf2210c1f3a43b", + "rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0", "type": "github" }, "original": { @@ -1107,11 +1105,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704722960, - "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { @@ -1123,11 +1121,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1704588527, - "narHash": "sha256-YECXW8P0bqFM5e65Mu2fL4wZlonNWCuNEk7UQPsuJZ0=", + "lastModified": 1705193289, + "narHash": "sha256-oL5EAaZHiA3ABLdyKag/DgT+457vmELv8A+eaox2xsI=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "be8e58791dcfa2b98b512c2a1bdf3bd94a38790b", + "rev": "da839f74dc77c9826fa333b1bc2c8258fd6ffcbe", "type": "github" }, "original": { @@ -1136,6 +1134,24 @@ "type": "github" } }, + "nixpkgs-lib_2": { + "locked": { + "dir": "lib", + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1685801374, @@ -1186,16 +1202,16 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -1210,11 +1226,11 @@ ] }, "locked": { - "lastModified": 1704684968, - "narHash": "sha256-h+lSV/cfnfE5//dHefL154mgvaEmTz13ehI7eb/Hph0=", + "lastModified": 1705304162, + "narHash": "sha256-cKw0ODK8KmBr7GfxaDlSnaU9BoprNRbWI6Kvv36isDQ=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "17d7827cd61e7e6bdc732c4817ea4da26ab0b47b", + "rev": "b2b2ac38df53cdcae172302a11ae34448f4a2598", "type": "github" }, "original": { @@ -1271,6 +1287,22 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1681358109, + "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts_3", @@ -1282,11 +1314,11 @@ "pre-commit-hooks": "pre-commit-hooks_3" }, "locked": { - "lastModified": 1704812275, - "narHash": "sha256-uRe8BdZhuSiupXOxohaVP8LzJtBRG+ETP9PgzR60orI=", + "lastModified": 1705268857, + "narHash": "sha256-IMaCyPTp5Za0xVUorHRxq39VaUrEDuWA9MbV1z6eHR8=", "owner": "nix-community", "repo": "nixvim", - "rev": "b4ddb322889e2daf41333b4dbca2555da2e8bb7e", + "rev": "9e04eb3c3c6fcb6ea31e4d3633ea5fd7378906cb", "type": "github" }, "original": { @@ -1397,11 +1429,11 @@ ] }, "locked": { - "lastModified": 1704668415, - "narHash": "sha256-BMzNHFod53iiU4lkR5WHwqQCFmaCLq85sUCskXneXlA=", + "lastModified": 1705072518, + "narHash": "sha256-90dERRuG781f0EWjn2AOtScZqsTcpIFLpY8TN2VbkL8=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "44493e2b3c3ebcd39a9947e9ed9f2c2af164ec4c", + "rev": "274ae3979a0eacae422e1bbcf63b8b7a335e1114", "type": "github" }, "original": { @@ -1423,11 +1455,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1704725188, - "narHash": "sha256-qq8NbkhRZF1vVYQFt1s8Mbgo8knj+83+QlL5LBnYGpI=", + "lastModified": 1705229514, + "narHash": "sha256-itILy0zimR/iyUGq5Dgg0fiW8plRDyxF153LWGsg3Cw=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ea96f0c05924341c551a797aaba8126334c505d2", + "rev": "ffa9a5b90b0acfaa03b1533b83eaf5dead819a05", "type": "github" }, "original": { @@ -1458,7 +1490,6 @@ "spicetify-nix": "spicetify-nix", "stylix": "stylix", "systems": "systems_10", - "templates": "templates", "wired-notify": "wired-notify" } }, @@ -1487,6 +1518,25 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "flake-utils": "flake-utils_8", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1702865809, + "narHash": "sha256-K7caQe+KqjqTBFmJawmBjmm25S6bza5CXhAqbXFLyH8=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "b2aafcee4a8842cecfc877ff7dd271f333dc0fa8", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "spectrum": { "flake": false, "locked": { @@ -1580,6 +1630,21 @@ "type": "github" } }, + "systems_11": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1700,21 +1765,6 @@ "type": "github" } }, - "templates": { - "locked": { - "lastModified": 1696855554, - "narHash": "sha256-9VYXESOCqGGZ8HHl4LN51k+74Kf5Nf9czoqqIN7IEo0=", - "ref": "refs/heads/main", - "rev": "a6c35c2af9f26599e81002630329054b99efbe79", - "revCount": 11, - "type": "git", - "url": "https://git.lel.lol/patrick/nix-templates.git" - }, - "original": { - "type": "git", - "url": "https://git.lel.lol/patrick/nix-templates.git" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1739,20 +1789,18 @@ }, "wired-notify": { "inputs": { - "alejandra": "alejandra", + "flake-parts": "flake-parts_4", "nixpkgs": [ "nixpkgs" ], - "utils": [ - "flake-utils" - ] + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1699064982, - "narHash": "sha256-BAKfy2O0Df1JdNWn2rPsrjbIyOdGjJZeGxXZkvMZzvU=", + "lastModified": 1705313011, + "narHash": "sha256-ASZCgwE1rTnhlMfooTrcLIaxaQBdFKcpX7r8rYtrpE8=", "owner": "Toqozz", "repo": "wired-notify", - "rev": "9f2e1420e122030953734f795eaf8cf000002abd", + "rev": "2857b543b2fc0d1471ceb5409c846fbaa4ed8062", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e8a7ab4..254434d 100644 --- a/flake.nix +++ b/flake.nix @@ -61,7 +61,7 @@ inputs.flake-utils.follows = "flake-utils"; }; - templates.url = "git+https://git.lel.lol/patrick/nix-templates.git"; + #templates.url = "git+https://git.lel.lol/patrick/nix-templates.git"; impermanence.url = "github:nix-community/impermanence"; @@ -87,7 +87,6 @@ wired-notify = { url = "github:Toqozz/wired-notify"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.utils.follows = "flake-utils"; }; spicetify-nix.url = "github:the-argus/spicetify-nix"; diff --git a/hosts/desktopnix/net.nix b/hosts/desktopnix/net.nix index 7309a48..5a98a8f 100644 --- a/hosts/desktopnix/net.nix +++ b/hosts/desktopnix/net.nix @@ -1,15 +1,49 @@ -{config, ...}: { +{ + config, + #lib, + ... +}: { networking = { inherit (config.secrets.secrets.local.networking) hostId; }; systemd.network.networks = { "01-lan1" = { DHCP = "yes"; - matchConfig.MACAddress = config.secrets.secrets.local.networking.lan1.mac; + matchConfig.MACAddress = config.secrets.secrets.local.networking.interfaces.lan01.mac; networkConfig = { IPv6PrivacyExtensions = "yes"; MulticastDNS = true; }; }; + #"01-wlan1" = { + # address = ["192.168.1.2/24"]; + # matchConfig.MACAddress = config.secrets.secrets.local.networking.interfaces.wlan01.mac; + # networkConfig = { + # IPv6PrivacyExtensions = "yes"; + # MulticastDNS = true; + # }; + #}; }; + #networking.nat = { + # enable = true; + # externalInterface = "lan01"; + # internalInterfaces = ["wlan01"]; + #}; + #networking.firewall.enable = lib.mkForce false; + #hardware.wirelessRegulatoryDatabase = true; + #services.hostapd = { + # enable = true; + # radios.wlan01 = { + # band = "2g"; + # countryCode = "DE"; + # channel = 8; + # networks.wlan01 = { + # ssid = "patricks ist der tolleeste"; + # authentication = { + # saePasswordsFile = lib.writeText "supidupipasswort"; + # enableRecommendedPairwiseCiphers = true; + # }; + # }; + # }; + #}; } diff --git a/hosts/desktopnix/secrets/secrets.nix.age b/hosts/desktopnix/secrets/secrets.nix.age index 2bb40d00075dcf6758424a4b1868ee3cb968accd..c61b93812bbfc53c48d904352b8ad949decc1e59 100644 GIT binary patch delta 948 zcmY+<>u(bU003~2hvpKMm@FH*%*!MjrYr5W*Y$29{*Y?`G>*KC9&fM<$xL$j0 z@2+=kRhk$<1~VDi2$~U`7}O;$!WRb7X(VVcviXP+0Tm~Sjv(<71Rui~Kl=L*eqU|4 zde;Ql&ij2*BkQeJlw32LayUI99rs%b;)7$hpb$-F3W{5=69h6$0lHj-B_TrVlrQFD zq6#cTtEw6#%vh}9FuV*IY!Pg&;84*DVBZc_Wz$}Dc?Ll~!6-=##AHlJc(~Cz)RZ;U zftTG)$S;WwTywg@iBK`+HOdW=ifB&BhXQ$u@X!!#2>}^N<}H+ha|)b8E7egcOwx6C zCLp3*lMix;G8tRb(MAm2GD8{D7L2KECa>`|TPa)!;Wmb+SS)gV(P{}=I?W!hjs%qRxwEXEa5HGz_w zMx@Moe6+}Wn@TkmOcWK7RS8E@NqV!tv8As#AXK z5m1)3M$5#&vTZ2WwxPhVmlS0$ldd%esgmZxd<`h7BSex*z(P#RDTd@i5WSKJVSwFk z2eSrkmPvOYfeId-4kC?UMhaONxrkn+#cz`3_4y>A?El_uKz<{Qw#4|aWf?%08uBsbpKH@ENEZ4Z9Z`RJBQD|_aD z|MGIQjHoEfw!jSuAct<$k7WkKRoo^?43{3OW6VEu(9b1KRwX3_wfzqdso`W zR&K`+&Tvoty8PRX+4p;w)amf)#g5qb>fDnZhdccSqhi^Cxrsr}Mka#Y;CQ1a0%Z_jTW-*Y3En{5;b+Hl-l1j;z4@N3MHz?%s(U HUC;dsNnC7> literal 856 zcmZwC>xm$wUHg9R#rfJ&d*|ZJ& zFvJI(?u(Bx_d&OP@r(fiB4nGXhjoWlMhEB%GJ_`N?KYqH|PPT`J zKXpUP89wj$W-5Y#<_ z)h+=f$c!dKK2l*V50Thr3@hCnB=-gt-0s0dK7?f0Z}kl$fNl$}6(wCHgMo@zwHpLT z#CoX|NCh{=Q3}>9<6-0q6I+OAByeTb$qG|KBU>)fkfuP^B^eJYXE0Yx$C{_0l*Bi+ zL`2mvEmA45VRx~iT+Y)D^&d+snie|-3C~a!%t$zzIBaPQN<=)(^$ne}aMLAAB%P}x zEHY}ANUH5hQiYGjI4w~lr^)M`9ojS)M{{LHH;Kw7i<<~1?=fT=3c|4>6-;(AsrHIRKLAJr7g$sX@>pD&)7>s7G>k~m%%ZBd5D_hh zwU(3aBNBqLw_p9e;|!fN{k9&o!Drm<+n;>`6v4gVto4)yXMuRabg7h@X!3<>C8P_( zVpE6OMW>SBBh;^WSeo>da+@{^Xb+MF65}ImLXK@^1P{yYQ5{IMis3+KOw#;}UE$W3H@(0eSo|uw=iI@~wLiA* zKe7Akc>c=$XO>=m>9LOnm$&^mdsctz-nD-|#iZV7VSVZ9d3fW=-)=T6>Dbjjof(|R pR+FbD$G*M%Fu(Tx&B1$Lr0zg|z3|58H!hyJSif}VOlSGa+P|23J(U0e diff --git a/modules/config/net.nix b/modules/config/net.nix index 5139f44..e399371 100644 --- a/modules/config/net.nix +++ b/modules/config/net.nix @@ -14,6 +14,7 @@ lib.mapAttrs (_: v: v.mac) (config.secrets.secrets.local.networking.interfaces or {}) ); + nftables.enable = true; }; systemd.network = { enable = true; diff --git a/modules/config/nix.nix b/modules/config/nix.nix index 7ca89ab..d9e757e 100644 --- a/modules/config/nix.nix +++ b/modules/config/nix.nix @@ -49,7 +49,7 @@ nixpkgs.flake = inputs.nixpkgs; p.flake = inputs.nixpkgs; pkgs.flake = inputs.nixpkgs; - templates.flake = inputs.templates; + #templates.flake = inputs.templates; }; }; programs.nix-ld.enable = true; diff --git a/modules/config/system.nix b/modules/config/system.nix index 7e60859..38ff1f3 100644 --- a/modules/config/system.nix +++ b/modules/config/system.nix @@ -61,6 +61,8 @@ fd kitty.terminfo nvd + # fix pcscd + pcscliteWithPolkit.out ]; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; diff --git a/modules/services/adguardhome.nix b/modules/services/adguardhome.nix index 407b5f9..d45ec09 100644 --- a/modules/services/adguardhome.nix +++ b/modules/services/adguardhome.nix @@ -28,6 +28,7 @@ }; user_rules = [ "||adguardhome.${config.secrets.secrets.global.domains.web}^$dnsrewrite=${lib.net.cidr.host config.secrets.secrets.global.net.ips.elisabeth config.secrets.secrets.global.net.privateSubnet}" + "||nc.${config.secrets.secrets.global.domains.web}^$dnsrewrite=${lib.net.cidr.host config.secrets.secrets.global.net.ips.elisabeth config.secrets.secrets.global.net.privateSubnet}" "||fritz.box^$dnsrewrite=${lib.net.cidr.host 1 config.secrets.secrets.global.net.privateSubnet}" ]; dhcp.enabled = false; diff --git a/modules/services/samba.nix b/modules/services/samba.nix index 0406375..2cde5b9 100644 --- a/modules/services/samba.nix +++ b/modules/services/samba.nix @@ -87,11 +87,7 @@ user ? "smb", group ? "smb", hasBunker ? false, - persistRoot ? ( - if hasBunker - then "/bunker" - else "/panzer" - ), + persistRoot ? "/panzer", }: cfg: let config = { @@ -112,14 +108,17 @@ in { "${name}" = - {"path" = "/media/smb/${name}";} - // config; + config + // {"path" = "/media/smb/${name}";}; } // lib.optionalAttrs hasBunker { "${name}-important" = - {"path" = "/media/smb/${name}-important";} - // config; + config + // { + "path" = "/media/smb/${name}-important"; + "#persistRoot" = "/bunker"; + }; }; in lib.mkMerge [ diff --git a/modules/services/vaultwarden.nix b/modules/services/vaultwarden.nix index a7a4600..914f64e 100644 --- a/modules/services/vaultwarden.nix +++ b/modules/services/vaultwarden.nix @@ -55,7 +55,7 @@ in { services.vaultwarden = { enable = true; dbBackend = "sqlite"; - backupDir = "/tmp/vaultwardenBackup"; + backupDir = "/var/cache/backups/vaultwarden"; config = { dataFolder = lib.mkForce "/var/lib/vaultwarden"; extendedLogging = true; diff --git a/users/common/programs/nvim/nixvim/plugins/alpha.nix b/users/common/programs/nvim/nixvim/plugins/alpha.nix index faa1751..6797668 100644 --- a/users/common/programs/nvim/nixvim/plugins/alpha.nix +++ b/users/common/programs/nvim/nixvim/plugins/alpha.nix @@ -1,6 +1,6 @@ { programs.nixvim.plugins.alpha = { - enable = true; + #enable = true; layout = let padding = val: { type = "padding"; diff --git a/users/common/programs/nvim/nixvim/plugins/lsp.nix b/users/common/programs/nvim/nixvim/plugins/lsp.nix index e16ad8f..618781c 100644 --- a/users/common/programs/nvim/nixvim/plugins/lsp.nix +++ b/users/common/programs/nvim/nixvim/plugins/lsp.nix @@ -23,7 +23,7 @@ jq.enable = true; markdownlint.enable = true; rustfmt.enable = true; - sqlfluff.enable = true; + #sqlfluff.enable = true; shfmt.enable = true; stylua.enable = true; }; diff --git a/users/common/programs/obs.nix b/users/common/programs/obs.nix index df29f54..9bb3175 100644 --- a/users/common/programs/obs.nix +++ b/users/common/programs/obs.nix @@ -2,7 +2,7 @@ programs.obs-studio = { enable = true; plugins = with pkgs.obs-studio-plugins; [ - obs-backgroundremoval + #obs-backgroundremoval obs-pipewire-audio-capture obs-vaapi obs-nvfbc diff --git a/users/patrick/smb.nix b/users/patrick/smb.nix index 52112e6..cdfad62 100644 --- a/users/patrick/smb.nix +++ b/users/patrick/smb.nix @@ -8,6 +8,11 @@ remotePath = "patri-data"; automatic = true; } + { + inherit address credentials; + remotePath = "patri-data-important"; + automatic = true; + } #{ # inherit address credentials; # remotePath = "patri-paperless";