started refactoring desktop setup

nixos/hosts/thalassa/eevee/configuration.nix

@@ -4,102 +4,18 @@
 
 { config, pkgs, inputs, ... }: {
   imports = [
+    ../../../common/desktop
     ./hardware-configuration.nix
     ./hardware.nix
-    ./desktop-env.nix
     ./networking.nix
   ];
 
-  # Bootloader.
-  boot = {
-    kernelPackages = pkgs.linuxPackages_latest;
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-      efi.efiSysMountPoint = "/boot/efi";
-    };
-    kernel.sysctl = { "fs.inotify.max_user_watches" = 524288; };
-    initrd = {
-      kernelModules = [ "amdgpu" ];
-      systemd.enable = true;
-      verbose = false;
-    };
-  };
-
-  fileSystems."/".options = [ "compress=zstd" ];
-
-  # Set your time zone.
-  time.timeZone = "Europe/Amsterdam";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_GB.UTF-8";
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "nl_NL.UTF-8";
-    LC_IDENTIFICATION = "nl_NL.UTF-8";
-    LC_MEASUREMENT = "nl_NL.UTF-8";
-    LC_MONETARY = "nl_NL.UTF-8";
-    LC_NAME = "nl_NL.UTF-8";
-    LC_NUMERIC = "nl_NL.UTF-8";
-    LC_PAPER = "nl_NL.UTF-8";
-    LC_TELEPHONE = "nl_NL.UTF-8";
-    LC_TIME = "nl_NL.UTF-8";
-  };
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  environment.systemPackages = with pkgs; [ wireguard-tools ];
-
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
     users.victor = import ./home;
     extraSpecialArgs = { inherit inputs; };
   };
-
-  # Enable sound with pipewire.
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
-  };
-
-  virtualisation = {
-    podman.enable = true;
-    libvirtd = {
-      enable = true;
-      qemu.package = pkgs.qemu_kvm;
-    };
-  };
-
-  fonts.fonts = with pkgs; [
-    material-design-icons
-    noto-fonts
-    noto-fonts-cjk
-    noto-fonts-emoji
-    dejavu_fonts
-    (nerdfonts.override {
-      fonts =
-        [ "DejaVuSansMono" "Ubuntu" "DroidSansMono" "NerdFontsSymbolsOnly" ];
-    })
-  ];
-
-  programs.steam = {
-    enable = true;
-    # Open ports in the firewall for Steam Remote Play
-    remotePlay.openFirewall = true;
-  };
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave

nixos/hosts/thalassa/eevee/desktop-env.nix

@@ -1,49 +0,0 @@
-{ pkgs, ... }: {
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-  services.xserver.videoDrivers = [ "nvidia" ];
-  services.xserver.excludePackages = [ pkgs.xterm ];
-
-  # Configure keymap in X11
-  services.xserver = {
-    layout = "us";
-    xkbVariant = "altgr-intl";
-  };
-
-  # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-  services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
-  environment.gnome.excludePackages =
-    (with pkgs; [ gnome-photos gnome-tour gnome-connections ])
-    ++ (with pkgs.gnome; [
-      atomix # puzzle game
-      epiphany # web browser
-      geary # email reader
-      gedit # text editor
-      gnome-calendar
-      gnome-clocks
-      gnome-contacts
-      gnome-maps
-      gnome-music
-      gnome-notes
-      gnome-terminal
-      gnome-weather
-      hitori # sudoku game
-      iagno # go game
-      simple-scan # document scanner
-      tali # poker game
-      totem # video player
-    ]);
-
-  # Services required for gnome
-  programs.dconf.enable = true;
-  services.dbus.enable = true;
-  services.udisks2.enable = true;
-
-  # Extra gnome packages
-  environment.systemPackages = with pkgs; [
-    gnome.gnome-tweaks
-    gnome.gnome-boxes
-  ];
-}

nixos/hosts/thalassa/eevee/hardware.nix

@@ -1,16 +1,19 @@
 { pkgs, config, ... }: {
   hardware.enableAllFirmware = true;
 
-  hardware.bluetooth.enable = true;
-
   services.hardware.bolt.enable = true;
 
+  services.xserver.videoDrivers = [ "nvidia" ];
   hardware.opengl.enable = true;
   hardware.nvidia.modesetting.enable = true;
   hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
 
   services.udev.packages = with pkgs; [ wooting-udev-rules ];
 
+
+  # FS
+  fileSystems."/".options = [ "compress=zstd" ];
+
   # SSD Trim
   services.fstrim.enable = true;
 }