diff --git a/flake.lock b/flake.lock index a908f48..3985fee 100644 --- a/flake.lock +++ b/flake.lock @@ -23,6 +23,29 @@ "type": "github" } }, + "attic": { + "inputs": { + "crane": "crane_2", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1705617092, + "narHash": "sha256-n9PK4O4X4S1JkwpkMuYm1wHZYJzRqif8g3RuVIPD+rY=", + "owner": "zhaofengli", + "repo": "attic", + "rev": "fbe252a5c21febbe920c025560cbd63b20e24f3b", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "main", + "repo": "attic", + "type": "github" + } + }, "base16": { "inputs": { "nixpkgs": [ @@ -94,19 +117,21 @@ }, "conduit": { "inputs": { - "crane": "crane_2", + "attic": "attic", + "crane": "crane_3", "fenix": "fenix", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", + "nix-filter": "nix-filter", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1703432212, - "narHash": "sha256-v/wpbH/xuh9SJjLeCQIDiCeEbyui2WuWvIjOIH+lx80=", + "lastModified": 1706784328, + "narHash": "sha256-W3Vyrd3VJPUl59TmSHQ234hW36mie+N4rxt8/YfsfO8=", "owner": "famedly", "repo": "conduit", - "rev": "ca6219723b0d562d86a69824720215f8a1851836", + "rev": "f4f2d05b5bb97506feb0563bcda4166a0e540886", "type": "gitlab" }, "original": { @@ -135,23 +160,18 @@ }, "crane_2": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": [ - "conduit", - "flake-utils" - ], "nixpkgs": [ "conduit", + "attic", "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" + ] }, "locked": { - "lastModified": 1688772518, - "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=", + "lastModified": 1702918879, + "narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=", "owner": "ipetkov", "repo": "crane", - "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e", + "rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb", "type": "github" }, "original": { @@ -161,6 +181,28 @@ } }, "crane_3": { + "inputs": { + "nixpkgs": [ + "conduit", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706473964, + "narHash": "sha256-Fq6xleee/TsX6NbtoRuI96bBuDHMU57PrcK9z1QEKbk=", + "owner": "ipetkov", + "repo": "crane", + "rev": "c798790eabec3e3da48190ae3698ac227aab770c", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "ref": "master", + "repo": "crane", + "type": "github" + } + }, + "crane_4": { "inputs": { "nixpkgs": [ "helix", @@ -181,7 +223,7 @@ "type": "github" } }, - "crane_4": { + "crane_5": { "inputs": { "nixpkgs": [ "limbusart", @@ -202,7 +244,7 @@ "type": "github" } }, - "crane_5": { + "crane_6": { "flake": false, "locked": { "lastModified": 1699217310, @@ -392,11 +434,11 @@ "pyproject-nix": "pyproject-nix_3" }, "locked": { - "lastModified": 1705053819, - "narHash": "sha256-x+jLR9mHV0bVryOWF+4xrK+atldiY1PeaCINEDalREw=", + "lastModified": 1705716305, + "narHash": "sha256-f5KBgSD40X1L1hRH7iX8S9g1qeIU13Iqnr30A6HdmkU=", "owner": "nix-community", "repo": "dream2nix", - "rev": "8300ad2d78f8388fa4ce25b0cd2fccd261dad579", + "rev": "774019d486a6c550edf669c40269acd526e27885", "type": "github" }, "original": { @@ -449,11 +491,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1689488573, - "narHash": "sha256-diVASflKCCryTYv0djvMnP2444mFsIG0ge5pa7ahauQ=", + "lastModified": 1705559032, + "narHash": "sha256-Cb+Jd1+Gz4Wi+8elPnUIHnqQmE1qjDRZ+PsJaPaAffY=", "owner": "nix-community", "repo": "fenix", - "rev": "39096fe3f379036ff4a5fa198950b8e79defe939", + "rev": "e132ea0eb0c799a2109a91688e499d7bf4962801", "type": "github" }, "original": { @@ -545,15 +587,12 @@ } }, "flake-utils": { - "inputs": { - "systems": "systems_2" - }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -563,6 +602,24 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "inputs": { "systems": "systems_3" }, @@ -580,7 +637,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "inputs": { "systems": "systems_4" }, @@ -598,7 +655,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "inputs": { "systems": "systems_6" }, @@ -618,17 +675,17 @@ }, "helix": { "inputs": { - "crane": "crane_3", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2", - "rust-overlay": "rust-overlay_3" + "crane": "crane_4", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_3", + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1705243592, - "narHash": "sha256-gH4Mt/0P8Xyr72xjOfSbOp93IrnO93yuEmPLGQL7FyA=", + "lastModified": 1705965568, + "narHash": "sha256-0ozg+SzRHjRBOtdGg4XJUKo11LcgiZl3heBBQ9cqniY=", "owner": "helix-editor", "repo": "helix", - "rev": "3f88a3f4e6f75bf04246a8015652931e640e0821", + "rev": "7d7ace551cd58f0b6d65af7a6dfa8f896d94724a", "type": "github" }, "original": { @@ -644,11 +701,11 @@ ] }, "locked": { - "lastModified": 1705169127, - "narHash": "sha256-j9OEtNxOIPWZWjbECVMkI1TO17SzlpHMm0LnVWKOR/g=", + "lastModified": 1705879479, + "narHash": "sha256-ZIohbyly1KOe+8I3gdyNKgVN/oifKdmeI0DzMfytbtg=", "owner": "nix-community", "repo": "home-manager", - "rev": "f2942f3385f1b35cc8a1abb03a45e29c9cb4d3c8", + "rev": "2d47379ad591bcb14ca95a90b6964b8305f6c913", "type": "github" }, "original": { @@ -700,8 +757,8 @@ }, "limbusart": { "inputs": { - "crane": "crane_4", - "flake-utils": "flake-utils_3", + "crane": "crane_5", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] @@ -856,7 +913,7 @@ }, "nci_2": { "inputs": { - "crane": "crane_5", + "crane": "crane_6", "dream2nix": "dream2nix_3", "mk-naked-shell": "mk-naked-shell_2", "nixpkgs": [ @@ -864,7 +921,7 @@ "nixpkgs" ], "parts": "parts_4", - "rust-overlay": "rust-overlay_4", + "rust-overlay": "rust-overlay_3", "treefmt": "treefmt_2" }, "locked": { @@ -901,6 +958,21 @@ "type": "github" } }, + "nix-filter": { + "locked": { + "lastModified": 1705332318, + "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, "nixd": { "inputs": { "flake-parts": "flake-parts", @@ -909,11 +981,11 @@ ] }, "locked": { - "lastModified": 1705244338, - "narHash": "sha256-o+IXgYlzUWftoslnmeSZ6LJKTwv/7wRZ/G0/Ds3UIkQ=", + "lastModified": 1705936382, + "narHash": "sha256-tdIPT++4ZAOQcZXDddqUKJO3lrL9gQ1u+SdY+gqBRRs=", "owner": "nix-community", "repo": "nixd", - "rev": "13142d8a2681dbd177d46741cc89a181b8f3dcc1", + "rev": "5b338749ab1eb158ba17d56a249ec28c5fce40c6", "type": "github" }, "original": { @@ -944,11 +1016,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1705187059, - "narHash": "sha256-dSj+iIYqLA+7/5rLXWfUxw9IXRm0w8Mrm39af8klUH0=", + "lastModified": 1705312285, + "narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "ef811636cc847355688804593282078bac7758d4", + "rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0", "type": "github" }, "original": { @@ -1044,11 +1116,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1705264459, - "narHash": "sha256-LzjTi9OTZ4GfOANFtIIxjLb0wdsFJTYz84oPDvp1IyU=", + "lastModified": 1705968978, + "narHash": "sha256-oGCGhR7hNA25awWv9SJbjyCyc0bxQ6iGtSUXMA3J4UY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3ea621c7ffc3a2bbf129b92c1069266baf1f2882", + "rev": "73652eca2e27591dd72a1d62b86b071e29a8d4c7", "type": "github" }, "original": { @@ -1058,14 +1130,30 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1702780907, + "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-wayland": { "flake": false, "locked": { - "lastModified": 1705080950, - "narHash": "sha256-ltAQAwwE6UyUcVh6PIf+RYpuxvMSLgc7Dqwfox6HwPg=", + "lastModified": 1705947648, + "narHash": "sha256-evBiSypfVvyHSXLfXy621h1gfeQqk5ivnySK5VvvrcA=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "8621ab0a5a9953c719aa21d3d078532613accdcb", + "rev": "01875294cf54755038d15ed61e3b657fdbede781", "type": "github" }, "original": { @@ -1090,6 +1178,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1702539185, + "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1700794826, "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", @@ -1105,13 +1209,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1705133751, - "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", + "lastModified": 1705856552, + "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", + "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", "type": "github" }, "original": { @@ -1123,11 +1227,11 @@ }, "nur": { "locked": { - "lastModified": 1705263290, - "narHash": "sha256-KdeOMVfM7Ih/HdlUnNCyOl3Zw1q8lTpOOAK0ilM6nrM=", + "lastModified": 1705952672, + "narHash": "sha256-ERHS2xHDcVIxSVsyzI5C0J6TUxR99hJMYlakbhN116k=", "owner": "nix-community", "repo": "NUR", - "rev": "e29cbed55ca5a2cf117662bd9179a85476184ff6", + "rev": "ad710d139b3d033144386445e1dcdbe833fa0f04", "type": "github" }, "original": { @@ -1395,7 +1499,7 @@ "nixinate": "nixinate", "nixos-hardware": "nixos-hardware", "nixos-persistence": "nixos-persistence", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-master": "nixpkgs-master", "nixpkgs-wayland": "nixpkgs-wayland", "nur": "nur", @@ -1407,11 +1511,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1689441253, - "narHash": "sha256-4MSDZaFI4DOfsLIZYPMBl0snzWhX1/OqR/QHir382CY=", + "lastModified": 1705523001, + "narHash": "sha256-TWq5vJ6m+9HGSDMsQAmz1TMegMi79R3TTyKjnPWsQp8=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "996e054f1eb1dbfc8455ecabff0f6ff22ba7f7c8", + "rev": "9d9b34354d2f13e33568c9c55b226dd014a146a0", "type": "github" }, "original": { @@ -1438,33 +1542,6 @@ } }, "rust-overlay_2": { - "inputs": { - "flake-utils": [ - "conduit", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "conduit", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688351637, - "narHash": "sha256-CLTufJ29VxNOIZ8UTg0lepsn3X03AmopmaLTTeHDCL4=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "f9b92316727af9e6c7fee4a761242f7f46880329", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { "inputs": { "flake-utils": [ "helix", @@ -1489,7 +1566,7 @@ "type": "github" } }, - "rust-overlay_4": { + "rust-overlay_3": { "flake": false, "locked": { "lastModified": 1699928012, @@ -1514,11 +1591,11 @@ "src": "src_2" }, "locked": { - "lastModified": 1705126864, - "narHash": "sha256-DxB5JZYbSY71G8TFIJfNSb4Ak1wKZReWHT0OcdUu/7Q=", + "lastModified": 1705818140, + "narHash": "sha256-lX7yto85pasJMpflzQwDoY6QgbPlFthP0Y2dGGN36/Y=", "owner": "yusdacra", "repo": "s3s-flake", - "rev": "c0ac2204c78aaca9e4b0c6c492d39d27c04d4d9b", + "rev": "0b1780674800310307ba785141381f1de265e508", "type": "github" }, "original": { @@ -1792,17 +1869,17 @@ "vscode-extensions": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1705195533, - "narHash": "sha256-df6LlJ96F2vpNDy12UUdJn6ny6akWb2Thi2H+78clbU=", + "lastModified": 1705886685, + "narHash": "sha256-7XspaCCyhboHve6SUvJVEjY6TfQCZjI73YNcQFNn5vA=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "2f6e7ffeb04039c8a53adc5432bf7c85d541eb28", + "rev": "0ddbe82f9ff7501ca85a834a5495b2fde2de9982", "type": "github" }, "original": { diff --git a/hosts/tkaronto/default.nix b/hosts/tkaronto/default.nix index 8b3087d..fcd4588 100644 --- a/hosts/tkaronto/default.nix +++ b/hosts/tkaronto/default.nix @@ -135,7 +135,7 @@ # warframe networking.firewall.allowedUDPPorts = [4990 4991 4992 4993 4994 4995]; # musikcube - networking.firewall.allowedTCPPorts = [7905 7906] ++ [6695 6696 6697 6698 6699]; + networking.firewall.allowedTCPPorts = [7905 7906] ++ [6695 6696 6697 6698 6699] ++ [50300]; # for tailscale networking.firewall.checkReversePath = "loose"; diff --git a/users/modules/vesktop/default.nix b/users/modules/vesktop/default.nix new file mode 100644 index 0000000..cfe9676 --- /dev/null +++ b/users/modules/vesktop/default.nix @@ -0,0 +1,3 @@ +{pkgs, ...}: { + home.packages = [pkgs.vesktop]; +} diff --git a/users/patriot/default.nix b/users/patriot/default.nix index d1bf06c..8ac903a 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -110,7 +110,7 @@ in { # ["fluxbox" "urxvt"] # desktop stuff # ["wayland" "foot"] - ["obsidian" "firefox"] + ["obsidian" "firefox" "vesktop"] # cli stuff ["zoxide" "zsh" "fzf" "starship" "direnv"] # dev stuff