diff --git a/hosts/common/optional/gnome.nix b/hosts/common/optional/gnome.nix new file mode 100644 index 0000000..58ff7bb --- /dev/null +++ b/hosts/common/optional/gnome.nix @@ -0,0 +1,13 @@ +{ + services.xserver = { + enable = true; + displayManager = { + gdm.enable = true; + }; + desktopManager = { + gnome.enable = true; + }; + layout = "us"; + xkbVariant = ""; + }; +} \ No newline at end of file diff --git a/hosts/pixnix/services/printing.nix b/hosts/common/optional/printing.nix similarity index 100% rename from hosts/pixnix/services/printing.nix rename to hosts/common/optional/printing.nix diff --git a/hosts/pixnix/default.nix b/hosts/pixnix/default.nix index 0ea0d5d..897e9ea 100644 --- a/hosts/pixnix/default.nix +++ b/hosts/pixnix/default.nix @@ -4,14 +4,15 @@ inputs.hardware.nixosModules.common-pc-ssd ./hardware-configuration.nix - ./services ../common/global ../common/users/john ../common/optional/docker.nix + ../common/optional/gnome.nix ../common/optional/libvirtd.nix ../common/optional/pipewire.nix + ../common/optional/printing.nix ../common/optional/sshd.nix ]; diff --git a/hosts/pixnix/services/default.nix b/hosts/pixnix/services/default.nix deleted file mode 100644 index 0e007d0..0000000 --- a/hosts/pixnix/services/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./printing.nix - ./xserver.nix - ]; -} \ No newline at end of file diff --git a/hosts/pixnix/services/xserver.nix b/hosts/pixnix/services/xserver.nix deleted file mode 100644 index bd2b8ba..0000000 --- a/hosts/pixnix/services/xserver.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - services.xserver = { - enable = true; - displayManager.gdm.enable = true; - desktopManager.gnome.enable = true; - layout = "us"; - xkbVariant = ""; - }; -} \ No newline at end of file