From 1153240aac1482d7afaed92011ec4d8cd4662848 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Wed, 4 Jun 2025 17:22:06 +0200 Subject: [PATCH] feat(elias-e525): bump to 25.05 --- flake.nix | 2 +- nix/devShells.nix | 2 + .../configuration/graphical-gnome3.nix | 6 +-- .../configuration/graphical-removable.nix | 6 +-- nix/home-manager/profiles/sway-desktop.nix | 7 ++++ nix/os/devices/elias-e525/default.nix | 4 +- nix/os/devices/elias-e525/flake.lock | 23 +++++++----- nix/os/devices/elias-e525/flake.nix | 5 ++- nix/os/devices/elias-e525/system.nix | 14 ++++--- nix/os/devices/elias-e525/user.nix | 4 +- nix/os/profiles/graphical-gnome-xorg.nix | 37 +++++++++---------- nix/os/profiles/graphical/system.nix | 2 - nix/os/snippets/nix-settings.nix | 2 +- 13 files changed, 63 insertions(+), 51 deletions(-) diff --git a/flake.nix b/flake.nix index 252237b..c68eef7 100644 --- a/flake.nix +++ b/flake.nix @@ -153,7 +153,7 @@ "steveej-t14" "steveej-x13s" "steveej-x13s-rmvbl" - # "elias-e525" + "elias-e525" # "justyna-p300" # "srv0-dmz0" diff --git a/nix/devShells.nix b/nix/devShells.nix index aa4eda5..fc4b55e 100644 --- a/nix/devShells.nix +++ b/nix/devShells.nix @@ -84,6 +84,8 @@ screen inputs'.nixpkgs-unstable.legacyPackages.kanidm + + (flameshot.override { enableWlrSupport = true; }) ]; # Set Environment Variables diff --git a/nix/home-manager/configuration/graphical-gnome3.nix b/nix/home-manager/configuration/graphical-gnome3.nix index 5eaebd1..4dbcba2 100644 --- a/nix/home-manager/configuration/graphical-gnome3.nix +++ b/nix/home-manager/configuration/graphical-gnome3.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { home.packages = with pkgs; [ - gnome.gnome-tweaks - gnome.gnome-keyring - gnome.seahorse + gnome-tweaks + gnome-keyring + seahorse ]; } diff --git a/nix/home-manager/configuration/graphical-removable.nix b/nix/home-manager/configuration/graphical-removable.nix index d6296a2..73c9ff3 100644 --- a/nix/home-manager/configuration/graphical-removable.nix +++ b/nix/home-manager/configuration/graphical-removable.nix @@ -24,7 +24,7 @@ # Process/System Administration htop - gnome.gnome-tweaks + gnome-tweaks xorg.xhost dmidecode evtest @@ -39,8 +39,8 @@ lzop # Password Management - gnome.gnome-keyring - gnome.seahorse + gnome-keyring + seahorse # Remote Control Tools remmina diff --git a/nix/home-manager/profiles/sway-desktop.nix b/nix/home-manager/profiles/sway-desktop.nix index 344a1f5..93cfb2e 100644 --- a/nix/home-manager/profiles/sway-desktop.nix +++ b/nix/home-manager/profiles/sway-desktop.nix @@ -213,6 +213,13 @@ in # this maps to focus_on_window_activation focus.newWindow = "urgent"; + + window.commands = [ + { + command = "border pixel 0, floating enable, fullscreen disable, move absolute position 0 0"; + criteria.app_id= "flameshot"; + } + ]; }; }; diff --git a/nix/os/devices/elias-e525/default.nix b/nix/os/devices/elias-e525/default.nix index ba02693..4104b58 100644 --- a/nix/os/devices/elias-e525/default.nix +++ b/nix/os/devices/elias-e525/default.nix @@ -16,8 +16,8 @@ in meta.nodeNixpkgs.${nodeName} = import nodeFlake.inputs.nixpkgs.outPath { inherit system; }; ${nodeName} = { - deployment.targetHost = "elias-e525.lan"; - deployment.replaceUnknownProfiles = false; + deployment.targetHost = "elias-e525"; + deployment.replaceUnknownProfiles = true; # deployment.allowLocalDeployment = true; imports = [ diff --git a/nix/os/devices/elias-e525/flake.lock b/nix/os/devices/elias-e525/flake.lock index 9616d4f..5002d24 100644 --- a/nix/os/devices/elias-e525/flake.lock +++ b/nix/os/devices/elias-e525/flake.lock @@ -7,32 +7,32 @@ ] }, "locked": { - "lastModified": 1703113038, - "narHash": "sha256-oxkyzjpD+mNT7arzU/zHrkNHLuY9tKwmnD2MNaZiSDw=", + "lastModified": 1748665073, + "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=", "owner": "nix-community", "repo": "home-manager", - "rev": "0c2353d5d930c3d93724df6858aef064a31b3c00", + "rev": "282e1e029cb6ab4811114fc85110613d72771dea", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } }, - "nixpkgs": { + "nixpkgs-stable": { "locked": { - "lastModified": 1703068421, - "narHash": "sha256-WSw5Faqlw75McIflnl5v7qVD/B3S2sLh+968bpOGrWA=", + "lastModified": 1749024892, + "narHash": "sha256-OGcDEz60TXQC+gVz5sdtgGJdKVYr6rwdzQKuZAJQpCA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d65bceaee0fb1e64363f7871bc43dc1c6ecad99f", + "rev": "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -40,7 +40,10 @@ "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs-stable" + ], + "nixpkgs-stable": "nixpkgs-stable" } } }, diff --git a/nix/os/devices/elias-e525/flake.nix b/nix/os/devices/elias-e525/flake.nix index d5bd2c5..ce104cb 100644 --- a/nix/os/devices/elias-e525/flake.nix +++ b/nix/os/devices/elias-e525/flake.nix @@ -1,8 +1,9 @@ { - inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + inputs.nixpkgs.follows = "nixpkgs-stable"; + inputs.nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; inputs.home-manager = { - url = "github:nix-community/home-manager/release-23.11"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/nix/os/devices/elias-e525/system.nix b/nix/os/devices/elias-e525/system.nix index d2a3efe..9922153 100644 --- a/nix/os/devices/elias-e525/system.nix +++ b/nix/os/devices/elias-e525/system.nix @@ -14,21 +14,23 @@ services.fprintd.enable = true; security.pam.services = { - login.fprintAuth = true; + # conflicts with nixpkgs' gdm.nix + # login.fprintAuth = true; sudo.fprintAuth = true; }; services = { xserver = { - layout = lib.mkForce "de"; - xkbVariant = lib.mkForce ""; - xkbOptions = lib.mkForce ""; - displayManager.autoLogin.enable = lib.mkForce false; + xkb.layout = lib.mkForce "de"; + xkb.variant = lib.mkForce ""; + xkb.options = lib.mkForce ""; displayManager.gdm.enable = lib.mkForce true; displayManager.lightdm.enable = lib.mkForce false; desktopManager.gnome.enable = true; }; + displayManager.autoLogin.enable = lib.mkForce false; + # dbus.packages = [ pkgs.gnome3.dconf ]; # udev.packages = [ pkgs.gnome3.gnome-settings-daemon ]; }; @@ -37,7 +39,7 @@ services.xserver.videoDrivers = [ "modesetting" ]; - boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; + # boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; nix.gc = { automatic = true; diff --git a/nix/os/devices/elias-e525/user.nix b/nix/os/devices/elias-e525/user.nix index c4690cf..0a46155 100644 --- a/nix/os/devices/elias-e525/user.nix +++ b/nix/os/devices/elias-e525/user.nix @@ -19,12 +19,12 @@ in users.extraUsers.elias = mkUser { uid = 1001; openssh.authorizedKeys.keys = keys.users.steveej.openssh; - passwordFile = config.sops.secrets.sharedUsers-elias.path; + hashedPasswordFile = config.sops.secrets.sharedUsers-elias.path; }; users.extraUsers.justyna = mkUser { uid = 1002; openssh.authorizedKeys.keys = keys.users.steveej.openssh; - passwordFile = config.sops.secrets.sharedUsers-justyna.path; + hashedPasswordFile = config.sops.secrets.sharedUsers-justyna.path; }; } diff --git a/nix/os/profiles/graphical-gnome-xorg.nix b/nix/os/profiles/graphical-gnome-xorg.nix index a13dd07..ba50a5b 100644 --- a/nix/os/profiles/graphical-gnome-xorg.nix +++ b/nix/os/profiles/graphical-gnome-xorg.nix @@ -1,9 +1,9 @@ { pkgs, lib, ... }: { + services.libinput.enable = true; + services.libinput.touchpad.naturalScrolling = true; services.xserver = { enable = true; - libinput.enable = true; - libinput.touchpad.naturalScrolling = true; videoDrivers = [ "qxl" @@ -15,9 +15,9 @@ "vmware" "modesetting" ]; - layout = "us"; - xkbVariant = "altgr-intl"; - xkbOptions = "nodeadkeys"; + xkb.layout = "us"; + xkb.variant = "altgr-intl"; + xkb.options = "nodeadkeys"; desktopManager = { # FIXME: gnome should be moved to user session @@ -41,14 +41,13 @@ # TODO: fully delegate graphical session to home-manager config services.gnome = { - gnome-online-miners.enable = lib.mkForce false; games.enable = false; gnome-remote-desktop.enable = false; gnome-user-share.enable = false; rygel.enable = false; sushi.enable = false; - tracker.enable = false; - tracker-miners.enable = false; + tinysparql.enable = false; + localsearch.enable = false; gnome-browser-connector.enable = false; gnome-initial-setup.enable = false; @@ -72,9 +71,8 @@ orca gnome-photos gnome-tour - ]) - ++ (with pkgs.gnome; [ - cheese # webcam tool + + snapshot # webcam tool gnome-music gnome-terminal gedit # text editor @@ -83,23 +81,24 @@ evince # document viewer gnome-characters totem # video player - tali # poker game - iagno # go game - hitori # sudoku game - atomix # puzzle game ]); - hardware.pulseaudio = { + services.pipewire = { + audio.enable = true; enable = true; - package = pkgs.pulseaudioFull; - support32Bit = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + wireplumber.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; }; services.dbus.packages = with pkgs; [ dconf ]; # More Services environment.systemPackages = [ - pkgs.gnome.adwaita-icon-theme + pkgs.adwaita-icon-theme pkgs.gnomeExtensions.appindicator ]; } diff --git a/nix/os/profiles/graphical/system.nix b/nix/os/profiles/graphical/system.nix index e39bc74..00ed2c2 100644 --- a/nix/os/profiles/graphical/system.nix +++ b/nix/os/profiles/graphical/system.nix @@ -53,8 +53,6 @@ services.printing = { enable = true; drivers = with pkgs; [ - mfcl3770cdwlpr - mfcl3770cdwcupswrapper ]; }; } diff --git a/nix/os/snippets/nix-settings.nix b/nix/os/snippets/nix-settings.nix index 6340977..6fb6347 100644 --- a/nix/os/snippets/nix-settings.nix +++ b/nix/os/snippets/nix-settings.nix @@ -36,5 +36,5 @@ in inherit (nodeFlake.inputs.nixpkgs) narHash; }; - nix.package = pkgsUnstable.nixVersions.latest; + nix.package = pkgs.nixVersions.latest; }