about summary refs log tree commit diff
path: root/hosts
diff options
context:
space:
mode:
authorFranck Cuny <franck@fcuny.net>2022-06-09 09:28:45 -0700
committerFranck Cuny <franck@fcuny.net>2022-06-09 09:35:09 -0700
commit32cf02d926f09f8112378ee65f526bfbbcab7da2 (patch)
treee5f3fffa27b3ef438c85f2749bc214308e96ff39 /hosts
parentref(GTK): remove the profile for GTK (diff)
downloadworld-32cf02d926f09f8112378ee65f526bfbbcab7da2.tar.gz
ref(profiles): get rid of all the profiles
All the modules that are setup by the profiles are now managed at the
host level. This simplify some configuration, and will make it easier to
adjust things at the host instead of trying to squeeze everything into
profiles.

This will also help the refactoring later, when I'll split nixos and
home-manager configuration.

Change-Id: I17ffda8b0b5d15bf1915c6fae5030380523d74b5
Reviewed-on: https://cl.fcuny.net/c/world/+/297
Reviewed-by: Franck Cuny <franck@fcuny.net>
Diffstat (limited to 'hosts')
-rw-r--r--hosts/aptos/default.nix8
-rw-r--r--hosts/aptos/profile.nix4
-rw-r--r--hosts/aptos/services.nix6
-rw-r--r--hosts/carmel/default.nix9
-rw-r--r--hosts/carmel/profile.nix5
-rw-r--r--hosts/carmel/services.nix9
6 files changed, 30 insertions, 11 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;
+  };
+}