diff --git a/flake.lock b/flake.lock index 39a98ace..c449b016 100644 --- a/flake.lock +++ b/flake.lock @@ -55,11 +55,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1751224287, - "narHash": "sha256-8o40VtEBUyWP5rEMZ/siE8lBo2TSipLq+sLlG15G1dY=", + "lastModified": 1752508254, + "narHash": "sha256-9JXJvCK2CuTPKhCHomxHPCC2Af6dyGZZZ9BDnuWbYfw=", "owner": "Mic92", "repo": "buildbot-nix", - "rev": "69d14a5a9f82bd4ffc0303de25a5efdd1c13aa1b", + "rev": "c5b6bf0322f38bc6e6efcadfc5c929985a7dd417", "type": "github" }, "original": { @@ -73,11 +73,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1751021896, - "narHash": "sha256-L9u68mNPPiuW7+OV5BKbXaj/AENTiiuEx8+QnMBjRlU=", + "lastModified": 1752490162, + "narHash": "sha256-CFOuAHbc9PTt9HhjGQFf07bUCZKOahQ+vLt30J6u5fw=", "owner": "catppuccin", "repo": "nix", - "rev": "a6b0e34d083c79f08efabb1fd6ccf12b882daae6", + "rev": "7dc907c010e1612729c5d76cf614b5f7811bfe23", "type": "github" }, "original": { @@ -134,27 +134,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "nixpkgs": [ - "topology", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", - "owner": "numtide", - "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "dns": { "inputs": { "flake-utils": [ @@ -193,22 +172,6 @@ "type": "github" } }, - "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": [ @@ -216,11 +179,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -299,11 +262,11 @@ ] }, "locked": { - "lastModified": 1749636823, - "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "623c56286de5a3193aa38891a6991b28f9bab056", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -337,8 +300,7 @@ "gitignore_2": { "inputs": { "nixpkgs": [ - "topology", - "pre-commit-hooks", + "tangled-sh", "nixpkgs" ] }, @@ -366,11 +328,11 @@ ] }, "locked": { - "lastModified": 1748546644, - "narHash": "sha256-HMoXUvYz+p3vTK0hp445Vc7Od9F6oHV0FrRBPx1b2Fs=", + "lastModified": 1752499558, + "narHash": "sha256-BnrGmH1GOvNLEXAhMtxTgL/E/WmGA0s9xaGxbK0MaL0=", "owner": "tailscale", "repo": "golink", - "rev": "a98f4c4dffd89d9e2052904ac5abfa5b11016382", + "rev": "6b857a337f16c6960e5511dd4dc1e1b638c8b350", "type": "github" }, "original": { @@ -381,11 +343,11 @@ }, "hardware": { "locked": { - "lastModified": 1750837715, - "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=", + "lastModified": 1752048960, + "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "98236410ea0fe204d0447149537a924fb71a6d4f", + "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", "type": "github" }, "original": { @@ -426,11 +388,11 @@ ] }, "locked": { - "lastModified": 1751309344, - "narHash": "sha256-zmb01yyOXttyhJD3kRtW6Pkt1lsPbJvN3P92/GnI0tk=", + "lastModified": 1752603129, + "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", "owner": "nix-community", "repo": "home-manager", - "rev": "78fc50f1cf8e57a974ff4bfe654563fce43d6289", + "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", "type": "github" }, "original": { @@ -439,6 +401,43 @@ "type": "github" } }, + "htmx-src": { + "flake": false, + "locked": { + "narHash": "sha256-nm6avZuEBg67SSyyZUhjpXVNstHHgUxrtBHqJgowU08=", + "type": "file", + "url": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js" + }, + "original": { + "type": "file", + "url": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js" + } + }, + "htmx-ws-src": { + "flake": false, + "locked": { + "narHash": "sha256-2fg6KyEJoO24q0fQqbz9RMaYNPQrMwpZh29tkSqdqGY=", + "type": "file", + "url": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.2" + }, + "original": { + "type": "file", + "url": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.2" + } + }, + "ibm-plex-mono-src": { + "flake": false, + "locked": { + "lastModified": 1731402384, + "narHash": "sha256-OwUmrPfEehLDz0fl2ChYLK8FQM2p0G1+EMrGsYEq+6g=", + "type": "tarball", + "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip" + }, + "original": { + "type": "tarball", + "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip" + } + }, "iceshrimp": { "inputs": { "nixpkgs": [ @@ -459,6 +458,48 @@ "url": "https://iceshrimp.dev/pyrox/packaging" } }, + "indigo": { + "flake": false, + "locked": { + "lastModified": 1745333930, + "narHash": "sha256-83fIHqDE+dfnZ88HaNuwfKFO+R0RKAM1WxMfNh/Matk=", + "owner": "oppiliappan", + "repo": "indigo", + "rev": "e4e59280737b8676611fc077a228d47b3e8e9491", + "type": "github" + }, + "original": { + "owner": "oppiliappan", + "repo": "indigo", + "type": "github" + } + }, + "inter-fonts-src": { + "flake": false, + "locked": { + "lastModified": 1731687360, + "narHash": "sha256-5vdKKvHAeZi6igrfpbOdhZlDX2/5+UvzlnCQV6DdqoQ=", + "type": "tarball", + "url": "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip" + }, + "original": { + "type": "tarball", + "url": "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip" + } + }, + "lucide-src": { + "flake": false, + "locked": { + "lastModified": 1742302029, + "narHash": "sha256-OyPVtpnC4/AAmPq84Wt1r1Gcs48d9KG+UBCtZK87e9k=", + "type": "tarball", + "url": "https://github.com/lucide-icons/lucide/releases/download/0.483.0/lucide-icons-0.483.0.zip" + }, + "original": { + "type": "tarball", + "url": "https://github.com/lucide-icons/lucide/releases/download/0.483.0/lucide-icons-0.483.0.zip" + } + }, "mailserver": { "inputs": { "blobs": "blobs", @@ -472,11 +513,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1750949569, - "narHash": "sha256-dTWYv7EPfS5fM+61AUGUd7CD/8DGYdVw/KzGY7XgKq0=", + "lastModified": 1752060039, + "narHash": "sha256-MqcbN/PgfXOv8S4q6GcmlORd6kJZ3UlFNhzCvLOEe4I=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "b10c54606bb5293158c37b1fac3909dc3a26449f", + "rev": "80d21ed7a1ab8007597f7cd9adc26ebc98b9611f", "type": "gitlab" }, "original": { @@ -516,11 +557,11 @@ ] }, "locked": { - "lastModified": 1749379652, - "narHash": "sha256-gxM3X3fAuQvtTr+OHA2iEfXjTVKDt602IaNvDK5LbbI=", + "lastModified": 1752525931, + "narHash": "sha256-zHRb3btwcFlOFza296s0+Sv1DsWu0yQNwXxHy1jhlGs=", "owner": "nix-community", "repo": "nix-index", - "rev": "01a24237f519b5c6d2f9c6a81e0559596f424f80", + "rev": "9dd2d3b7ac0cdbcfcf5b7517b7251e624555b29a", "type": "github" }, "original": { @@ -536,11 +577,11 @@ ] }, "locked": { - "lastModified": 1751170039, - "narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=", + "lastModified": 1752441837, + "narHash": "sha256-FMH1OSSJp8Cx8MZHXz6KckxJGbCnVMotZNAH3v2WneU=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "9c932ae632d6b5150515e5749b198c175d8565db", + "rev": "839e02dece5845be3a322e507a79712b73a96ba2", "type": "github" }, "original": { @@ -577,11 +618,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { @@ -593,11 +634,11 @@ }, "nixpkgs-25_05": { "locked": { - "lastModified": 1749727998, - "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", + "lastModified": 1751741127, + "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", + "rev": "29e290002bfff26af1db6f64d070698019460302", "type": "github" }, "original": { @@ -609,11 +650,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1751159883, - "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", + "lastModified": 1752369545, + "narHash": "sha256-jj/HBJFSapTk4LfeJgNLk2wEE2BO6dgBYVRbXMNOCeM=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", + "rev": "65d21753676aaf55d8e67249138ab1286599a62b", "type": "github" }, "original": { @@ -624,11 +665,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751180975, - "narHash": "sha256-BKk4yDiXr4LdF80OTVqYJ53Q74rOcA/82EClXug8xsY=", + "lastModified": 1752596105, + "narHash": "sha256-lFNVsu/mHLq3q11MuGkMhUUoSXEdQjCHvpReaGP1S2k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a48741b083d4f36dd79abd9f760c84da6b4dc0e5", + "rev": "dab3a6e781554f965bde3def0aa2fda4eb8f1708", "type": "github" }, "original": { @@ -638,33 +679,6 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore_2", - "nixpkgs": [ - "topology", - "nixpkgs" - ], - "nixpkgs-stable": [ - "topology", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730797577, - "narHash": "sha256-SrID5yVpyUfknUTGWgYkTyvdr9J1LxUym4om3SVGPkg=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "1864030ed24a2b8b4e4d386a5eeaf0c5369e50a9", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -689,7 +703,7 @@ "snowfall-lib": "snowfall-lib", "stable": "stable", "systems": "systems_2", - "topology": "topology" + "tangled-sh": "tangled-sh" } }, "snowfall-lib": { @@ -716,6 +730,19 @@ "type": "github" } }, + "sqlite-lib-src": { + "flake": false, + "locked": { + "lastModified": 1706631843, + "narHash": "sha256-bJoMjirsBjm2Qk9KPiy3yV3+8b/POlYe76/FQbciHro=", + "type": "tarball", + "url": "https://sqlite.org/2024/sqlite-amalgamation-3450100.zip" + }, + "original": { + "type": "tarball", + "url": "https://sqlite.org/2024/sqlite-amalgamation-3450100.zip" + } + }, "stable": { "locked": { "lastModified": 1735563628, @@ -762,29 +789,32 @@ "type": "github" } }, - "topology": { + "tangled-sh": { "inputs": { - "devshell": "devshell", - "flake-utils": [ - "flake-utils" - ], + "gitignore": "gitignore_2", + "htmx-src": "htmx-src", + "htmx-ws-src": "htmx-ws-src", + "ibm-plex-mono-src": "ibm-plex-mono-src", + "indigo": "indigo", + "inter-fonts-src": "inter-fonts-src", + "lucide-src": "lucide-src", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks" + "sqlite-lib-src": "sqlite-lib-src" }, "locked": { - "lastModified": 1744142264, - "narHash": "sha256-h5KyodobZm8dx/HSNN+basgdmjxrQxudjrss4gAQpZk=", - "owner": "oddlama", - "repo": "nix-topology", - "rev": "f49121cbbf4a86c560638ade406d99ee58deb7aa", - "type": "github" + "lastModified": 1752602644, + "narHash": "sha256-N86kqzDoV/HpHlUIok7fQ1QWEXBatfBGHef9LXl6Jvw=", + "ref": "refs/heads/master", + "rev": "73d41fcd86b5c2ddd597c1c69c94a59789beff74", + "revCount": 936, + "type": "git", + "url": "https://tangled.sh/@tangled.sh/core" }, "original": { - "owner": "oddlama", - "repo": "nix-topology", - "type": "github" + "type": "git", + "url": "https://tangled.sh/@tangled.sh/core" } }, "treefmt-nix": { @@ -795,11 +825,11 @@ ] }, "locked": { - "lastModified": 1750931469, - "narHash": "sha256-0IEdQB1nS+uViQw4k3VGUXntjkDp7aAlqcxdewb/hAc=", + "lastModified": 1752055615, + "narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1", + "rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 06371695..50ded4e2 100644 --- a/flake.nix +++ b/flake.nix @@ -117,10 +117,9 @@ url = "git+https://git.pyrox.dev/pyrox/pkgs"; inputs.nixpkgs.follows = "nixpkgs"; }; - topology = { - url = "github:oddlama/nix-topology"; + tangled-sh = { + url = "git+https://tangled.sh/@tangled.sh/core"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; }; }; @@ -141,10 +140,8 @@ overlays = [ self.overlays.pyronet-packages self.overlays.nix-index - self.overlays.sway-unwrapped - self.overlays.linux-firmware + # self.overlays.linux-firmware inputs.golink.overlays.default - inputs.topology.overlays.default ]; in lib.mkFlake { @@ -160,7 +157,7 @@ homes = { # Default modules for all homes modules = with inputs; [ - nix-index-database.hmModules.nix-index + nix-index-database.homeModules.nix-index ctp.homeModules.catppuccin ]; }; @@ -172,7 +169,6 @@ agenix.nixosModules.default buildbot-nix.nixosModules.buildbot-worker ctp.nixosModules.catppuccin - topology.nixosModules.default ]; hosts = { # Zaphod, my personal Framework 16 laptop @@ -202,16 +198,5 @@ }; deploy = lib.mkDeploy { inherit (inputs) self; }; - topology = import inputs.topology { - pkgs = import inputs.nixpkgs { - inherit overlays; - system = "x86_64-linux"; - }; - modules = [ - ./topology.nix - { nixosConfigurations = self.nixosConfigurations; } - ]; - }; - }; } diff --git a/overlays/sway-unwrapped/default.nix b/overlays/sway-unwrapped/default.nix deleted file mode 100644 index eb28331c..00000000 --- a/overlays/sway-unwrapped/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -# deadnix: skip -_: -# deadnix: skip -final: prev: -let - inherit (prev.lib.strings) mesonOption mesonEnable; -in -{ - sway-unwrapped = prev.sway-unwrapped.overrideAttrs { - mesonFlags = [ - (mesonOption "sd-bus-provider" "libsystemd") - (mesonEnable "tray" true) - ]; - }; -} diff --git a/systems/x86_64-linux/prefect/services/caddy.nix b/systems/x86_64-linux/prefect/services/caddy.nix index a56e2355..5e48229a 100644 --- a/systems/x86_64-linux/prefect/services/caddy.nix +++ b/systems/x86_64-linux/prefect/services/caddy.nix @@ -21,6 +21,7 @@ in }; email = "pyrox@pyrox.dev"; virtualHosts = { + "mail.pyrox.dev" = { }; # Redirect old domains -> pyrox.dev "blog.pyrox.dev" = { serverAliases = [ diff --git a/topology.nix b/topology.nix deleted file mode 100644 index 493f725e..00000000 --- a/topology.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ config, ... }: -let - inherit (config.lib.topology) mkInternet mkConnection; - mkTS = addresses: { - inherit addresses; - network = "tailscale"; - virtual = true; - }; -in -{ - topology = { - - }; - nodes.internet = mkInternet { - connections = [ - (mkConnection "marvin" "wlp41s0") - (mkConnection "prefect" "enp1s0") - (mkConnection "thought" "enp1s0") - (mkConnection "zaphod" "wlp1s0") - ]; - }; - networks.tailscale = { - name = "Tailscale"; - cidrv4 = "100.64.0.0/10"; - cidrv6 = "fd7a:115c:a1e0::/96"; - }; - nodes = { - marvin = { - interfaces.enp42s0 = { - renderer.hidePhysicalConnections = true; - }; - interfaces.tailscale0 = - mkTS [ - "100.123.15.72" - "\n" - "fd7a:115c:a1e0:ab12:4843:cd96:627b:f48" - ] - // { - physicalConnections = [ - (mkConnection "prefect" "tailscale0") - (mkConnection "marvin" "tailscale0") - ]; - }; - }; - zaphod = { - interfaces = { - vboxnet0.virtual = true; - tailscale0 = - mkTS [ - "100.125.9.36" - "" - "fd7a:115c:a1e0:ab12:4843:cd96:627d:924" - ] - // { - physicalConnections = [ - (mkConnection "prefect" "tailscale0") - (mkConnection "marvin" "tailscale0") - ]; - }; - }; - }; - prefect = { - interfaces.tailscale0 = - mkTS [ - "100.93.63.54" - "\n" - "fd7a:115c:a1e0:ab12:4843:cd96:625d:3f36" - ] - // { - physicalConnections = [ - (mkConnection "marvin" "tailscale0") - (mkConnection "zaphod" "tailscale0") - ]; - }; - }; - thought = { }; - }; -}