diff --git a/flake.lock b/flake.lock index 9d8ad16..8f308cc 100644 --- a/flake.lock +++ b/flake.lock @@ -190,6 +190,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_5" + }, + "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" + } + }, "flakeCompat": { "flake": false, "locked": { @@ -235,11 +253,11 @@ ] }, "locked": { - "lastModified": 1758593331, - "narHash": "sha256-p+904PfmINyekyA/LieX3IYGsiFtExC00v5gSYfJtpM=", + "lastModified": 1757578556, + "narHash": "sha256-w1PGkTGow5XzsjccV364No46rkuGxTqo7m/4cfhnkIk=", "owner": "nix-community", "repo": "home-manager", - "rev": "9a2dc0efbc569ce9352a6ffb8e8ec8dbc098e142", + "rev": "b7112b12ea5b8c3aa6af344498ed9ca27dd03ba3", "type": "github" }, "original": { @@ -253,11 +271,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1758531979, - "narHash": "sha256-iRv5afKzuu6SkwztqMwZ33161CzBJsyeRHp0uviN9TI=", + "lastModified": 1755680610, + "narHash": "sha256-g7/g5o0spemkZCzPa8I21RgCmN0Kv41B5z9Z5HQWraY=", "owner": "hyprwm", "repo": "contrib", - "rev": "de79078fd59140067e53cd00ebdf17f96ce27846", + "rev": "04721247f417256ca96acf28cdfe946cf1006263", "type": "github" }, "original": { @@ -311,11 +329,11 @@ ] }, "locked": { - "lastModified": 1758192433, - "narHash": "sha256-CR6RnqEJSTiFgA6KQY4TTLUWbZ8RBnb+hxQqesuQNzQ=", + "lastModified": 1756891319, + "narHash": "sha256-/e6OXxzbAj/o97Z1dZgHre4bNaVjapDGscAujSCQSbI=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "c44e749dd611521dee940d00f7c444ee0ae4cfb7", + "rev": "621e2e00f1736aa18c68f7dfbf2b9cff94b8cc4d", "type": "github" }, "original": { @@ -342,11 +360,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1758542519, - "narHash": "sha256-NHEzK6MN8Tv9YrnJb2A9KxcOI2cCsKRqZOC5kUeG8Aw=", + "lastModified": 1757508065, + "narHash": "sha256-aZCTbfKkxsEinY5V7R0NYuuitKLYc8ig8T91+yDMGJ0=", "ref": "refs/heads/main", - "rev": "70a7047ee175d2e7fca1575d50a3738ac40fd2c6", - "revCount": 6446, + "rev": "46174f78b374b6cea669c48880877a8bdcf7802f", + "revCount": 6418, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -462,11 +480,11 @@ ] }, "locked": { - "lastModified": 1757694755, - "narHash": "sha256-j+w5QUUr2QT/jkxgVKecGYV8J7fpzXCMgzEEr6LG9ug=", + "lastModified": 1753819801, + "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "5ffdfc13ed03df1dae5084468d935f0a3f2c9a4c", + "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc", "type": "github" }, "original": { @@ -541,11 +559,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1757972732, - "narHash": "sha256-V2lQfZyVMzlyQNtY7VZbJhh+fg9KsNztJynXBs3OgUc=", + "lastModified": 1750371999, + "narHash": "sha256-de87tFOEhJiXTHNzG3LcwxGR1a/D6v+nC+9+V1GW1Zs=", "owner": "hyprwm", "repo": "hyprpicker", - "rev": "6f32582d2282fd97f18e54db0f45f53f18edde4f", + "rev": "d6a1363a86cd99460f0020134e455d921e8bacd8", "type": "github" }, "original": { @@ -564,11 +582,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1757678186, - "narHash": "sha256-YuvkWCVZKiUoUC2tx/N5KkPXWmje2UbeENYkOc2C31Y=", + "lastModified": 1756066004, + "narHash": "sha256-L5AX14cRzCikpSkL4jgC7WKdVzZ9K4c3dWe445ogZ+o=", "owner": "hyprwm", "repo": "hyprsunset", - "rev": "72071709f58bc2fed8546288af295aa9153a287f", + "rev": "fa2f7dde11eba8a6835ecedbbd144c48017156af", "type": "github" }, "original": { @@ -727,6 +745,26 @@ "type": "github" } }, + "iamb": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_6", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1756876216, + "narHash": "sha256-ZVRwUbMrGeH3XZrFt/YoCOxXR6TWwkXcqWwWAA+F+Rs=", + "owner": "ulyssa", + "repo": "iamb", + "rev": "7b1dc93f3a01f4e8b138922a27bb3ce60d7be1f9", + "type": "github" + }, + "original": { + "owner": "ulyssa", + "repo": "iamb", + "type": "github" + } + }, "ixx": { "inputs": { "flake-utils": [ @@ -759,11 +797,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757943327, - "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", + "lastModified": 1757103352, + "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", + "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", "type": "github" }, "original": { @@ -805,11 +843,43 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1758262103, - "narHash": "sha256-aBGl3XEOsjWw6W3AHiKibN7FeoG73dutQQEqnd/etR8=", + "lastModified": 1742800061, + "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01", + "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1757487488, + "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { + "locked": { + "lastModified": 1757034884, + "narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ca77296380960cd497a765102eeb1356eb80fed0", "type": "github" }, "original": { @@ -885,11 +955,43 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1758427187, - "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1757487488, + "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", "type": "github" }, "original": { @@ -899,7 +1001,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_9": { "locked": { "lastModified": 1743315132, "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", @@ -915,42 +1017,10 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1742800061, - "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1758427187, - "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_9", "nixvim": "nixvim_2" }, "locked": { @@ -970,7 +1040,7 @@ "nixvim_2": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_10", "nuschtosSearch": "nuschtosSearch" }, "locked": { @@ -990,14 +1060,14 @@ "nur": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1758640565, - "narHash": "sha256-ElrlkD9NTp27BR+K8RO6KYF/5gHURj6b9Vpan/bf8wk=", + "lastModified": 1757591071, + "narHash": "sha256-u5Xr/Tx5mYIcrVz7zwx9YvOWQJEei0T8mRJsr3/aBoA=", "owner": "nix-community", "repo": "NUR", - "rev": "af2e804a55892665adfd0b30c75088b1ad1b462c", + "rev": "a625a24a40e4a4c21fcb7bbaa5869b0766fc0eab", "type": "github" }, "original": { @@ -1008,7 +1078,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -1040,11 +1110,11 @@ ] }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1757239681, + "narHash": "sha256-E9spYi9lxm2f1zWQLQ7xQt8Xs2nWgr1T4QM7ZjLFphM=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "ab82ab08d6bf74085bd328de2a8722c12d97bd9d", "type": "github" }, "original": { @@ -1062,8 +1132,9 @@ "hyprland": "hyprland", "hyprpicker": "hyprpicker", "hyprsunset": "hyprsunset", + "iamb": "iamb", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_8", "nixvim": "nixvim", "nur": "nur", "sops-nix": "sops-nix" @@ -1086,16 +1157,34 @@ "type": "github" } }, - "sops-nix": { + "rust-overlay": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1758425756, - "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=", + "lastModified": 1756694554, + "narHash": "sha256-z/Iy4qvcMqzhA2IAAg71Sw4BrMwbBHvCS90ZoPLsnIk=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "b29e5365120f344fe7161f14fc9e272fcc41ee56", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "sops-nix": { + "inputs": { + "nixpkgs": "nixpkgs_12" + }, + "locked": { + "lastModified": 1757503115, + "narHash": "sha256-S9F6bHUBh+CFEUalv/qxNImRapCxvSnOzWBUZgK1zDU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762", + "rev": "0bf793823386187dff101ee2a9d4ed26de8bbf8c", "type": "github" }, "original": { @@ -1164,6 +1253,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/flake.nix b/flake.nix index 74cece5..c8cd3d1 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,7 @@ nixvim.url = "github:ahwxorg/nixvim-config"; sops-nix.url = "github:Mic92/sops-nix"; disko.url = "github:nix-community/disko/latest"; + iamb.url = "github:ulyssa/iamb"; }; outputs = @@ -24,6 +25,7 @@ nixpkgs, sops-nix, disko, + iamb, ... }@inputs: let diff --git a/hosts/dandelion/default.nix b/hosts/dandelion/default.nix index f950bc8..7349609 100644 --- a/hosts/dandelion/default.nix +++ b/hosts/dandelion/default.nix @@ -35,20 +35,20 @@ allowedUDPPorts = [ 5201 ]; - #interfaces."ens4s1".allowedTCPPorts = [ - # # allow everything for local link - # { - # from = 0; - # to = 60000; - # } - #]; - #interfaces."ens4s1".allowedUDPPorts = [ - # # allow everything for local link - # { - # from = 0; - # to = 65536; - # } - #]; + interfaces."ens4s1".allowedTCPPorts = [ + # allow everything for local link + { + from = 1; + to = 65354; + } + ]; + interfaces."ens4s1".allowedUDPPorts = [ + # allow everything for local link + { + from = 1; + to = 65354; + } + ]; }; }; @@ -82,7 +82,6 @@ services.zfs = { autoScrub.enable = true; - autoScrub.interval = "weekly"; trim.enable = true; }; diff --git a/modules/core/program.nix b/modules/core/program.nix index a0acdd6..7739cd0 100644 --- a/modules/core/program.nix +++ b/modules/core/program.nix @@ -15,5 +15,6 @@ git dig traceroute + inputs.iamb.packages.${pkgs.stdenv.targetPlatform.system}.default ]; } diff --git a/modules/services/librey-proxy.nix b/modules/services/librey-proxy.nix index 09e95b4..2bd3e7d 100644 --- a/modules/services/librey-proxy.nix +++ b/modules/services/librey-proxy.nix @@ -3,7 +3,7 @@ services = { anubis.instances.librey = { settings = { - TARGET = "http://localhost:8078"; + TARGET = "http://localhost:8080"; BIND = ":8079"; BIND_NETWORK = "tcp"; }; diff --git a/modules/services/nfs.nix b/modules/services/nfs.nix index 40e4aa5..2f9d3c4 100644 --- a/modules/services/nfs.nix +++ b/modules/services/nfs.nix @@ -9,7 +9,7 @@ # Network shares samba = { package = pkgs.samba; - # ^^ `samba4Full` is compiled with avahi, ldap, AD etc support (compared to the default package, `samba`. samba4Full gives issue, however) + # ^^ `samba4Full` is compiled with avahi, ldap, AD etc support (compared to the default package, `samba` # Required for samba to register mDNS records for auto discovery # See https://github.com/NixOS/nixpkgs/blob/592047fc9e4f7b74a4dc85d1b9f5243dfe4899e3/pkgs/top-level/all-packages.nix#L27268 enable = true; @@ -19,16 +19,6 @@ writable = "true"; comment = "Hello world!"; }; - shares.violet = { - path = "/spinners/violet"; - writable = "true"; - comment = "Hello world!"; - }; - shares.ahwx = { - path = "/spinners/ahwx"; - writable = "true"; - comment = "Hello world!"; - }; }; avahi = { publish.enable = true; diff --git a/modules/services/ollama.nix b/modules/services/ollama.nix index 8676727..95b7c8d 100644 --- a/modules/services/ollama.nix +++ b/modules/services/ollama.nix @@ -5,5 +5,5 @@ # loadModels = [ "llama3.2:3b" "deepseek-r1:1.5b"]; # acceleration = "rocm"; # nope, 5700XT is too old for this }; - services.open-webui.enable = false; + services.open-webui.enable = true; } diff --git a/modules/services/violet.nix b/modules/services/violet.nix index 53c8b39..ae3d19a 100644 --- a/modules/services/violet.nix +++ b/modules/services/violet.nix @@ -13,7 +13,6 @@ ++ [ (import ./guacamole.nix) ] ++ [ (import ./gokapi.nix) ] ++ [ (import ./jellyfin.nix) ] - # ++ [ (import ./jitsi-meet.nix) ] ++ [ (import ./librey-proxy.nix) ] ++ [ (import ./lidarr.nix) ] ++ [ (import ./matrix/default.nix) ] @@ -35,4 +34,5 @@ ++ [ (import ./tailscale.nix) ] ++ [ (import ./vaultwarden.nix) ]; # ++ [ (import ./smart-monitoring.nix) ] + # ++ [ (import ./jitsi-meet.nix) ] }