From e702bc16d59c1e951f6a47b06eff0046f09ae203 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 16 Feb 2024 16:32:14 -0600 Subject: [PATCH] Beefcake still has infinite recursion --- flake.lock | 86 ++++++++++++++------------------- flake.nix | 1 - modules/home-manager/helix.nix | 6 ++- modules/nixos/common.nix | 4 +- modules/nixos/daniel.nix | 5 +- modules/nixos/desktop-usage.nix | 8 --- nixos/beefcake.nix | 5 +- nixos/dragon.nix | 2 +- 8 files changed, 50 insertions(+), 67 deletions(-) diff --git a/flake.lock b/flake.lock index ad38acd..db8da59 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1705075138, - "narHash": "sha256-0slYsXoR1Sd5FwTfFZLYxAsI015+J4lvgvo55u4Gw1A=", + "lastModified": 1708029101, + "narHash": "sha256-FPlAle/nl4sJRfd8eILe5M20aRJh/z2KY8ji2yBBwaI=", "owner": "nix-community", "repo": "disko", - "rev": "f78b6498f69e04514cb84393e5daba669198c1c1", + "rev": "810eccbad22cc50323b27161033399eb87658932", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "hardware": { "locked": { - "lastModified": 1706085157, - "narHash": "sha256-0pTbYwn9qubaZLtuN0Ouj0neEfrir1wSNyH8gL1BzB0=", + "lastModified": 1708091350, + "narHash": "sha256-o28BJYi68qqvHipT7V2jkWxDiMS1LF9nxUsou+eFUPQ=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "e756ff62c2e9db4f7c197bc1849a02024a7bfb2e", + "rev": "106d3fec43bcea19cb2e061ca02531d54b542ce3", "type": "github" }, "original": { @@ -141,11 +141,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1704986785, - "narHash": "sha256-h0/pFRsnFesY+u+0EmeOXcReN8uF6Z3ok+eByZIks8E=", + "lastModified": 1708094594, + "narHash": "sha256-vAVKC8DdyQx/XngWV95FRvE+wAtf0f9bqKm3tFipiyE=", "owner": "helix-editor", "repo": "helix", - "rev": "17dd102e5cccbb2a9a0f0224af63e52f3dab846b", + "rev": "76e512f9445b2a26655248b46cf13413f9a6bbba", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1705169127, - "narHash": "sha256-j9OEtNxOIPWZWjbECVMkI1TO17SzlpHMm0LnVWKOR/g=", + "lastModified": 1708031129, + "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=", "owner": "nix-community", "repo": "home-manager", - "rev": "f2942f3385f1b35cc8a1abb03a45e29c9cb4d3c8", + "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8", "type": "github" }, "original": { @@ -187,11 +187,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1705070596, - "narHash": "sha256-Xq3JOddIH7AnACEHGaSKg71IF8CATE1zSTzdgR4pnlo=", + "lastModified": 1708018354, + "narHash": "sha256-MlbqBzAjiz4Va2M/AvLN96Wq+jsCbEedhfMs5wW1yFM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "c4da4b026deefd58f532353b64e9f17130e760ca", + "rev": "fbf5ba87ce57752653f3bebf6e2be090c702836e", "type": "github" }, "original": { @@ -227,7 +227,11 @@ }, "hyprlang": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "hyprland", + "xdph", + "nixpkgs" + ] }, "locked": { "lastModified": 1704287638, @@ -267,11 +271,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707689078, - "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=", + "lastModified": 1700794826, + "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", "type": "github" }, "original": { @@ -283,27 +287,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1702645756, - "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=", + "lastModified": 1707956935, + "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1704722960, - "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", "type": "github" }, "original": { @@ -321,7 +309,7 @@ "helix": "helix", "home-manager": "home-manager", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "sops-nix": "sops-nix", "ssbm": "ssbm" } @@ -377,11 +365,11 @@ ] }, "locked": { - "lastModified": 1705201153, - "narHash": "sha256-y0/a4IMDZrc7lAkR7Gcm5R3W2iCBiARHnYZe6vkmiNE=", + "lastModified": 1707842202, + "narHash": "sha256-3dTBbCzHJBinwhsisGJHW1HLBsLbj91+a5ZDXt7ttW0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "70dd0d521f7849338e487a219c1a07c429a66d77", + "rev": "48afd3264ec52bee85231a7122612e2c5202fa74", "type": "github" }, "original": { @@ -475,18 +463,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1703963193, - "narHash": "sha256-ke8drv6PTrdQDruWbajrRJffP9A9PU6FRyjJGNZRTs4=", + "lastModified": 1706359063, + "narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=", "owner": "wlroots", "repo": "wlroots", - "rev": "f81c3d93cd6f61b20ae784297679283438def8df", + "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "f81c3d93cd6f61b20ae784297679283438def8df", + "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", "type": "gitlab" } }, @@ -507,11 +495,11 @@ ] }, "locked": { - "lastModified": 1704400467, - "narHash": "sha256-IsEAKBCorRlN53FwFAMbyGLRsPVu/ZrWEJtCwykPds8=", + "lastModified": 1706521509, + "narHash": "sha256-AInZ50acOJ3wzUwGzNr1TmxGTMx+8j6oSTzz4E7Vbp8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "1c802128f6cc3db29a8ef01552b1a22f894eeefd", + "rev": "c06fd88b3da492b8f9067be021b9184f7012b5a8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1e1ec65..9510e2e 100644 --- a/flake.nix +++ b/flake.nix @@ -88,7 +88,6 @@ inherit system; specialArgs = { inherit inputs outputs system; - flake = self; }; modules = [ diff --git a/modules/home-manager/helix.nix b/modules/home-manager/helix.nix index baead76..9eb1321 100644 --- a/modules/home-manager/helix.nix +++ b/modules/home-manager/helix.nix @@ -1,9 +1,11 @@ { + pkgs, inputs, colors, - system, ... -}: { +}: let + inherit (pkgs) system; +in { programs.helix = { enable = true; package = inputs.helix.packages.${system}.helix; diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix index ee99183..77baa35 100644 --- a/modules/nixos/common.nix +++ b/modules/nixos/common.nix @@ -123,9 +123,9 @@ in { }; services = { - xserver = { + xserver.xkb = { layout = "us"; - xkbOptions = "ctrl:nocaps"; + options = "ctrl:nocaps"; }; openssh = { diff --git a/modules/nixos/daniel.nix b/modules/nixos/daniel.nix index 16814dd..0e4392a 100644 --- a/modules/nixos/daniel.nix +++ b/modules/nixos/daniel.nix @@ -1,10 +1,11 @@ { pkgs, inputs, - system, outputs, ... -}: { +}: let + inherit (pkgs) system; +in { home-manager = { extraSpecialArgs = { inherit inputs outputs system; diff --git a/modules/nixos/desktop-usage.nix b/modules/nixos/desktop-usage.nix index bb4ef02..3d53029 100644 --- a/modules/nixos/desktop-usage.nix +++ b/modules/nixos/desktop-usage.nix @@ -1,10 +1,4 @@ { - pkgs, - inputs, - outputs, - system, - ... -}: { imports = [ ./sway.nix # ./hyprland.nix @@ -15,8 +9,6 @@ ./kde-connect.nix ]; - nixpkgs.overlays = [outputs.overlays.modifications]; - hardware = { opengl = { enable = true; diff --git a/nixos/beefcake.nix b/nixos/beefcake.nix index 4f8535d..1eec1cf 100644 --- a/nixos/beefcake.nix +++ b/nixos/beefcake.nix @@ -12,9 +12,10 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 outputs, config, pkgs, - system, ... -}: { +}: let + inherit (pkgs) system; +in { imports = with outputs.nixosModules; [ intel fonts # so that it gets cached to the nix store diff --git a/nixos/dragon.nix b/nixos/dragon.nix index 5da8a68..0ea6dae 100644 --- a/nixos/dragon.nix +++ b/nixos/dragon.nix @@ -1,5 +1,5 @@ { - config, + # config, inputs, outputs, lib,