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

mostly fix up stateVersions

Browse source
This commit is contained in:
steveej 2024-01-22 23:47:48 +00:00
parent c95e82b19a
commit e1749d3ae7
8 changed files with 136 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nix/os/devices/steveej-t14/pkg.nix
View file

@ -4,7 +4,12 @@
, nodeFlake
, ...
}: {
system.stateVersion = "23.05";
home-manager.users.root = _: {
home.stateVersion = "22.05";
};
home-manager.users.steveej = _: {
home.stateVersion = "22.05";
imports = [
../../../home-manager/configuration/graphical-fullblown.nix
@ -103,5 +108,4 @@
# # };
# };
system.stateVersion = "23.05";
}

2
nix/os/devices/steveej-t14/user.nix
View file

@ -8,7 +8,7 @@ let
inherit (pkgs.callPackage ../../lib/default.nix { }) mkUser;
in
{
users.extraUsers.steveej2 = mkUser {
users.users.steveej2 = mkUser {
uid = 1001;
openssh.authorizedKeys.keys = keys.users.steveej.openssh;
hashedPasswordFile = config.sops.secrets.sharedUsers-steveej.path;

7
nix/os/devices/steveej-x13s/configuration.nix
View file

@ -55,6 +55,7 @@
nodeFlake.inputs.home-manager.nixosModules.home-manager
../../snippets/sway-desktop.nix
../../snippets/timezone.nix
# ../../snippets/radicale.nix
];
@ -82,6 +83,9 @@
];
system.stateVersion = "23.11";
home-manager.users.root = _: {
home.stateVersion = "23.11";
};
home-manager.users.steveej = _: {
home.stateVersion = "23.11";
@ -89,6 +93,9 @@
../../../home-manager/configuration/graphical-fullblown.nix
];
# seems to be broke on install
programs.chromium.enable = lib.mkForce false;
home.sessionVariables = { };
home.packages = with pkgs; [

6
nix/os/devices/steveej-x13s/flake.nix
View file

@ -30,6 +30,7 @@
targetPlatform = "aarch64-linux";
buildPlatform = "x86_64-linux";
nodeName = "steveej-x13s";
repoFlake = get-flake ../../../..;
mkNixosConfiguration = { extraModules ? [ ], ... } @ attrs:
nixpkgs.lib.nixosSystem (
@ -38,15 +39,14 @@
{
specialArgs = (import ./default.nix {
system = targetPlatform;
inherit nodeName;
inherit nodeName repoFlake;
repoFlake = get-flake ../../../..;
nodeFlake = self;
}).meta.nodeSpecialArgs.${nodeName};
modules =
[
({ repoFlake, ... }: repoFlake.nixosModules.hardware-x13s)
repoFlake.nixosModules.hardware-x13s
./configuration.nix
]

21
nix/os/snippets/sway-desktop.nix
View file

@ -65,26 +65,27 @@ in
security.pam.services.getty.enableGnomeKeyring = true;
services.gnome.gnome-keyring.enable = true;
# autologin steveej on tty1
# TODO: make user configurable
systemd.services."autovt@tty1".description = "Autologin at the TTY1";
systemd.services."autovt@tty1".after = [ "systemd-logind.service" ]; # without it user session not started and xorg can't be run from this tty
systemd.services."autovt@tty1".wantedBy = [ "multi-user.target" ];
systemd.services."autovt@tty1".serviceConfig =
{
ExecStart = [
"" # override upstream default with an empty ExecStart
"@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login --autologin steveej --noclear %I $TERM"
];
Restart = "always";
Type = "idle";
};
systemd.services."autovt@tty1".serviceConfig = {
ExecStart = [
"" # override upstream default with an empty ExecStart
"@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login --autologin steveej --noclear %I $TERM"
];
Restart = "always";
Type = "idle";
};
programs.zsh.loginShellInit = ''
if test $(id --user steveej) = $(id -u) && test $(tty) = "/dev/tty1"; then
exec sway
fi
'';
home-manager.users.${homeUser} = _: {
home-manager.users."${homeUser}" = _: {
imports = [
../../home-manager/profiles/sway-desktop.nix
];

2
nix/os/snippets/timezone.nix
View file

@ -1,7 +1,7 @@
{ lib, ... }:
let
passwords = import ../../../variables/passwords.crypt.nix;
passwords = import ../../variables/passwords.crypt.nix;
in
{