diff --git a/stube-pc/hardware-configuration.nix b/stube-pc/hardware-configuration.nix index b43f0c1..5ce65c4 100644 --- a/stube-pc/hardware-configuration.nix +++ b/stube-pc/hardware-configuration.nix @@ -16,6 +16,7 @@ fileSystems."/" = { device = "none"; fsType = "tmpfs"; + options = [ "defaults" "size=2G" "mode=755" ]; }; fileSystems."/nix" = diff --git a/stube-pc/home-manager.nix b/stube-pc/home-manager.nix index de5ff17..3167595 100644 --- a/stube-pc/home-manager.nix +++ b/stube-pc/home-manager.nix @@ -7,13 +7,17 @@ let Name=Q Light Controller Plus GenericName=Lighting control Keywords=qlc;light;controller;dmx;analog;midi;artnet;e131;osc; - Exec=${pkgs.qlcplus}/bin/qlcplus --kiosk --open /home/stube/.stube.qxw + Exec=${pkgs.qlcplus}/bin/qlcplus --kiosk --open /persist/qlc/stube.qxw Icon=qlcplus MimeType=application/x-qlc-workspace; Categories=Qt;AudioVideo; X-XFCE-Source=${pkgs.qlcplus}/share/applications/qlcplus.desktop ''; + edit-qlc-workspace = pkgs.writeScriptBin "edit_qlc_workspace.sh" '' + su -c "${pkgs.qlcplus}/bin/qlcplus --open /persist/qlc/stube.qxw" - admin + ''; + custom-menu-file = pkgs.writeText "custom.menu" '' @@ -202,9 +206,6 @@ in { home.persistence."/persist/home/stube" = { - files = [ - ".stube.qxw" - ]; directories = [ ".mixxx" # xfconf.settings needs an existing installation @@ -322,6 +323,7 @@ in vlc mpv libreoffice-still + edit-qlc-workspace ]; programs.firefox = { diff --git a/stube-pc/system.nix b/stube-pc/system.nix index a2cb763..a70663f 100644 --- a/stube-pc/system.nix +++ b/stube-pc/system.nix @@ -17,9 +17,12 @@ time.timeZone = "Europe/Berlin"; users.mutableUsers = false; - users.users.root = { - hashedPassword = "$y$j9T$0pAghPO9710DDgMEznC/I0$S2cMkfV2NpytDAk58oV75pT0G1Lnq/T3BAiO9gXeuOB"; - openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDbsWgnT1W25H5fDCekspaXzlIwvKh+rHygTId8xHotU" ]; + users.users.admin = { + isNormalUser = true; + hashedPassword = "$y$j9T$sYhrjA6IDTFVsUTVrw6aY/$c4qBwMc6SBMip4BWIpHPwzkyVgnOaHdvYxJDUIyw7q1"; + extraGroups = [ "wheel" "networkmanager" ]; + createHome = true; + openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDbsWgnT1W25H5fDCekspaXzlIwvKh+rHygTId8xHotU admin" ]; }; users.users.stube = { isNormalUser = true; @@ -91,7 +94,10 @@ services.openssh = { enable = true; openFirewall = true; - settings.PermitRootLogin = "prohibit-password"; + settings = { + PasswordAuthentication = false; + AllowUsers = [ "admin" ]; + }; }; system.stateVersion = "24.05";