steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

feat(elias-e525): bump to 25.05

Browse source
This commit is contained in:
steveej 2025-06-04 17:22:06 +02:00
parent f6f7e911d4
commit 1153240aac
13 changed files with 63 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -153,7 +153,7 @@
"steveej-t14"
"steveej-x13s"
"steveej-x13s-rmvbl"
# "elias-e525"
"elias-e525"
# "justyna-p300"
# "srv0-dmz0"

2
nix/devShells.nix
View file

@ -84,6 +84,8 @@
screen
inputs'.nixpkgs-unstable.legacyPackages.kanidm
(flameshot.override { enableWlrSupport = true; })
];
# Set Environment Variables

6
nix/home-manager/configuration/graphical-gnome3.nix
View file

@ -1,8 +1,8 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
gnome.gnome-tweaks
gnome.gnome-keyring
gnome.seahorse
gnome-tweaks
gnome-keyring
seahorse
];
}

6
nix/home-manager/configuration/graphical-removable.nix
View file

@ -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

7
nix/home-manager/profiles/sway-desktop.nix
View file

@ -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";
}
];
};
};

4
nix/os/devices/elias-e525/default.nix
View file

@ -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 = [

23
nix/os/devices/elias-e525/flake.lock generated
View file

@ -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"
}
}
},

5
nix/os/devices/elias-e525/flake.nix
View file

@ -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";
};

14
nix/os/devices/elias-e525/system.nix
View file

@ -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;

4
nix/os/devices/elias-e525/user.nix
View file

@ -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;
};
}

37
nix/os/profiles/graphical-gnome-xorg.nix
View file

@ -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
];
}

2
nix/os/profiles/graphical/system.nix
View file

@ -53,8 +53,6 @@
services.printing = {
enable = true;
drivers = with pkgs; [
mfcl3770cdwlpr
mfcl3770cdwcupswrapper
];
};
}

2
nix/os/snippets/nix-settings.nix
View file

@ -36,5 +36,5 @@ in
inherit (nodeFlake.inputs.nixpkgs) narHash;
};
nix.package = pkgsUnstable.nixVersions.latest;
nix.package = pkgs.nixVersions.latest;
}