diff --git a/flake.lock b/flake.lock index 5fa47d62..61c9a08d 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1695380190, - "narHash": "sha256-v1TwBU/mKroZZPWYXujAfOHfIaQw44swa50Jgdkr7OE=", + "lastModified": 1696468923, + "narHash": "sha256-qSM7NKgf8LcZ5hjKHZ8ANFI8+LQivvAypbhJHBJmYFM=", "owner": "nix-community", "repo": "disko", - "rev": "98a6ab9b52f8b06db9c3116b1761bbeaf9484408", + "rev": "cde886a1c97ef2399b4f91409db045785020291f", "type": "github" }, "original": { @@ -28,11 +28,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1695363721, - "narHash": "sha256-+VRVzXpWdSsZPcR2Cg9Q5LKhUQDVvoQFfH4V8iKNAkU=", + "lastModified": 1696573333, + "narHash": "sha256-4f3hs1iUzACbI7FYJWwNUGSt8h/8j+YescAssu771E0=", "owner": "nix-community", "repo": "fenix", - "rev": "cb59ad177b991978ff571388bf8df6fed32e6bc2", + "rev": "e4092b233c012a469de7b34ef10740101197835e", "type": "github" }, "original": { @@ -57,22 +57,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1627913399, - "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -130,21 +114,6 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1634851050, - "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -175,11 +144,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1695428925, - "narHash": "sha256-6sboXstaA0j1JpKshbe2zQtRY+LygOUBd+kJ4URscSg=", + "lastModified": 1696642103, + "narHash": "sha256-cbqYTfPrinbMSaljex1TmPNtmRP6f4uQjHngzg+oGws=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "fb80cbe415835a7e0c64e2038d0fc56e8aba0ab4", + "rev": "38e242953df06b7b90a09fd7a1480a9cfcdd6ba8", "type": "github" }, "original": { @@ -196,11 +165,11 @@ ] }, "locked": { - "lastModified": 1693997747, - "narHash": "sha256-W23nMGmDnyBgxO8O/9jcZtiSpa0taMNcRAD1das/ttw=", + "lastModified": 1696339530, + "narHash": "sha256-rb954Rc+IyUiiXoIuQOJRp0//zH/WeMYZ3yJ5CccODA=", "owner": "hyprwm", "repo": "contrib", - "rev": "5b67181fced4fb06d26afcf9614b35765c576168", + "rev": "2e3f8ac2a3f1334fd2e211b07ed76b4215bb0542", "type": "github" }, "original": { @@ -257,11 +226,11 @@ ] }, "locked": { - "lastModified": 1695413712, - "narHash": "sha256-t/9NXkzYK3eIeIGbfzSziMu8eVvk8Fa9nXbjdISzFUw=", + "lastModified": 1696468271, + "narHash": "sha256-ZpzAIqs8VmgRDz+rBe28+TErlXkhzrgPKg3YKYraReE=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "20ad94744fe614abb2ccd889f682b9df628fec0f", + "rev": "cc55064e30efdf1b1ad3df4d39983314ef440aae", "type": "github" }, "original": { @@ -300,11 +269,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1694973762, - "narHash": "sha256-mzM4j1HVSZA9rG0+SiFLjCFhT9aV2QekRRB3LQQisFs=", + "lastModified": 1696441224, + "narHash": "sha256-HYuoi7TSSHpRXW9wqCgxjPe9mEWnsAzIWIl3Z9oUA+k=", "owner": "numtide", "repo": "nixos-anywhere", - "rev": "17efd86530884d11bff52148a5ff2259e2e869ed", + "rev": "ffcbf8c326f05f7a66563a12e57562f53af2c28b", "type": "github" }, "original": { @@ -315,11 +284,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1695109627, - "narHash": "sha256-4rpyoVzmunIG6xWA/EonnSSqC69bDBzciFi6SjBze/0=", + "lastModified": 1696614066, + "narHash": "sha256-nAyYhO7TCr1tikacP37O9FnGr2USOsVBD3IgvndUYjM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cb4dc98f776ddb6af165e6f06b2902efe31ca67a", + "rev": "bb2db418b616fea536b1be7f6ee72fb45c11afe0", "type": "github" }, "original": { @@ -410,11 +379,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1695145219, - "narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=", + "lastModified": 1696375444, + "narHash": "sha256-Sv0ICt/pXfpnFhTGYTsX6lUr1SljnuXWejYTI2ZqHa4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ba549eafcf3e33405e5f66decd1a72356632b96", + "rev": "81e8f48ebdecf07aab321182011b067aafc78896", "type": "github" }, "original": { @@ -426,11 +395,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1695272228, - "narHash": "sha256-4uw2OdJPVyjdB+xcDst9SecrNIpxKXJ2usN3M5HVa7o=", + "lastModified": 1696374741, + "narHash": "sha256-gt8B3G0ryizT9HSB4cCO8QoxdbsHnrQH+/BdKxOwqF0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55ac2a9d2024f15c56adf20da505b29659911da8", + "rev": "8a4c17493e5c39769f79117937c79e1c88de6729", "type": "github" }, "original": { @@ -442,11 +411,11 @@ }, "nurpkgs": { "locked": { - "lastModified": 1695434182, - "narHash": "sha256-SRnWqW5+tPa+WhNB5i/cZ7LjesdT/3A+LRULWVNbJ2U=", + "lastModified": 1696642767, + "narHash": "sha256-z9WXjP5AvFkiBfvV575w9i4yxPGBelRMQHn3rIpUKHs=", "owner": "nix-community", "repo": "NUR", - "rev": "f024b6efcc7bb61c3e55aa906a60531c9e262197", + "rev": "8e43358da9715939f97df34078d24b3d344d6318", "type": "github" }, "original": { @@ -477,28 +446,6 @@ "type": "github" } }, - "peerix": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1661429880, - "narHash": "sha256-7/m468XZW82O7KhDtRdQ7RnPsh83+tA8N4U0FncFo1U=", - "owner": "cid-chan", - "repo": "peerix", - "rev": "32cd1b098b83c90726848bd6726f74e72c557abb", - "type": "github" - }, - "original": { - "owner": "cid-chan", - "repo": "peerix", - "type": "github" - } - }, "root": { "inputs": { "disko": "disko", @@ -515,18 +462,17 @@ "nixpkgs-unstable": "nixpkgs-unstable", "nurpkgs": "nurpkgs", "nvfetcher": "nvfetcher", - "peerix": "peerix", "sops-nix": "sops-nix" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1695220688, - "narHash": "sha256-T54aKrnKMI7Cg2mid5h46mWAXd0xc0pYn0fju3dwXf0=", + "lastModified": 1696546231, + "narHash": "sha256-gueDbtDnrGP6fhI6j17vaImGETi/3aYFVQ6591l0YsI=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "d6fef2c7e3be2783369b4b84e320b163b8fd291a", + "rev": "03c56030350decb7f1c13c27eb7547ba5ed6b201", "type": "github" }, "original": { @@ -546,11 +492,11 @@ ] }, "locked": { - "lastModified": 1695284550, - "narHash": "sha256-z9fz/wz9qo9XePEvdduf+sBNeoI9QG8NJKl5ssA8Xl4=", + "lastModified": 1696320910, + "narHash": "sha256-fbuEc6wylH+0VxG48lhPBK+SQJHfo2lusUwWHZNipIM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2f375ed8702b0d8ee2430885059d5e7975e38f78", + "rev": "746c7fa1a64c1671a4bf287737c27fdc7101c4c2", "type": "github" }, "original": { @@ -614,18 +560,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1695277534, - "narHash": "sha256-LEIUGXvKR5DYFQUTavC3yifcObvG4XZUUHfxXmu8nEM=", + "lastModified": 1696410538, + "narHash": "sha256-ecDhdYLXWHsxMv+EWG36mCNDvzRbu9qfjH7dLxL7aGM=", "owner": "wlroots", "repo": "wlroots", - "rev": "98a745d926d8048bc30aef11b421df207a01c279", + "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "98a745d926d8048bc30aef11b421df207a01c279", + "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc", "type": "gitlab" } }, diff --git a/flake.nix b/flake.nix index eaa480b0..058d6fda 100644 --- a/flake.nix +++ b/flake.nix @@ -21,10 +21,6 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs-stable.follows = "nixpkgs"; }; - peerix = { - url = "github:cid-chan/peerix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; impermanence.url = "github:nix-community/impermanence"; disko = { diff --git a/keys/peerix/yui.pub b/keys/peerix/yui.pub deleted file mode 100644 index 7fcc7524..00000000 --- a/keys/peerix/yui.pub +++ /dev/null @@ -1 +0,0 @@ -peerix-yui:mBGNsfAi3Dd75XHRkWumahuVYY60Hp0BBkruqBt1LPA= \ No newline at end of file diff --git a/nixos-config/default.nix b/nixos-config/default.nix index 6f75eba8..cd114a83 100644 --- a/nixos-config/default.nix +++ b/nixos-config/default.nix @@ -6,7 +6,6 @@ }: { imports = [ flake-inputs.home-manager.nixosModules.home-manager - flake-inputs.peerix.nixosModules.peerix flake-inputs.sops-nix.nixosModules.sops flake-inputs.hyprland.nixosModules.default @@ -28,7 +27,6 @@ trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - (builtins.readFile ../keys/peerix/yui.pub) ]; }; @@ -58,16 +56,6 @@ validateSopsFiles = false; }; - services.peerix = { - enable = true; - openFirewall = true; - user = "peerix"; - group = "peerix"; - - # Work around https://github.com/cid-chan/peerix/issues/11 - package = flake-inputs.peerix.packages.${pkgs.system}.peerix; - }; - nixpkgs.overlays = [ flake-inputs.nurpkgs.overlay ]; @@ -115,21 +103,13 @@ users = { defaultUserShell = pkgs.zsh; - groups = { - peerix = {}; - network = {}; - }; + groups.network = {}; users = { tlater = { isNormalUser = true; extraGroups = ["wheel" "video" "network"]; }; - - peerix = { - group = "peerix"; - isSystemUser = true; - }; }; }; diff --git a/nixos-config/yui/default.nix b/nixos-config/yui/default.nix index 684fc808..371ca89b 100644 --- a/nixos-config/yui/default.nix +++ b/nixos-config/yui/default.nix @@ -67,18 +67,6 @@ in { fileSystems."/nix".options = ["defaults" "noatime"]; - sops.secrets = { - "peerix/yui" = { - owner = config.users.users.peerix.name; - group = config.users.users.peerix.group; - }; - }; - - services.peerix = { - privateKeyFile = config.sops.secrets."peerix/yui".path; - publicKeyFile = ../../keys/peerix/yui.pub; - }; - # Fix broken suspend on b550i motherboard # # The rule is a bit overzealous, as it disables wake from *either* diff --git a/pkgs/_sources/generated.json b/pkgs/_sources/generated.json index f127dda8..d28bf90b 100644 --- a/pkgs/_sources/generated.json +++ b/pkgs/_sources/generated.json @@ -41,7 +41,7 @@ }, "firefox-ui-fix": { "cargoLocks": null, - "date": "2023-09-21", + "date": "2023-10-04", "extract": null, "name": "firefox-ui-fix", "passthru": null, @@ -53,11 +53,11 @@ "name": null, "owner": "black7375", "repo": "Firefox-UI-Fix", - "rev": "3eabf0a184d4096f82f01e08a2fd8ea49fcad97c", - "sha256": "sha256-IImrUatrYKJiin7IfIYSUv3H/+Z1fJJCjB6rsJu3mww=", + "rev": "1227a68b826cc62c92240ccf5d59f23e4479bf68", + "sha256": "sha256-XNy52FRs9uZ8LAAEMvO7smAnfof/7I36ElrJXuu/TJE=", "type": "github" }, - "version": "3eabf0a184d4096f82f01e08a2fd8ea49fcad97c" + "version": "1227a68b826cc62c92240ccf5d59f23e4479bf68" }, "gauth": { "cargoLocks": null, @@ -81,7 +81,7 @@ }, "ohmyzsh": { "cargoLocks": null, - "date": "2023-09-21", + "date": "2023-10-02", "extract": null, "name": "ohmyzsh", "passthru": null, @@ -93,15 +93,15 @@ "name": null, "owner": "ohmyzsh", "repo": "ohmyzsh", - "rev": "1c55a0fe5246487ec9f18e03b7f28862b76cb7ab", - "sha256": "sha256-TPHdGOQI0hAsduu2UPHZy0lBf1G8+5PCbpE8R5PQglM=", + "rev": "f36c6db0eac17b022eee87411e6996a5f5fc8457", + "sha256": "sha256-+euWolpyBImlucKpmipiPOumMZdwlApQ2lNEi6OauWU=", "type": "github" }, - "version": "1c55a0fe5246487ec9f18e03b7f28862b76cb7ab" + "version": "f36c6db0eac17b022eee87411e6996a5f5fc8457" }, "phosphor-icons": { "cargoLocks": null, - "date": "2023-09-19", + "date": "2023-09-27", "extract": null, "name": "phosphor-icons", "passthru": null, @@ -113,15 +113,15 @@ "name": null, "owner": "phosphor-icons", "repo": "web", - "rev": "a84d824d214bd6010b792fa379f0f82361046601", - "sha256": "sha256-ptUaJz/CrmCe82hApobWrKRxty8mcsYkbK7YmtC6bKY=", + "rev": "07e44e0b2a1fad173d97e365c2ced5cb47698d36", + "sha256": "sha256-Gipz471rHIXr0XAk9o46FDli2rrvrM1G7HV3CCwp86o=", "type": "github" }, - "version": "a84d824d214bd6010b792fa379f0f82361046601" + "version": "07e44e0b2a1fad173d97e365c2ced5cb47698d36" }, "stumpwm": { "cargoLocks": null, - "date": "2023-09-07", + "date": "2023-10-06", "extract": null, "name": "stumpwm", "passthru": null, @@ -133,11 +133,11 @@ "name": null, "owner": "stumpwm", "repo": "stumpwm", - "rev": "79c62e205ec5f09f5a7acfa3def8df83bc55c4d4", - "sha256": "sha256-9CKRuTUOeTZPt984BfCeAo3vP+itBn1CIM+Xj7qvqxk=", + "rev": "2d14cb2e03b9ebdd940706bbd32d42764110bdf7", + "sha256": "sha256-db0ViIInil4+MzThzFiTkyfvgRXRGF3eQ3cKU6NiOp8=", "type": "github" }, - "version": "79c62e205ec5f09f5a7acfa3def8df83bc55c4d4" + "version": "2d14cb2e03b9ebdd940706bbd32d42764110bdf7" }, "stumpwm-contrib": { "cargoLocks": null, diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix index 105b3b56..dba2fb6e 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -25,15 +25,15 @@ }; firefox-ui-fix = { pname = "firefox-ui-fix"; - version = "3eabf0a184d4096f82f01e08a2fd8ea49fcad97c"; + version = "1227a68b826cc62c92240ccf5d59f23e4479bf68"; src = fetchFromGitHub { owner = "black7375"; repo = "Firefox-UI-Fix"; - rev = "3eabf0a184d4096f82f01e08a2fd8ea49fcad97c"; + rev = "1227a68b826cc62c92240ccf5d59f23e4479bf68"; fetchSubmodules = false; - sha256 = "sha256-IImrUatrYKJiin7IfIYSUv3H/+Z1fJJCjB6rsJu3mww="; + sha256 = "sha256-XNy52FRs9uZ8LAAEMvO7smAnfof/7I36ElrJXuu/TJE="; }; - date = "2023-09-21"; + date = "2023-10-04"; }; gauth = { pname = "gauth"; @@ -48,39 +48,39 @@ }; ohmyzsh = { pname = "ohmyzsh"; - version = "1c55a0fe5246487ec9f18e03b7f28862b76cb7ab"; + version = "f36c6db0eac17b022eee87411e6996a5f5fc8457"; src = fetchFromGitHub { owner = "ohmyzsh"; repo = "ohmyzsh"; - rev = "1c55a0fe5246487ec9f18e03b7f28862b76cb7ab"; + rev = "f36c6db0eac17b022eee87411e6996a5f5fc8457"; fetchSubmodules = false; - sha256 = "sha256-TPHdGOQI0hAsduu2UPHZy0lBf1G8+5PCbpE8R5PQglM="; + sha256 = "sha256-+euWolpyBImlucKpmipiPOumMZdwlApQ2lNEi6OauWU="; }; - date = "2023-09-21"; + date = "2023-10-02"; }; phosphor-icons = { pname = "phosphor-icons"; - version = "a84d824d214bd6010b792fa379f0f82361046601"; + version = "07e44e0b2a1fad173d97e365c2ced5cb47698d36"; src = fetchFromGitHub { owner = "phosphor-icons"; repo = "web"; - rev = "a84d824d214bd6010b792fa379f0f82361046601"; + rev = "07e44e0b2a1fad173d97e365c2ced5cb47698d36"; fetchSubmodules = false; - sha256 = "sha256-ptUaJz/CrmCe82hApobWrKRxty8mcsYkbK7YmtC6bKY="; + sha256 = "sha256-Gipz471rHIXr0XAk9o46FDli2rrvrM1G7HV3CCwp86o="; }; - date = "2023-09-19"; + date = "2023-09-27"; }; stumpwm = { pname = "stumpwm"; - version = "79c62e205ec5f09f5a7acfa3def8df83bc55c4d4"; + version = "2d14cb2e03b9ebdd940706bbd32d42764110bdf7"; src = fetchFromGitHub { owner = "stumpwm"; repo = "stumpwm"; - rev = "79c62e205ec5f09f5a7acfa3def8df83bc55c4d4"; + rev = "2d14cb2e03b9ebdd940706bbd32d42764110bdf7"; fetchSubmodules = false; - sha256 = "sha256-9CKRuTUOeTZPt984BfCeAo3vP+itBn1CIM+Xj7qvqxk="; + sha256 = "sha256-db0ViIInil4+MzThzFiTkyfvgRXRGF3eQ3cKU6NiOp8="; }; - date = "2023-09-07"; + date = "2023-10-06"; }; stumpwm-contrib = { pname = "stumpwm-contrib";