diff --git a/flake.lock b/flake.lock index 8d632a6..5250e74 100644 --- a/flake.lock +++ b/flake.lock @@ -21,17 +21,18 @@ }, "devshell": { "inputs": { + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "lastModified": 1711099426, + "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", "owner": "numtide", "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", "type": "github" }, "original": { @@ -54,6 +55,22 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, + "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-parts": { "inputs": { "nixpkgs-lib": [ @@ -62,11 +79,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -97,6 +114,24 @@ "inputs": { "systems": "systems_2" }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -111,41 +146,11 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1726745158, - "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ "nixvim", - "git-hooks", + "pre-commit-hooks", "nixpkgs" ] }, @@ -170,11 +175,11 @@ ] }, "locked": { - "lastModified": 1726985855, - "narHash": "sha256-NJPGK030Y3qETpWBhj9oobDQRbXdXOPxtu+YgGvZ84o=", + "lastModified": 1712317700, + "narHash": "sha256-rnkQ6qMhlxfjpCECkTMlFXHU/88QvC5KpdJWq5H6F1E=", "owner": "nix-community", "repo": "home-manager", - "rev": "04213d1ce4221f5d9b40bcee30706ce9a91d148d", + "rev": "782eed8bb64b27acaeb7c17be4a095c85e65717f", "type": "github" }, "original": { @@ -191,11 +196,11 @@ ] }, "locked": { - "lastModified": 1726902823, - "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=", + "lastModified": 1711625603, + "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=", "owner": "nix-community", "repo": "home-manager", - "rev": "14929f7089268481d86b83ed31ffd88713dcd415", + "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2", "type": "github" }, "original": { @@ -212,11 +217,11 @@ ] }, "locked": { - "lastModified": 1726742753, - "narHash": "sha256-QclpWrIFIg/yvWRiOUaMp1WR+TGUE9tb7RE31xHlxWc=", + "lastModified": 1711763326, + "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c03f85fa42d68d1056ca1740f3113b04f3addff2", + "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", "type": "github" }, "original": { @@ -259,11 +264,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1726755586, - "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", + "lastModified": 1712163089, + "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", + "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", "type": "github" }, "original": { @@ -275,11 +280,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1726755586, - "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -294,19 +299,17 @@ "devshell": "devshell", "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_4", - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1727031271, - "narHash": "sha256-OvekOLCj7kEq6X8Ncgyda1ud4BMD+OxHu7bdIsCtl/g=", + "lastModified": 1712299511, + "narHash": "sha256-yrBK6Jq0UuJjP+nc01OFNoKRRJgPNkbmwPpE4mD2Bis=", "owner": "nix-community", "repo": "nixvim", - "rev": "b473bdc5ae1260296d0f43f8f1fba6248b1ee078", + "rev": "f285a958c089ccbca9c5710d4a075683fa1af654", "type": "github" }, "original": { @@ -315,25 +318,31 @@ "type": "github" } }, - "nuschtosSearch": { + "pre-commit-hooks": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", + "gitignore": "gitignore", "nixpkgs": [ "nixvim", "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" ] }, "locked": { - "lastModified": 1726816132, - "narHash": "sha256-AbB0lgc0IbzLIxj1O3cosiMNAVQak4KJtvq9q8MjHhs=", - "owner": "NuschtOS", - "repo": "search", - "rev": "7733a39a1321057172d87e6251ded7cdeb67171e", + "lastModified": 1711760932, + "narHash": "sha256-DqUTQ2iAAqSDwMhKBqvi24v0Oc7pD3LCK/0FCG//TdA=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "c11e43aed6f17336c25cd120eac886b96c455731", "type": "github" }, "original": { - "owner": "NuschtOS", - "repo": "search", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", "type": "github" } }, @@ -394,24 +403,18 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, + "systems_3": { "locked": { - "lastModified": 1726734507, - "narHash": "sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4+N3L2w=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "ee41a466c2255a3abe6bc50fc6be927cdee57a9f", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "numtide", - "repo": "treefmt-nix", + "owner": "nix-systems", + "repo": "default", "type": "github" } } diff --git a/hosts/configuration.nix b/hosts/configuration.nix index 808f24a..4dfde72 100644 --- a/hosts/configuration.nix +++ b/hosts/configuration.nix @@ -26,10 +26,16 @@ networkmanager.enable = true; # networking.nameservers doesn't apply to resolvconf #nameservers = [ "9.9.9.9" "1.1.1.1" ]; - # resolvconf.extraConfig = "name_servers=\"9.9.9.9 1.1.1.1\""; + resolvconf.extraConfig = "name_servers=\"9.9.9.9 1.1.1.1\""; # Temporary since MagicDNS is broken hosts = { - "192.168.1.168" = [ "elnuhub.local" ]; + "192.168.0.26" = [ "elnuhub.local" ]; + "24.199.72.8" = [ "elnudrop.local" ]; + "100.64.0.1" = [ "elnu" ]; + "100.64.0.2" = [ "elnuhub" ]; + "100.64.0.3" = [ "elnudrop" ]; + "100.64.0.4" = [ "pang13" ]; + "100.64.0.5" = [ "elnucentre" ]; }; }; diff --git a/hosts/default.nix b/hosts/default.nix index 7e562ae..77425f8 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -120,30 +120,6 @@ in ]; }; - t480 = lib.nixosSystem { - inherit system; - specialArgs = { inherit user; }; - modules = configImports ++ [ - ./thinkpads - ./desktop.nix - { - boot.loader.grub.gfxmodeEfi = "1920x1080"; - networking.hostName = "t480"; - } - home-manager.nixosModules.home-manager { - home-manager = { - useUserPackages = true; - extraSpecialArgs = hmArgs; - users.${user} = { - imports = desktopHmImports ++ [ - (import ./thinkpads/home.nix) - ]; - }; - }; - } - ]; - }; - virtualbox = lib.nixosSystem { inherit system; specialArgs = { inherit user; }; diff --git a/hosts/thinkpads/default.nix b/hosts/thinkpads/default.nix index 206848e..f998798 100644 --- a/hosts/thinkpads/default.nix +++ b/hosts/thinkpads/default.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ ... }: { imports = [ (import ./hardware-configuration.nix) ]; @@ -11,20 +11,9 @@ grub = { efiSupport = true; device = "nodev"; - useOSProber = true; }; }; - services.tailscale.enable = true; - networking.nameservers = [ "100.100.100.100" ]; - networking.search = [ "junko-dace.ts.net" ]; - - networking.firewall = { - checkReversePath = "loose"; - trustedInterfaces = [ "tailscale0" ]; - allowedUDPPorts = [ config.services.tailscale.port ]; - }; - # Use X11 caps lock to escape remap in TTY console.useXkbConfig = true; services.xserver.xkbOptions = "caps:escape"; @@ -34,12 +23,10 @@ touchpad.tapping = true; }; - services.blueman.enable = true; - # audio controls and polybar module don't work on pipewire - # hardware.pulseaudio = { - # enable = true; - # support32Bit = true; - # }; - # services.pipewire.enable = false; + hardware.pulseaudio = { + enable = true; + support32Bit = true; + }; + services.pipewire.enable = false; } diff --git a/modules/startpage/html/index.html b/modules/startpage/html/index.html index 7712a28..76a6a5c 100644 --- a/modules/startpage/html/index.html +++ b/modules/startpage/html/index.html @@ -8,13 +8,13 @@
AniList - Jellyfin + Jellyfin Nyaa - + Git - + NixOS