diff --git a/flake.lock b/flake.lock index 9eff38b..dd1d0b8 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1680146283, - "narHash": "sha256-YZSw3O6uv6NqOJP+dol/njmzblRFIsrmqqb0HsL4mcQ=", + "lastModified": 1681674661, + "narHash": "sha256-UNaleEsACF/AZt2XKdml4OdbXOnnsDfvWAs6ojvG+VA=", "owner": "nix-community", "repo": "disko", - "rev": "4d9c89abde7ccedf743a01119d41fb880793bcba", + "rev": "ba53a0433d1694b96c63ea67db0f3e1292bb2b01", "type": "github" }, "original": { @@ -41,6 +41,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1678901627, @@ -57,12 +73,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -72,12 +91,15 @@ } }, "flake-utils_3": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -87,12 +109,15 @@ } }, "flake-utils_4": { + "inputs": { + "systems": "systems_3" + }, "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -119,11 +144,11 @@ }, "master": { "locked": { - "lastModified": 1680742364, - "narHash": "sha256-3195lvlV1NF+GeX8apkbYPjHjNvUNlsPHFkFnoJz3i4=", + "lastModified": 1681685842, + "narHash": "sha256-pm9uwv7SxvJR4U3SqSBymy7+0hpjGWiLoQngVHscJdA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e950a1ec78f8ef1f7bcce6b999c03a62bd3e796", + "rev": "30f7e63115986679cd0bdba9596ca66e47d1e809", "type": "github" }, "original": { @@ -145,11 +170,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1680365231, - "narHash": "sha256-vynHWSNc4tHnB2Dv7EvGTO5so3T9fEZJ+mPjTFifk5s=", + "lastModified": 1681647379, + "narHash": "sha256-fFbZCq3knW1G0G+gu5ifuUkVIotvfLBEy/VzFNts9h8=", "owner": "neovim", "repo": "neovim", - "rev": "9084948893f9c1669ab56061c8d04adabbb6c3cf", + "rev": "55d346fc2683a18256320eaae75eb4f3137dcced", "type": "github" }, "original": { @@ -161,32 +186,33 @@ }, "nix": { "inputs": { + "flake-compat": "flake-compat", "lowdown-src": "lowdown-src", "nixpkgs": "nixpkgs", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1677713084, - "narHash": "sha256-5aCmGZbsFcLIckCDfvnPD4clGPQI7qYAqHYlttN/Wkg=", + "lastModified": 1681477996, + "narHash": "sha256-F/u5BeTzvoNR7pFBl08PJC2RvVNw10YL1lZf1K0u9WU=", "owner": "NixOS", "repo": "nix", - "rev": "70d01bdec1f9e2d9deba8198e99f2ad0a663d08c", + "rev": "b41f73906896b02b8ffa3f9ea4ea8a18a61a34e0", "type": "github" }, "original": { "owner": "NixOS", "repo": "nix", - "rev": "70d01bdec1f9e2d9deba8198e99f2ad0a663d08c", + "rev": "b41f73906896b02b8ffa3f9ea4ea8a18a61a34e0", "type": "github" } }, "nixlib": { "locked": { - "lastModified": 1679187309, - "narHash": "sha256-H8udmkg5wppL11d/05MMzOMryiYvc403axjDNZy1/TQ=", + "lastModified": 1681001314, + "narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "44214417fe4595438b31bdb9469be92536a61455", + "rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4", "type": "github" }, "original": { @@ -203,11 +229,11 @@ ] }, "locked": { - "lastModified": 1679464055, - "narHash": "sha256-RiZpwkbm1GeKRqrTtGGsEDieJyplMSRG1bQzOZgY378=", + "lastModified": 1681464810, + "narHash": "sha256-G7AD9qMvD7lU+5K7tTZpUMXvQa0kFR5KKY9y/okcX+w=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d5cd198c80ee62a801a078ad991c99c0175971cf", + "rev": "5ad9f98194cfe7aa990929fb8cae28c500da7620", "type": "github" }, "original": { @@ -250,11 +276,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1680390120, - "narHash": "sha256-RyDJcG/7mfimadlo8vO0QjW22mvYH1+cCqMuigUntr8=", + "lastModified": 1681613598, + "narHash": "sha256-Ogkoma0ytYcDoMR2N7CZFABPo+i0NNo26dPngru9tPc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c1e2efaca8d8a3db6a36f652765d6c6ba7bb8fae", + "rev": "1040ce5f652b586da95dfd80d48a745e107b9eac", "type": "github" }, "original": { @@ -273,11 +299,11 @@ ] }, "locked": { - "lastModified": 1680381125, - "narHash": "sha256-OHTj82B2BRnPA8AmBsgwyETVZxoZEtPjihRl4skQRSo=", + "lastModified": 1681686079, + "narHash": "sha256-gZ2H5l6CETvvbL7cr/Y3WdjEoq2BuPJ5Jl/VaSvA1P0=", "owner": "Gerg-L", "repo": "nvim-flake", - "rev": "17c61afdadd8c2a41533056ea80ba176d62ffcfa", + "rev": "3db196a7827e511a245b44e44d121e0c91d6c4e1", "type": "github" }, "original": { @@ -310,11 +336,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1680404136, - "narHash": "sha256-06D8HJmRv4DdpEQGblMhx2Vm81SBWM61XBBIx7QQfo0=", + "lastModified": 1681613729, + "narHash": "sha256-9Qb0tHW8l1hgFkuB76n4VT9UNUaR7QL3CgmJ5hcVYEg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b93eb910f768f9788737bfed596a598557e5625d", + "rev": "b7a6670a28b01cd1f62879921e36be2c69c4137a", "type": "github" }, "original": { @@ -326,11 +352,11 @@ "spicetify-cli": { "flake": false, "locked": { - "lastModified": 1677851665, - "narHash": "sha256-C5J+OJjoiPOo/scVd48lTBJKKWial3TCkCIDBSerO+4=", + "lastModified": 1681572608, + "narHash": "sha256-cXLcFjvP9nUys8gkKrSYoJnqiOdKwHXcr4TjvXXlpwg=", "owner": "spicetify", "repo": "spicetify-cli", - "rev": "c9d8068d58d8c45f961ca42edcea47d7be904164", + "rev": "c9ca314115ee6457118698159a449d8b4f4de320", "type": "github" }, "original": { @@ -363,11 +389,11 @@ }, "stable": { "locked": { - "lastModified": 1680665430, - "narHash": "sha256-MTVhTukwza1Jlq2gECITZPFnhROmylP2uv3O3cSqQCE=", + "lastModified": 1681482634, + "narHash": "sha256-cT/nr3L8khEYZSGp8qqwxFH+/q4/547MfyOdSj6MhBk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5233fd2ba76a3accb5aaa999c00509a11fd0793c", + "rev": "fda0d99c2cbbb5c89d8855d258cb0821bd9113ad", "type": "github" }, "original": { @@ -397,13 +423,58 @@ "type": "github" } }, + "systems": { + "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, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "unstable": { "locked": { - "lastModified": 1680669251, - "narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=", + "lastModified": 1681648924, + "narHash": "sha256-pzi3HISK8+7mpEtv08Yr80wswyHKsz+RP1CROG1Qf6s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9c8ff8b426a8b07b9e0a131ac3218740dc85ba1e", + "rev": "f294325aed382b66c7a188482101b0f336d1d7db", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 54a9a1a..e0f311f 100644 --- a/flake.nix +++ b/flake.nix @@ -4,8 +4,8 @@ master.url = "github:NixOS/nixpkgs"; unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; stable.url = "github:NixOS/nixpkgs/nixos-22.11"; - #nix 2.14 - nix.url = "github:NixOS/nix/70d01bdec1f9e2d9deba8198e99f2ad0a663d08c"; + #nix 2.16 + nix.url = "github:NixOS/nix/b41f73906896b02b8ffa3f9ea4ea8a18a61a34e0"; #utilites flake-utils.url = "github:numtide/flake-utils"; nixos-generators = { diff --git a/modules/nix.nix b/modules/nix.nix index a2f64a9..0a95beb 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -8,9 +8,9 @@ inputs: { combined_flakes = ( #filter non-flakes from inputs - lib.attrsets.filterAttrs ( + lib.filterAttrs ( _: value: ( - !(lib.attrsets.hasAttrByPath ["flake"] value) || value.flake == false + !(lib.hasAttrByPath ["flake"] value) || value.flake == false ) ) inputs @@ -23,7 +23,7 @@ inputs: { }; in { #create registry from input flakes - nix.registry = lib.attrsets.mapAttrs (_: value: {flake = value;}) combined_flakes; + nix.registry = lib.mapAttrs (_: value: {flake = value;}) combined_flakes; #add all inputs to etc environment.etc = lib.mapAttrs' (name: value: lib.attrsets.nameValuePair "/nixpath/${name}" {source = value;}) combined_flakes; #source the etc paths to nixPath @@ -41,7 +41,7 @@ in { keep-outputs = true; keep-derivations = true; #become stable faster stupid - #use-xdg-base-directories = true; + use-xdg-base-directories = true; trusted-users = [ "root" "@wheel" diff --git a/pkgs/parrot/default.nix b/pkgs/parrot/default.nix index 22284d2..2ae5edd 100644 --- a/pkgs/parrot/default.nix +++ b/pkgs/parrot/default.nix @@ -17,8 +17,8 @@ rustPlatform.buildRustPackage { src = fetchFromGitHub { owner = "aquelemiguel"; repo = "parrot"; - rev = "b2c5ad7774616f488e9fc556082da545c5461c21"; - sha256 = "sha256-S73Ef4GjdHjkiQZnOqwFzuidWnSrMe92rc1qZ6rYdiY="; + rev = "6b1df01bd9cce1c0d8446dea720c4a32ff935514"; + hash = "sha256-f6YAdsq2ecsOCvk+A8wsUu+ywQnW//gCAkVLF0HTn8c="; }; buildInputs = [ @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage { yt-dlp ffmpeg ]}''; - cargoSha256 = "sha256-qPyuj5OxHrWz0YbrquCTTKZM3j1poXuioNNvn9z+xDQ="; + cargoSha256 = "sha256-RueYf+SzDwhqEb40iR0hViEuMinH72T480fuqJWJ+uk="; RUSTC_BOOTSTRAP = 1; } diff --git a/systems/gerg-desktop/containers/minecraft.nix b/systems/gerg-desktop/containers/minecraft.nix index 1b41041..05ab099 100644 --- a/systems/gerg-desktop/containers/minecraft.nix +++ b/systems/gerg-desktop/containers/minecraft.nix @@ -5,7 +5,6 @@ _: {...}: { privateNetwork = true; hostBridge = "bridge0"; localAddress = "192.168.1.10/24"; - localAddress6 = "2605:59c8:204b:bf00:200:ff:fe00:10/64"; bindMounts."/minecraft" = { hostPath = "/persist/minecraft"; isReadOnly = false; diff --git a/systems/gerg-desktop/containers/website.nix b/systems/gerg-desktop/containers/website.nix index aea7786..03bf4db 100644 --- a/systems/gerg-desktop/containers/website.nix +++ b/systems/gerg-desktop/containers/website.nix @@ -24,7 +24,6 @@ _: {...}: { privateNetwork = true; hostBridge = "bridge0"; localAddress = "192.168.1.11/24"; - localAddress6 = "2605:59c8:204b:bf00:200:ff:fe00:11/64"; bindMounts = { "/var" = { hostPath = "/persist/website/var"; diff --git a/systems/gerg-desktop/default.nix b/systems/gerg-desktop/default.nix index 25bb30b..544cf82 100644 --- a/systems/gerg-desktop/default.nix +++ b/systems/gerg-desktop/default.nix @@ -94,12 +94,6 @@ inputs: { prefixLength = 24; } ]; - ipv6.addresses = [ - { - address = "2605:59c8:204b:bf00:da5e:d3ff:fee5:4790"; - prefixLength = 64; - } - ]; }; }; bridges."bridge0".interfaces = ["eth0"]; diff --git a/systems/gerg-desktop/disko.nix b/systems/gerg-desktop/disko.nix index f1b0363..0347f31 100644 --- a/systems/gerg-desktop/disko.nix +++ b/systems/gerg-desktop/disko.nix @@ -9,7 +9,6 @@ _: { partitions = [ { name = "boot"; - type = "partition"; start = "0"; end = "1M"; part-type = "primary"; @@ -17,7 +16,6 @@ _: { } { name = "ESP"; - type = "partition"; start = "1M"; end = "1G"; bootable = true; @@ -29,7 +27,6 @@ _: { } { name = "zfsboot"; - type = "partition"; start = "1G"; end = "5G"; content = { @@ -39,7 +36,6 @@ _: { } { name = "swap"; - type = "partition"; start = "5G"; end = "21G"; content = { @@ -49,7 +45,6 @@ _: { } { name = "zfsroot"; - type = "partition"; start = "21G"; end = "100%"; content = { @@ -69,7 +64,6 @@ _: { partitions = [ { name = "BIOS"; - type = "partition"; start = "0"; end = "1M"; part-type = "primary"; @@ -77,7 +71,6 @@ _: { } { name = "ESP"; - type = "partition"; start = "1M"; end = "1G"; bootable = true; @@ -89,7 +82,6 @@ _: { } { name = "zfsboot"; - type = "partition"; start = "1G"; end = "5G"; content = { @@ -99,7 +91,6 @@ _: { } { name = "swap"; - type = "partition"; start = "5G"; end = "21G"; content = { @@ -109,7 +100,6 @@ _: { } { name = "zfsroot"; - type = "partition"; start = "21G"; end = "100%"; content = { @@ -143,27 +133,27 @@ _: { datasets = { "root" = { - zfs_type = "filesystem"; + type = "zfs_fs"; options.mountpoint = "legacy"; mountpoint = "/"; }; "nix" = { - zfs_type = "filesystem"; + type = "zfs_fs"; options.mountpoint = "legacy"; mountpoint = "/nix"; }; "var" = { - zfs_type = "filesystem"; + type = "zfs_fs"; options.mountpoint = "legacy"; mountpoint = "/var"; }; "persist" = { - zfs_type = "filesystem"; + type = "zfs_fs"; options.mountpoint = "legacy"; mountpoint = "/persist"; }; "home" = { - zfs_type = "filesystem"; + type = "zfs_fs"; options.mountpoint = "legacy"; mountpoint = "/home"; }; @@ -189,7 +179,7 @@ _: { }; datasets = { "boot" = { - zfs_type = "filesystem"; + type = "zfs_fs"; options.mountpoint = "legacy"; mountpoint = "/boot"; };