From c198489f593c97a55a193a2108f80745d96717da Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 19 Jan 2026 01:37:58 +0100 Subject: [PATCH] 27;5;13~ljasdasdjkl --- flake.nix | 2 ++ hosts/nixos/nord/configuration.nix | 12 +++--------- profiles/auto-upgrade.nix | 9 +++++++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index b11fb85..a58aca2 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ # https://github.com/nixos/nixpkgs nixpkgs-test.url = "github:NixOS/nixpkgs/refs/pull/379645/merge"; # for testing nixpkgs-edge.url = "https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz"; # len("edge") == 4 + # remember to update ./profiles/auto-upgrade.nix nixpkgs-2511.url = "https://nixos.org/channels/nixos-25.11/nixexprs.tar.xz"; nixpkgs-2505.url = "https://nixos.org/channels/nixos-25.05/nixexprs.tar.xz"; nixpkgs-2411.url = "https://nixos.org/channels/nixos-24.11/nixexprs.tar.xz"; # for old docs @@ -231,6 +232,7 @@ { pkgs, lib, ... }: let # TODO: by-name + # TODO: this filterAttrs seems to force the inputs to download pbsdspkgs = lib.filterAttrs (_: lib.isDerivation) ( pkgs.appendOverlays [ diff --git a/hosts/nixos/nord/configuration.nix b/hosts/nixos/nord/configuration.nix index c2c8765..10819af 100644 --- a/hosts/nixos/nord/configuration.nix +++ b/hosts/nixos/nord/configuration.nix @@ -10,15 +10,6 @@ # zramSwap.enable = true; # zramSwap.memoryPercent = 20; - # amdgpu audio fix when at 4k@60fps - boot.kernelPackages = pkgs.linuxPackages_latest; - - services.displayManager.autoLogin.enable = true; - services.displayManager.autoLogin.user = "pbsds"; - # tmp: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229 - systemd.services."getty@tty1".enable = false; - systemd.services."autovt@tty1".enable = false; - # for testing only, not for building # boot.binfmt.addEmulatedSystemsToNixSandbox = false; # boot.binfmt.emulatedSystems = [ @@ -29,6 +20,9 @@ # "x86_64-windows" # ]; + # amdgpu audio fix when at 4k@60fps + # boot.kernelPackages = pkgs.linuxPackages_latest; + imports = [ ./hardware-configuration.nix inputs.nixos-hardware.nixosModules.common-pc diff --git a/profiles/auto-upgrade.nix b/profiles/auto-upgrade.nix index dd5420b..7e38a47 100644 --- a/profiles/auto-upgrade.nix +++ b/profiles/auto-upgrade.nix @@ -79,11 +79,16 @@ in #"--update-input" "nixpkgs-edge" # deprecated in nix 2.22, removed in lix 2.90 # "--override-input" "nixpkgs-edge" "github:NixOS/nixpkgs/nixos-unstable" ] ++ (lib.pipe inputUrls [ + # TODO: i keep forgetting to update this, perhaps use a blacklist instead? (lib.filterAttrs (key: _: builtins.elem key [ "nixpkgs-edge" - "nixpkgs-2411" + "nixpkgs-2511" + "nixpkgs-2505" + # "nixpkgs-2411" "home-manager-edge" - "home-manager-2411" + "home-manager-2511" + "home-manager-2505" + # "home-manager-2411" "nix-index-database" "nixos-hardware" ]))