diff options
| -rw-r--r-- | nixos/laptop/configuration.nix | 2 | ||||
| -rw-r--r-- | nixos/nixosModules/greetd.nix | 9 | ||||
| -rw-r--r-- | nixos/pc/configuration.nix | 14 |
3 files changed, 20 insertions, 5 deletions
diff --git a/nixos/laptop/configuration.nix b/nixos/laptop/configuration.nix index 8bd7980..d20f811 100644 --- a/nixos/laptop/configuration.nix +++ b/nixos/laptop/configuration.nix @@ -12,11 +12,13 @@ ./hardware-configuration.nix ../nixosModules/powerbutton.nix ../nixosModules/docker.nix + ../nixosModules/greetd.nix ]; # from nixosModules pbutton.disable = true; docker.enable = true; + greetd.command = "Hyprland"; time.timeZone = "Europe/Moscow"; networking.hostName = "ltrr-mini"; diff --git a/nixos/nixosModules/greetd.nix b/nixos/nixosModules/greetd.nix index f391d68..0503e7d 100644 --- a/nixos/nixosModules/greetd.nix +++ b/nixos/nixosModules/greetd.nix @@ -1,15 +1,18 @@ -{ pkgs, config, lib, inputs, outputs, ... }: +{ pkgs, config, lib, ... }: { options = { - greetd.enable = lib.mkEnableOption "enable greetd"; + greetd = { + enable = lib.mkEnableOption "enable greetd"; + command = lib.mkOption { type = lib.types.str; }; + }; }; config = lib.mkIf config.greetd.enable { services.greetd = { enable = true; settings = { default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet -t -r -c Hyprland"; + command = "${pkgs.greetd.tuigreet}/bin/tuigreet -t -r --asterisks --user-menu -c ${config.greetd.command}"; user = "jerpo"; }; }; diff --git a/nixos/pc/configuration.nix b/nixos/pc/configuration.nix index 5d15f41..f77564f 100644 --- a/nixos/pc/configuration.nix +++ b/nixos/pc/configuration.nix @@ -1,8 +1,9 @@ -{ inputs, outputs, lib, config, pkgs, ... }: { +{ pkgs, ... }: { imports = [ ../general.nix ./hardware-configuration.nix ../nixosModules/printing.nix + ../nixosModules/greetd.nix ]; time.timeZone = "Asia/Yekaterinburg"; @@ -10,12 +11,21 @@ printing.enable = true; + programs.adb.enable = true; + services.udev.packages = [ + pkgs.android-udev-rules + ]; + services.xserver = { enable = true; displayManager.startx.enable = true; }; - + services.openssh.enable = true; + + greetd.command = "startx"; + + system.stateVersion = "24.11"; } |
