From a5075271b450b40fceb9a3a3965354da4ba6bd4f Mon Sep 17 00:00:00 2001 From: Magic_RB Date: Mon, 10 Jul 2023 23:35:56 +0200 Subject: [PATCH] Update inputs Signed-off-by: Magic_RB --- flake.lock | 142 +++++++++---------- flake.nix | 2 +- nixos/systems/blowhole/default.nix | 2 +- nixos/systems/omen/hardware.nix | 48 +------ nixos/systems/toothpick/default.nix | 1 - nixos/systems/toothpick/u2t.nix | 18 --- overlays/emacs-master-nativecomp/default.nix | 14 +- 7 files changed, 80 insertions(+), 147 deletions(-) delete mode 100644 nixos/systems/toothpick/u2t.nix diff --git a/flake.lock b/flake.lock index 25b8c88..3519667 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1687431792, - "narHash": "sha256-ba5d/XlxQrgNrYeYhriX3FISBMVBF+nKVBMLE0/OC0Q=", + "lastModified": 1688544596, + "narHash": "sha256-/rbDM71Qpj4gMp54r9mQ2AdD10jEMtnrQ3b2Xf+HYTU=", "owner": "nix-community", "repo": "disko", - "rev": "637d87df3fd265a1d1669d897ad9436a87fc5ad8", + "rev": "fc3c3817c9f1fcd405463c6a7f0f98baab97c692", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1686222354, - "narHash": "sha256-dtqnAwzucKZv54dTrLetIXhOavUrCsdqOe+JtFH9riE=", + "lastModified": 1687747614, + "narHash": "sha256-KXspKgtdO2YRL12Jv0sUgkwOwHrAFwdIG/90pDx8Ydg=", "owner": "nix-community", "repo": "disko", - "rev": "5d9f362aecd7a4c2e8a3bf2afddb49051988cab9", + "rev": "fef67a1ddc293b595d62a660f57deabbcb70ff95", "type": "github" }, "original": { @@ -182,11 +182,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1685457039, - "narHash": "sha256-bEFtQm+YyLxQjKQAaBHJyPN1z2wbhBnr2g1NJWSYjwM=", + "lastModified": 1688466019, + "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80717d11615b6f42d1ad2e18ead51193fc15de69", + "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", "type": "github" }, "original": { @@ -203,11 +203,11 @@ ] }, "locked": { - "lastModified": 1685662779, - "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", + "lastModified": 1687762428, + "narHash": "sha256-DIf7mi45PKo+s8dOYF+UlXHzE0Wl/+k3tXUyAoAnoGE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", + "rev": "37dd7bb15791c86d55c5121740a1887ab55ee836", "type": "github" }, "original": { @@ -239,11 +239,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", "type": "github" }, "original": { @@ -358,11 +358,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1685438474, - "narHash": "sha256-qQLHbg3mHYgWA3ngvWgWIdsirVkYA0StzKR3Qi72uWg=", + "lastModified": 1688999869, + "narHash": "sha256-gLD2UI6+Nb9JV5Wh4FnLHAZwLMiY11RHYBKmBZCxLXc=", "owner": "nix-community", "repo": "home-manager", - "rev": "9f82227b64245c273d98dd02dedd44fc7576041e", + "rev": "a6d1d954b81caf4c9291b8ac35452fef842f289b", "type": "github" }, "original": { @@ -443,11 +443,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1685439709, - "narHash": "sha256-CZ0kT8Mxv09Sf47h97s7xdBXO0PDTFOEZdQA6nfw1Eg=", + "lastModified": 1688959909, + "narHash": "sha256-vDZuhJ9/iTJnjwUDAWaRThWV1mH9NAY9IGJwztPkbYA=", "owner": "oxalica", "repo": "nil", - "rev": "0158d58d47abecd7f5f4e67c06365ff77bbedbc7", + "rev": "5751bfe63a5cc8988a9cdebd14999b9e11bba401", "type": "github" }, "original": { @@ -516,11 +516,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1684005067, - "narHash": "sha256-mUNHQcmUSM02FNrOa/ri06TO6eh5zpw8GiOUvugKfYU=", + "lastModified": 1686222921, + "narHash": "sha256-LUpAN3Q5Y32cabs4Fe1XEyjj973su21kSsJaFZnSQEw=", "owner": "nix-community", "repo": "NixNG", - "rev": "e5c3b6a5685d75fe2e55ddf7828f739ef599b68a", + "rev": "54978ce81634192f55d8607bead608a4fa463e13", "type": "github" }, "original": { @@ -548,11 +548,11 @@ }, "nixos-2305": { "locked": { - "lastModified": 1686478675, - "narHash": "sha256-EBm0oKY+B+BF/wQzegHCLPZQ2BxfgRSfEJhAd9N2XyA=", + "lastModified": 1687938137, + "narHash": "sha256-Z00c0Pk3aE1aw9x44lVcqHmvx+oX7dxCXCvKcUuE150=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "207e4680b5ffe797038955949ab20ddc4a31c835", + "rev": "ba2ded3227a2992f2040fad4ba6f218a701884a5", "type": "github" }, "original": { @@ -572,11 +572,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1686903963, - "narHash": "sha256-8XBLIAGUWHhRrTm0+AcpobTHeofaNbCa6Xb3SruYjmk=", + "lastModified": 1688907389, + "narHash": "sha256-oXxGC3yNvIkW+dXZUmvfLkWI6iCDbuUlh0OTmCOeYIA=", "owner": "numtide", "repo": "nixos-anywhere", - "rev": "ed9ec041d7d19e5b412aa19e6db0ddc6c7db7d70", + "rev": "04f980980386c916ae12ef71d0960e6f2b50bd48", "type": "github" }, "original": { @@ -597,11 +597,11 @@ ] }, "locked": { - "lastModified": 1686466496, - "narHash": "sha256-HYSUVZ85+POkLOo1Om7yw1870xqwJp3ABu+Fz7hBJY8=", + "lastModified": 1686819168, + "narHash": "sha256-IbRVStbKoMC2fUX6TxNO82KgpVfI8LL4Cq0bTgdYhnY=", "owner": "nix-community", "repo": "nixos-images", - "rev": "13e5db35e8b5a646d0efa81ff1dd003336ffe65f", + "rev": "ccc1a2c08ce2fc38bcece85d2a6e7bf17bac9e37", "type": "github" }, "original": { @@ -612,11 +612,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1686582075, - "narHash": "sha256-vtflsfKkHtF8IduxDNtbme4cojiqvlvjp5QNYhvoHXc=", + "lastModified": 1688465017, + "narHash": "sha256-xzFcCnzPOgQaX7Acprfqo+tqHJ2UKWC38pXrcqvdXHU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e63eed145566cca98158613f3700515b4009ce3", + "rev": "0d5682acc109add20f70440269587a1b169cc2fe", "type": "github" }, "original": { @@ -628,28 +628,28 @@ }, "nixpkgs-hashicorp": { "locked": { - "lastModified": 1687122141, - "narHash": "sha256-ppar9V4f817qpXbRqKJ00IjxIPuin3Kr1bjwA1SNpVk=", - "owner": "~magic_rb", + "lastModified": 1688918189, + "narHash": "sha256-f8ZlJ67LgEUDnN7ZsAyd1/Fyby1VdOXWg4XY/irSGrQ=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "fcd547d4a627261e4940fadf755f8150130af579", - "type": "sourcehut" + "rev": "408c0e8c15a1c9cf5c3226931b6f283c9867c484", + "type": "github" }, "original": { - "owner": "~magic_rb", - "ref": "master", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", - "type": "sourcehut" + "type": "github" } }, "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1682879489, - "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=", + "lastModified": 1688049487, + "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0", + "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", "type": "github" }, "original": { @@ -796,11 +796,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1684570954, - "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=", + "lastModified": 1688679045, + "narHash": "sha256-t3xGEfYIwhaLTPU8FLtN/pLPytNeDwbLI6a7XFFBlGo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3005f20ce0aaa58169cdee57c8aa12e5f1b6e1b3", + "rev": "3c7487575d9445185249a159046cc02ff364bff8", "type": "github" }, "original": { @@ -812,11 +812,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1682929865, - "narHash": "sha256-jxVrgnf5QNjO+XoxDxUWtN2G5xyJSGZ5SWDQFxMuHxc=", + "lastModified": 1688829822, + "narHash": "sha256-hv56yK1fPHPt7SU2DboxBtdSbIuv9nym7Dss7Cn2jic=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f2e9a130461950270f87630b11132323706b4d91", + "rev": "ed6afb10dfdfc97b6bcf0703f1bad8118e9e961b", "type": "github" }, "original": { @@ -860,11 +860,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1686406799, - "narHash": "sha256-/MHAr6x5/DDEAWFQLgIlyFT9jCXl5O6OWCoNGmfnL3g=", + "lastModified": 1687893427, + "narHash": "sha256-jJHj0Lxpvov1IPYQK441oLAKxxemHm16U9jf60bXAFU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9166729004aef4db3390d7199a45f6c7331275a2", + "rev": "4b14ab2a916508442e685089672681dff46805be", "type": "github" }, "original": { @@ -876,11 +876,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1685383865, - "narHash": "sha256-3uQytfnotO6QJv3r04ajSXbEFMII0dUtw0uqYlZ4dbk=", + "lastModified": 1688918189, + "narHash": "sha256-f8ZlJ67LgEUDnN7ZsAyd1/Fyby1VdOXWg4XY/irSGrQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce", + "rev": "408c0e8c15a1c9cf5c3226931b6f283c9867c484", "type": "github" }, "original": { @@ -983,11 +983,11 @@ ] }, "locked": { - "lastModified": 1682907601, - "narHash": "sha256-FfUAYvRJ+6s9WWjXNPdRzuuvAeu2VHIXIbUkPJr4t14=", + "lastModified": 1688783586, + "narHash": "sha256-HHaM2hk2azslv1kH8zmQxXo2e7i5cKgzNIuK4yftzB0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5eaff055dd57128c53ae373dc96af944f5849daa", + "rev": "7a29283cc242c2486fc67f60b431ef708046d176", "type": "github" }, "original": { @@ -1087,11 +1087,11 @@ ] }, "locked": { - "lastModified": 1685519364, - "narHash": "sha256-rE9c9jWDSc5Nj0OjNzBENaJ6j4YBphcqSPia2IwCMLA=", + "lastModified": 1687940979, + "narHash": "sha256-D4ZFkgIG2s9Fyi78T3fVG9mqMD+/UnFDB62jS4gjZKY=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "6521a278bcba66b440554cc1350403594367b4ac", + "rev": "0a4f06c27610a99080b69433873885df82003aae", "type": "github" }, "original": { @@ -1130,11 +1130,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1685392049, - "narHash": "sha256-2xRDeE5qITA8SGKiN6GQwHazz8OyfN42C0sZfum0AdQ=", + "lastModified": 1686236979, + "narHash": "sha256-9DAN4YSB+VrGQkZAhn93OdaE/rUIGysYTNHcSqvdA2k=", "owner": "AaronErhardt", "repo": "tuxedo-rs", - "rev": "21db8da9a7a003ef6dec30dd09b4ffe401fa7430", + "rev": "30209f9d4fb2792bff33c6b87b2a52444f15312c", "type": "github" }, "original": { @@ -1166,11 +1166,11 @@ "terranix": "terranix" }, "locked": { - "lastModified": 1687130036, - "narHash": "sha256-U7q2iwNNdB0A7GHyLjNYLWluOVJO+K0LtiOV0Y3/vuY=", + "lastModified": 1687982768, + "narHash": "sha256-GofM1CCW5l4hQtgea7lqUMQs4kRc/unx9As/vGG92hg=", "owner": "~magic_rb", "repo": "uterranix", - "rev": "30dd60117a71c3f6bb152af03ef6f7fd686abf1c", + "rev": "9ee50d0b284d76cd5b2abde709c927066d2c319b", "type": "sourcehut" }, "original": { diff --git a/flake.nix b/flake.nix index 51170cf..78ba07f 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; - nixpkgs-hashicorp.url = "sourcehut:~magic_rb/nixpkgs?ref=master"; + nixpkgs-hashicorp.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; nixinate.url = "github:MagicRB/nixinate"; home-manager.url = "github:nix-community/home-manager?ref=master"; nixng.url = "github:nix-community/NixNG"; diff --git a/nixos/systems/blowhole/default.nix b/nixos/systems/blowhole/default.nix index a07d9e4..439c8b1 100644 --- a/nixos/systems/blowhole/default.nix +++ b/nixos/systems/blowhole/default.nix @@ -30,7 +30,7 @@ in ./firewall.nix ./grub.nix ./hardware.nix - ./hostapd.nix + # ./hostapd.nix ./ical2org.nix ./klipper.nix ./monitoring.nix diff --git a/nixos/systems/omen/hardware.nix b/nixos/systems/omen/hardware.nix index aea9446..acb1551 100644 --- a/nixos/systems/omen/hardware.nix +++ b/nixos/systems/omen/hardware.nix @@ -7,47 +7,7 @@ let singleton mkForce; - kernelPackages = - pkgs.linuxKernel.packages.linux_xanmod_latest.extend (final: prev: - { - zfsUnstable = - let - unstableNix = - { callPackage - , kernel ? null - , stdenv - , linuxKernel - , ... - } @ args: - - let - stdenv' = if kernel == null then stdenv else kernel.stdenv; - in - callPackage "${inputs'.nixpkgs}/pkgs/os-specific/linux/zfs/generic.nix" args { - # check the release notes for compatible kernels - # NOTE: - # zfs-2.1.9<=x<=2.1.10 is broken with aarch64-linux-6.2 - # for future releases, please delete this condition. - kernelCompatible = kernel.kernelOlder "6.4"; - latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_3; - - # this package should point to a version / git revision compatible with the latest kernel release - # IMPORTANT: Always use a tagged release candidate or commits from the - # zfs--staging branch, because this is tested by the OpenZFS - # maintainers. - version = "zfs-2.1.12"; - rev = "86783d7d92cf7a859464719a917fdff845b9a9e1"; - - sha256 = "sha256-eYUR5d4gpTrlFu6j1uL83DWL9uPGgAUDRdSEb73V5i4="; - - isUnstable = true; - }; - in - prev.callPackage unstableNix { - configFile = "kernel"; - }; - } - ); + kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_latest; in { environment.systemPackages = [ @@ -79,12 +39,6 @@ in "nvme_core.default_ps_max_latency_us=30000" ]; kernelPackages = kernelPackages; - kernelPatches = [ - { - name = "nvme-kingston-sleep"; - patch = ./0001-Revert-nvme-pci-avoid-the-deepest-sleep-state-on-Kin.patch; - } - ]; zfs.enableUnstable = true; supportedFilesystems = singleton "zfs"; diff --git a/nixos/systems/toothpick/default.nix b/nixos/systems/toothpick/default.nix index 1eca833..2631eed 100644 --- a/nixos/systems/toothpick/default.nix +++ b/nixos/systems/toothpick/default.nix @@ -27,7 +27,6 @@ in ./consul.nix ./nomad.nix ./vault-agent.nix - ./u2t.nix ./grub.nix ./networking.nix ./nixpkgs.nix diff --git a/nixos/systems/toothpick/u2t.nix b/nixos/systems/toothpick/u2t.nix deleted file mode 100644 index 26a8869..0000000 --- a/nixos/systems/toothpick/u2t.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs, ... }: -{ - systemd.services.udp2tcp = { - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - restartIfChanged = true; - - path = with pkgs; [ dig.host ]; - - script = '' - ${pkgs.udp-over-tcp}/bin/tcp2udp\ - --tcp-listen 127.0.0.1:6001 \ - --tcp-listen "$(host redalder.org | sed -e 's/.* //'):6001" \ - --udp-forward 127.0.0.1:6666 - ''; - }; -} diff --git a/overlays/emacs-master-nativecomp/default.nix b/overlays/emacs-master-nativecomp/default.nix index 384e293..39a76c0 100644 --- a/overlays/emacs-master-nativecomp/default.nix +++ b/overlays/emacs-master-nativecomp/default.nix @@ -6,10 +6,12 @@ let emacs-master = import (inputs.nixpkgs + "/pkgs/applications/editors/emacs/generic.nix") { version = "30"; - versionModifier = "-nativecomp"; - sha256 = null; + pname = "emacs-nativecomp"; + variant = "nativecomp"; + src = inputs.emacs; + meta = {}; }; - emacs-master-package = (prev.callPackage emacs-master { + emacs-master-package = prev.callPackage emacs-master { libXaw = prev.xorg.libXaw; gconf = null; alsa-lib = prev.alsa-lib; @@ -29,11 +31,7 @@ GSS = null; ImageIO = null; sigtool = null; - }).overrideAttrs (old: - { - src = inputs.emacs; - } - ); + }; in emacs-master-package.override { withSQLite3 = true;