about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--hosts/aptos/home.nix10
-rw-r--r--hosts/aptos/profile.nix5
-rw-r--r--hosts/aptos/services.nix2
-rw-r--r--hosts/carmel/home.nix10
-rw-r--r--profiles/default.nix2
-rw-r--r--profiles/trusted/default.nix22
6 files changed, 24 insertions, 27 deletions
diff --git a/hosts/aptos/home.nix b/hosts/aptos/home.nix
index c7ef977..9efab9e 100644
--- a/hosts/aptos/home.nix
+++ b/hosts/aptos/home.nix
@@ -13,5 +13,15 @@
     vlc.enable = true;
     mpv.enable = true;
     sublime-music.enable = true;
+    ssh.enable = true;
+    gpg = {
+      enable = true;
+      pinentry = "gnome3";
+      defaultKey = "23348B57F01D4234B5CFBA0923208AC01EB6EEA1";
+    };
+    gcloud.enable = true;
+    mail.enable = true;
+    pass.enable = true;
+    seahorse.enable = true;
   };
 }
diff --git a/hosts/aptos/profile.nix b/hosts/aptos/profile.nix
index 3195d52..f3f5d4e 100644
--- a/hosts/aptos/profile.nix
+++ b/hosts/aptos/profile.nix
@@ -1,7 +1,4 @@
 { ... }: {
 
-  my.profiles = {
-    desktop.enable = true;
-    trusted.enable = true;
-  };
+  my.profiles = { desktop.enable = true; };
 }
diff --git a/hosts/aptos/services.nix b/hosts/aptos/services.nix
index 5e98947..ce89f43 100644
--- a/hosts/aptos/services.nix
+++ b/hosts/aptos/services.nix
@@ -8,6 +8,8 @@ in {
     # Enable TLP power management
     tlp.enable = true;
 
+    syncthing.enable = true;
+
     backup = {
       enable = true;
       user = "fcuny";
diff --git a/hosts/carmel/home.nix b/hosts/carmel/home.nix
index c7ef977..9efab9e 100644
--- a/hosts/carmel/home.nix
+++ b/hosts/carmel/home.nix
@@ -13,5 +13,15 @@
     vlc.enable = true;
     mpv.enable = true;
     sublime-music.enable = true;
+    ssh.enable = true;
+    gpg = {
+      enable = true;
+      pinentry = "gnome3";
+      defaultKey = "23348B57F01D4234B5CFBA0923208AC01EB6EEA1";
+    };
+    gcloud.enable = true;
+    mail.enable = true;
+    pass.enable = true;
+    seahorse.enable = true;
   };
 }
diff --git a/profiles/default.nix b/profiles/default.nix
index 059b945..1dcb283 100644
--- a/profiles/default.nix
+++ b/profiles/default.nix
@@ -1 +1 @@
-{ ... }: { imports = [ ./gtk ./trusted ./wm ./desktop ]; }
+{ ... }: { imports = [ ./gtk ./wm ./desktop ]; }
diff --git a/profiles/trusted/default.nix b/profiles/trusted/default.nix
deleted file mode 100644
index 927ba45..0000000
--- a/profiles/trusted/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.my.profiles.trusted;
-  isEnabled = config.my.home.wm.windowManager == "sway";
-in {
-  options.my.profiles.trusted = with lib; {
-    enable = mkEnableOption "trusted profile";
-  };
-  config = lib.mkIf cfg.enable {
-    my.home.ssh.enable = true;
-    my.home.gpg = {
-      enable = true;
-      pinentry = "gnome3";
-      defaultKey = "23348B57F01D4234B5CFBA0923208AC01EB6EEA1";
-    };
-    my.home.gcloud.enable = true;
-    my.home.mail.enable = true;
-    my.home.pass.enable = true;
-    my.home.seahorse.enable = isEnabled;
-    my.services.syncthing.enable = true;
-  };
-}