diff --git a/nixos/boxes/foureighty.nix b/nixos/boxes/foureighty.nix index 83b9b522..2dcbf59d 100644 --- a/nixos/boxes/foureighty.nix +++ b/nixos/boxes/foureighty.nix @@ -1,6 +1,5 @@ { config, pkgs, ... }: { - networking.hostName = "foureighty"; nixpkgs.config.packageOverrides = pkgs: { linux_latest_hardened = pkgs.linux_latest_hardened.override { @@ -67,5 +66,6 @@ ../gfx-intel.nix ../virtualbox.nix ../zerotier.nix + ../i3/root.nix ]; } diff --git a/nixos/common-services.nix b/nixos/common-services.nix index 270f056a..05932490 100644 --- a/nixos/common-services.nix +++ b/nixos/common-services.nix @@ -39,9 +39,6 @@ timerConfig = { OnCalendar = "hourly"; }; }; - autorandr.enable = true; - - colord.enable = true; xserver = { enable = true; layout = "pl"; @@ -58,10 +55,6 @@ Option "AccelMethod" "sna" ''; - displayManager.sddm = { - enable = true; - enableHidpi = true; - }; }; }; } diff --git a/nixos/gnome.nix b/nixos/gnome.nix new file mode 100644 index 00000000..783b148c --- /dev/null +++ b/nixos/gnome.nix @@ -0,0 +1,9 @@ +{ config, pkgs, ... }: +{ + + services.xserver.enable = true; + services.xserver.displayManager.gdm.enable = true; + services.xserver.displayManager.gdm.wayland = false; + services.xserver.desktopManager.gnome3.enable = true; +} + diff --git a/nixos/i3/root.nix b/nixos/i3/root.nix new file mode 100644 index 00000000..2c2388c5 --- /dev/null +++ b/nixos/i3/root.nix @@ -0,0 +1,11 @@ +{ config, pkgs, ... }: +{ + services = { + colord.enable = true; + autorandr.enable = true; + xserver.displayManager.sddm = { + enable = true; + enableHidpi = true; + }; + }; +}