From e8762f575f44ea8162e13ee6223f3609dde71783 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Mon, 17 Mar 2025 19:06:47 +0100 Subject: [PATCH 1/4] deadnix -e --- flake.nix | 2 -- home/vinzenz/zsh.nix | 2 +- hosts/forgejo-runner-1/configuration.nix | 2 +- hosts/forgejo-runner-1/hardware.nix | 2 +- hosts/hetzner-vpn2/configuration.nix | 2 +- hosts/hetzner-vpn2/hardware.nix | 2 +- hosts/hetzner-vpn2/nginx.nix | 2 +- hosts/vinzenz-lpt2/configuration.nix | 2 +- hosts/vinzenz-pc2/configuration.nix | 2 +- modules/desktop-environment.nix | 2 +- modules/desktop-hardware.nix | 1 - modules/gaming.nix | 2 +- modules/gnome.nix | 2 +- modules/intel-graphics.nix | 2 +- 14 files changed, 12 insertions(+), 15 deletions(-) diff --git a/flake.nix b/flake.nix index 9b21548..f870112 100644 --- a/flake.nix +++ b/flake.nix @@ -22,11 +22,9 @@ outputs = { - self, nixpkgs, home-manager, lix-module, - nixos-hardware, niri, }: let diff --git a/home/vinzenz/zsh.nix b/home/vinzenz/zsh.nix index 0b5ed96..4f2e6bb 100644 --- a/home/vinzenz/zsh.nix +++ b/home/vinzenz/zsh.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, pkgs, ... }: { config.programs.zsh = { initExtra = '' diff --git a/hosts/forgejo-runner-1/configuration.nix b/hosts/forgejo-runner-1/configuration.nix index 81b5be8..345e622 100644 --- a/hosts/forgejo-runner-1/configuration.nix +++ b/hosts/forgejo-runner-1/configuration.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { # uncomment for build check on non arm system (requires --impure) # nixpkgs.buildPlatform = builtins.currentSystem; diff --git a/hosts/forgejo-runner-1/hardware.nix b/hosts/forgejo-runner-1/hardware.nix index f7cb083..e3e6880 100644 --- a/hosts/forgejo-runner-1/hardware.nix +++ b/hosts/forgejo-runner-1/hardware.nix @@ -1,4 +1,4 @@ -{ lib, modulesPath, ... }: +{ modulesPath, ... }: { imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; diff --git a/hosts/hetzner-vpn2/configuration.nix b/hosts/hetzner-vpn2/configuration.nix index be2fe7b..8e16ff7 100644 --- a/hosts/hetzner-vpn2/configuration.nix +++ b/hosts/hetzner-vpn2/configuration.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { # uncomment for build check on non arm system (requires --impure) # nixpkgs.buildPlatform = builtins.currentSystem; diff --git a/hosts/hetzner-vpn2/hardware.nix b/hosts/hetzner-vpn2/hardware.nix index 7cf5ce7..e8fa931 100644 --- a/hosts/hetzner-vpn2/hardware.nix +++ b/hosts/hetzner-vpn2/hardware.nix @@ -1,4 +1,4 @@ -{ lib, modulesPath, ... }: +{ modulesPath, ... }: { imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; diff --git a/hosts/hetzner-vpn2/nginx.nix b/hosts/hetzner-vpn2/nginx.nix index a9bc583..218b7a9 100644 --- a/hosts/hetzner-vpn2/nginx.nix +++ b/hosts/hetzner-vpn2/nginx.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, ... }: { security.acme = { acceptTerms = true; diff --git a/hosts/vinzenz-lpt2/configuration.nix b/hosts/vinzenz-lpt2/configuration.nix index 7ad1351..5267e89 100644 --- a/hosts/vinzenz-lpt2/configuration.nix +++ b/hosts/vinzenz-lpt2/configuration.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { imports = [ ./nginx.nix ]; diff --git a/hosts/vinzenz-pc2/configuration.nix b/hosts/vinzenz-pc2/configuration.nix index aa01095..d2f7439 100644 --- a/hosts/vinzenz-pc2/configuration.nix +++ b/hosts/vinzenz-pc2/configuration.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { imports = [ ./hardware.nix diff --git a/modules/desktop-environment.nix b/modules/desktop-environment.nix index 9d4fcd8..afb5255 100644 --- a/modules/desktop-environment.nix +++ b/modules/desktop-environment.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { config = { services = { diff --git a/modules/desktop-hardware.nix b/modules/desktop-hardware.nix index 62d0ab9..1fed3a8 100644 --- a/modules/desktop-hardware.nix +++ b/modules/desktop-hardware.nix @@ -1,7 +1,6 @@ { lib, pkgs, - config, ... }: { diff --git a/modules/gaming.nix b/modules/gaming.nix index 6cb625f..4214c23 100644 --- a/modules/gaming.nix +++ b/modules/gaming.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { config = { hardware = { diff --git a/modules/gnome.nix b/modules/gnome.nix index c510a9d..669109c 100644 --- a/modules/gnome.nix +++ b/modules/gnome.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { config = { services = { diff --git a/modules/intel-graphics.nix b/modules/intel-graphics.nix index f23b357..74c6e67 100644 --- a/modules/intel-graphics.nix +++ b/modules/intel-graphics.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { config = { hardware.graphics = { From 526fd80f077a66dabda650852299498e86a2bb4f Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Mon, 17 Mar 2025 19:07:12 +0100 Subject: [PATCH 2/4] new aliases for pretty build logs --- home/vinzenz/zsh.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/home/vinzenz/zsh.nix b/home/vinzenz/zsh.nix index 4f2e6bb..02efbce 100644 --- a/home/vinzenz/zsh.nix +++ b/home/vinzenz/zsh.nix @@ -9,11 +9,9 @@ enableCompletion = true; shellAliases = { - my-apply = "sudo nixos-rebuild boot --flake"; - my-switch = "sudo nixos-rebuild switch --flake"; - my-update = "sudo nixos-rebuild boot --upgrade --flake"; - my-pull = "git -C ~/Repos/nixos-configuration pull --rebase"; - my-test = "sudo nixos-rebuild test"; + myos-rebuild-boot = "sudo nixos-rebuild boot --flake .# --show-trace --log-format internal-json -v |& ${pkgs.nix-output-monitor}/bin/nom --json"; + myos-rebuild-switch = "sudo nixos-rebuild switch --flake .# --show-trace --log-format internal-json -v |& ${pkgs.nix-output-monitor}/bin/nom --json"; + my-direnvallow = "echo \"use nix\" > .envrc && direnv allow"; my-ip4 = "ip addr show | grep 192"; deadnix = "nix run github:astro/deadnix -- "; From c129b25c6f77773c91e5a9efd7d789efe0decf25 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Mon, 17 Mar 2025 19:15:50 +0100 Subject: [PATCH 3/4] nix flake update, remove nixos-hardware --- flake.lock | 47 +++++++++++++++-------------------------------- flake.nix | 2 +- 2 files changed, 16 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index c4b1858..a608a1b 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ ] }, "locked": { - "lastModified": 1739757849, - "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", + "lastModified": 1742234739, + "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", + "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", "type": "github" }, "original": { @@ -103,11 +103,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1742032096, - "narHash": "sha256-/vWpgh3DCdoREIoydTfUnZLYSxKa0yRczOJaT0dDT0o=", + "lastModified": 1742220949, + "narHash": "sha256-ZlPrKLM0FWUP36MNCJYGTlN4ZvoXZ4WY/ENKoaGU6yg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "e2614d598a86eb892e4d98d18458ee2633285c00", + "rev": "5d8d116ac90f54e4c95bd5c9de31b8df477b12b9", "type": "github" }, "original": { @@ -136,11 +136,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1742026950, - "narHash": "sha256-pd00WzjmAxxS3Da0e4eEzfgauAfX5HwMGfs3nm2hwwA=", + "lastModified": 1742103165, + "narHash": "sha256-zAzMwvozlS2gmqdhrgeMz0PNp3kRDkwxIEfqWT3Hj6g=", "owner": "YaLTeR", "repo": "niri", - "rev": "9e560e7e607638da4f47b6dfef5a83b18711f75d", + "rev": "287480b541e85b13ff6419d372f82fa8e42c603c", "type": "github" }, "original": { @@ -149,29 +149,13 @@ "type": "github" } }, - "nixos-hardware": { - "locked": { - "lastModified": 1741325094, - "narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixos-hardware", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1741332913, - "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=", + "lastModified": 1742136038, + "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20755fa05115c84be00b04690630cb38f0a203ad", + "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341", "type": "github" }, "original": { @@ -186,7 +170,6 @@ "home-manager": "home-manager", "lix-module": "lix-module", "niri": "niri", - "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs" } }, @@ -225,11 +208,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1741910413, - "narHash": "sha256-z9bvteu0rf+xmUDj4VifN06XAFJZQGRSOvdN7rn/oDs=", + "lastModified": 1742083780, + "narHash": "sha256-cVLagXvI4jFbCe76tpvAWA2N2WF94Pl0PpgsGp2P6rM=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0325cb1f48a292d873a6844772cca00251cbf945", + "rev": "f9ec97b007547ad80147404335ed22e880dbd69d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f870112..e4d0b8a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + # nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { url = "github:nix-community/home-manager/release-24.11"; From e2b8dd31921956933a4b29872b1912287f70d39a Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Mon, 17 Mar 2025 19:17:16 +0100 Subject: [PATCH 4/4] fix missing parameter deadnix removed --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index e4d0b8a..703576d 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,7 @@ outputs = { + self, nixpkgs, home-manager, lix-module,