diff --git a/nixcfgs/hosts/zephyrus/default.nix b/nixcfgs/hosts/zephyrus/default.nix index 3956cab..c64b175 100644 --- a/nixcfgs/hosts/zephyrus/default.nix +++ b/nixcfgs/hosts/zephyrus/default.nix @@ -8,6 +8,8 @@ }: { imports = [ ../../modules/nixos + # ../../modules/nixos/users/js0ny.nix + # ../../modules/nixos/guest.nix ../../modules/nixos/laptop.nix ../../modules/nixos/disable-nvidia.nix ../../modules/nixos/additional-packages.nix @@ -15,8 +17,8 @@ ../../modules/nixos/docker.nix ../../modules/nixos/firefox.nix ../../modules/nixos/desktop/gnome.nix - ../../modules/nixos/desktop/kde.nix - ../../modules/nixos/display-manager/ly.nix + # ../../modules/nixos/desktop/kde.nix + ../../modules/nixos/display-manager/gdm.nix ./hardware-configuration.nix ./keyd.nix ./packages.nix diff --git a/nixcfgs/modules/nixos/display-manager/sddm.nix b/nixcfgs/modules/nixos/display-manager/sddm.nix index 727be2e..c572f22 100644 --- a/nixcfgs/modules/nixos/display-manager/sddm.nix +++ b/nixcfgs/modules/nixos/display-manager/sddm.nix @@ -1,6 +1,10 @@ -{...}: { +{pkgs, ...}: { services.displayManager.sddm = { enable = true; wayland.enable = true; + extraPackages = with pkgs; [ + sddm-astronaut + ]; + # theme = "sddm-astronaut-theme"; }; } diff --git a/nixcfgs/modules/nixos/guest.nix b/nixcfgs/modules/nixos/guest.nix new file mode 100644 index 0000000..9a95f1a --- /dev/null +++ b/nixcfgs/modules/nixos/guest.nix @@ -0,0 +1,25 @@ +{pkgs, ...}: { + users.users.guest = { + isNormalUser = true; + description = "Guest user"; + home = "/home/guest"; + extraGroups = [""]; # 可选,是否允许 sudo + shell = pkgs.bash; + # hashedPassword = ""; # 空密码,意味着需要手动设置或禁用登录 + # 或者直接禁止密码登录: + hashedPassword = null; + }; + + systemd.services."guest-reset-home" = { + description = "Reset guest home directory on boot"; + wantedBy = ["multi-user.target"]; + serviceConfig = { + Type = "oneshot"; + ExecStart = '' + rm -rf /home/guest/* + cp -r /etc/skel/. /home/guest/ + chown -R guest:guest /home/guest + ''; + }; + }; +} diff --git a/nixcfgs/users/js0ny/programs/gnome.nix b/nixcfgs/users/js0ny/programs/gnome.nix index f76df5f..63bce2e 100644 --- a/nixcfgs/users/js0ny/programs/gnome.nix +++ b/nixcfgs/users/js0ny/programs/gnome.nix @@ -3,6 +3,7 @@ gnome-tweaks sushi orchis-theme + adwaita-qt gnomeExtensions.dash-to-dock gnomeExtensions.caffeine gnomeExtensions.logo-menu @@ -44,5 +45,16 @@ symbolic-icon = true; use-custom-icon = false; }; + "org/gnome/shell" = { +favorite-apps = [ + "org.kde.dolphin.desktop" + "com.mitchellh.ghostty.desktop" + "chromium-browser.desktop" + "code.desktop" + ]; + }; + }; + + qt.style.name = "adwaita"; }