diff --git a/hosts/lemp11/configuration.nix b/hosts/lemp11/configuration.nix index 98a2372c..63617ef6 100644 --- a/hosts/lemp11/configuration.nix +++ b/hosts/lemp11/configuration.nix @@ -3,9 +3,6 @@ { imports = with inputs.self.nixosModules; [ ./hardware-configuration.nix - ./hardware.nix - ./programs.nix - ./services.nix mixins-avahi mixins-bluetooth @@ -18,6 +15,51 @@ users-luke ]; + services = { + auto-cpufreq.enable = true; + gvfs.enable = true; + openssh.enable = true; + power-profiles-daemon.enable = false; + thermald.enable = true; + + pipewire = { + enable = true; + + alsa = { + enable = true; + support32Bit = true; + }; + + pulse.enable = true; + }; + + printing.enable = true; + pulseaudio.enable = false; + + xserver = { + enable = true; + + xkb = { + layout = "gb"; + variant = ""; + }; + + desktopManager.cinnamon.enable = true; + displayManager.lightdm.enable = true; + }; + }; + + programs = { + firefox = { + enable = true; + languagePacks = [ "en-GB" ]; + preferences = { + "intl.accept_languages" = "en-GB, en"; + "intl.regional_prefs.use_os_locales" = true; + }; + }; + }; + # Bootloader. boot = { loader = { diff --git a/hosts/lemp11/hardware.nix b/hosts/lemp11/hardware.nix deleted file mode 100644 index a3123505..00000000 --- a/hosts/lemp11/hardware.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - hardware = { - bluetooth.enable = true; - sane.enable = true; - }; -} diff --git a/hosts/lemp11/programs.nix b/hosts/lemp11/programs.nix deleted file mode 100644 index c4874312..00000000 --- a/hosts/lemp11/programs.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ pkgs, ... }: - -{ - programs = { - firefox = { - enable = true; - languagePacks = [ "en-GB" ]; - preferences = { - "intl.accept_languages" = "en-GB, en"; - "intl.regional_prefs.use_os_locales" = true; - }; - }; - }; -} diff --git a/hosts/lemp11/services.nix b/hosts/lemp11/services.nix deleted file mode 100644 index 0a219ba0..00000000 --- a/hosts/lemp11/services.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - services = { - auto-cpufreq.enable = true; - gvfs.enable = true; - openssh.enable = true; - power-profiles-daemon.enable = false; - thermald.enable = true; - - pipewire = { - enable = true; - - alsa = { - enable = true; - support32Bit = true; - }; - - pulse.enable = true; - }; - - printing.enable = true; - pulseaudio.enable = false; - - xserver = { - enable = true; - - xkb = { - layout = "gb"; - variant = ""; - }; - - desktopManager.cinnamon.enable = true; - displayManager.lightdm.enable = true; - }; - }; -}