diff options
| -rw-r--r-- | hosts/aptos/default.nix | 8 | ||||
| -rw-r--r-- | hosts/aptos/profile.nix | 4 | ||||
| -rw-r--r-- | hosts/aptos/services.nix | 6 | ||||
| -rw-r--r-- | hosts/carmel/default.nix | 9 | ||||
| -rw-r--r-- | hosts/carmel/profile.nix | 5 | ||||
| -rw-r--r-- | hosts/carmel/services.nix | 9 | ||||
| -rw-r--r-- | lib/default.nix | 1 | ||||
| -rw-r--r-- | profiles/default.nix | 1 | ||||
| -rw-r--r-- | profiles/desktop/default.nix | 19 | ||||
| -rw-r--r-- | profiles/wm/default.nix | 18 |
10 files changed, 30 insertions, 50 deletions
diff --git a/hosts/aptos/default.nix b/hosts/aptos/default.nix index 08fb55e..70a79ed 100644 --- a/hosts/aptos/default.nix +++ b/hosts/aptos/default.nix @@ -5,7 +5,6 @@ ./hardware.nix ./sound.nix ./networking.nix - ./profile.nix ./home.nix ./services.nix ]; @@ -13,6 +12,13 @@ # Allow setting GTK configuration using home-manager programs.dconf.enable = true; + # install and configure the fonts + my.systems.fonts.enable = true; + + # install and configure sway + my.programs.sway.enable = true; + my.home.wm.windowManager = "sway"; + virtualisation.docker = { enable = true; }; virtualisation.containerd = { diff --git a/hosts/aptos/profile.nix b/hosts/aptos/profile.nix deleted file mode 100644 index f3f5d4e..0000000 --- a/hosts/aptos/profile.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ ... }: { - - my.profiles = { desktop.enable = true; }; -} diff --git a/hosts/aptos/services.nix b/hosts/aptos/services.nix index ce89f43..ab8efe5 100644 --- a/hosts/aptos/services.nix +++ b/hosts/aptos/services.nix @@ -8,6 +8,12 @@ in { # Enable TLP power management tlp.enable = true; + # enable a few services related to the gnome desktop + gnome.enable = true; + + # we need avahi in order to use the printer/scanner + avahi.enable = true; + syncthing.enable = true; backup = { diff --git a/hosts/carmel/default.nix b/hosts/carmel/default.nix index bfe0502..386cad6 100644 --- a/hosts/carmel/default.nix +++ b/hosts/carmel/default.nix @@ -7,12 +7,19 @@ ./sound.nix ./networking.nix ./home.nix - ./profile.nix + ./services.nix ]; # Allow setting GTK configuration using home-manager programs.dconf.enable = true; + # install and configure the fonts + my.systems.fonts.enable = true; + + # install and configure sway + my.programs.sway.enable = true; + my.home.wm.windowManager = "sway"; + hardware.opengl.driSupport = true; # This value determines the NixOS release from which the default diff --git a/hosts/carmel/profile.nix b/hosts/carmel/profile.nix deleted file mode 100644 index 6174a60..0000000 --- a/hosts/carmel/profile.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: - -{ - my.profiles.desktop.enable = true; -} diff --git a/hosts/carmel/services.nix b/hosts/carmel/services.nix new file mode 100644 index 0000000..e1432b2 --- /dev/null +++ b/hosts/carmel/services.nix @@ -0,0 +1,9 @@ +{ config, ... }: { + my.services = { + # enable a few services related to the gnome desktop + gnome.enable = true; + + # we need avahi in order to use the printer/scanner + avahi.enable = true; + }; +} diff --git a/lib/default.nix b/lib/default.nix index 595e119..8b46c58 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -12,7 +12,6 @@ }; modules = [ ../modules - ../profiles ../hosts/${hostname} ./private-wireguard.nix { diff --git a/profiles/default.nix b/profiles/default.nix deleted file mode 100644 index 19780e7..0000000 --- a/profiles/default.nix +++ /dev/null @@ -1 +0,0 @@ -{ ... }: { imports = [ ./wm ./desktop ]; } diff --git a/profiles/desktop/default.nix b/profiles/desktop/default.nix deleted file mode 100644 index 50b7828..0000000 --- a/profiles/desktop/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ config, lib, ... }: -let cfg = config.my.profiles.desktop; -in { - options.my.profiles.desktop = with lib; { - enable = mkEnableOption "desktop profile"; - }; - config = lib.mkIf cfg.enable { - my = { - systems = { fonts.enable = true; }; - services = { - gnome.enable = true; - # we need avahi in order to use the printer/scanner - avahi.enable = true; - }; - profiles = { wm.windowManager = "sway"; }; - programs = { sway.enable = true; }; - }; - }; -} diff --git a/profiles/wm/default.nix b/profiles/wm/default.nix deleted file mode 100644 index 7b1fe39..0000000 --- a/profiles/wm/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, lib, ... }: -let cfg = config.my.profiles.wm; -in { - options.my.profiles.wm = with lib; { - windowManager = mkOption { - type = with types; nullOr (enum [ "sway" ]); - default = null; - example = "sway"; - description = "Which window manager to use"; - }; - }; - config = lib.mkMerge [ - (lib.mkIf (cfg.windowManager == "sway") { - # Enable sway - my.home.wm.windowManager = "sway"; - }) - ]; -} |