move configurations and modules around

Sorry, this is a mess, hopefully the last one.

20 files changed, 65 insertions, 26 deletions

diff --git a/hosts/commons/default.nix b/hosts/commons/default.nix
index 4f35a15..0361d27 100644
--- a/hosts/commons/default.nix
+++ b/hosts/commons/default.nix
@@ -2,15 +2,6 @@
 
 {
   imports = [
-    ./network.nix
+    ./system
   ];
-
-  environment = {
-    # Activate home-manager environment, if not already enabled
-    loginShellInit = ''
-      [ -d "$HOME/.nix-profile" ] || /nix/var/nix/profiles/per-user/$USER/home-manager/activate &> /dev/null
-    '';
-    homeBinInPath = true;
-    localBinInPath = true;
-  };
 }
diff --git a/modules/desktop/default.nix b/hosts/commons/desktop/default.nix
index f150066..f150066 100644
--- a/modules/desktop/default.nix
+++ b/hosts/commons/desktop/default.nix
diff --git a/modules/desktop/fonts.nix b/hosts/commons/desktop/fonts.nix
index a840582..a840582 100644
--- a/modules/desktop/fonts.nix
+++ b/hosts/commons/desktop/fonts.nix
diff --git a/modules/desktop/sound.nix b/hosts/commons/desktop/sound.nix
index 95c7c75..95c7c75 100644
--- a/modules/desktop/sound.nix
+++ b/hosts/commons/desktop/sound.nix
diff --git a/modules/desktop/xserver.nix b/hosts/commons/desktop/xserver.nix
index 1b96d03..7537863 100644
--- a/modules/desktop/xserver.nix
+++ b/hosts/commons/desktop/xserver.nix
@@ -20,15 +20,4 @@
       i3.enable = true;
     };
   };
-
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-
-  environment.sessionVariables.TERMINAL = [ "alacritty" ];
-  environment.sessionVariables.TERM = [ "xterm-256color" ];
-
-  services.gnome.gnome-keyring.enable = true;
-  services.gvfs.enable = true;
 }
diff --git a/hosts/commons/system/boot.nix b/hosts/commons/system/boot.nix
new file mode 100644
index 0000000..974b072
--- /dev/null
+++ b/hosts/commons/system/boot.nix
@@ -0,0 +1,8 @@
+{ pkgs, config, lib, ... }:
+
+{
+  boot = {
+    kernelPackages = pkgs.linuxPackages_latest;
+    tmpOnTmpfs = true;
+  };
+}
diff --git a/modules/systems/default.nix b/hosts/commons/system/default.nix
index 27fb53b..64cb51b 100644
--- a/modules/systems/default.nix
+++ b/hosts/commons/system/default.nix
@@ -2,16 +2,15 @@
 
 {
   imports = [
+    ./boot.nix
     ./motd.nix
+    ./network.nix
     ./nix.nix
     ./software.nix
     ./ssh.nix
     ./users.nix
   ];
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.tmpOnTmpfs = true;
-
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
   console = {
diff --git a/modules/systems/motd.nix b/hosts/commons/system/motd.nix
index 898d03f..898d03f 100644
--- a/modules/systems/motd.nix
+++ b/hosts/commons/system/motd.nix
diff --git a/hosts/commons/network.nix b/hosts/commons/system/network.nix
index df5aa27..df5aa27 100644
--- a/hosts/commons/network.nix
+++ b/hosts/commons/system/network.nix
diff --git a/modules/systems/nix.nix b/hosts/commons/system/nix.nix
index 48379a4..48379a4 100644
--- a/modules/systems/nix.nix
+++ b/hosts/commons/system/nix.nix
diff --git a/modules/systems/software.nix b/hosts/commons/system/software.nix
index fa919ae..fa919ae 100644
--- a/modules/systems/software.nix
+++ b/hosts/commons/system/software.nix
diff --git a/modules/systems/ssh.nix b/hosts/commons/system/ssh.nix
index 0ecca80..0ecca80 100644
--- a/modules/systems/ssh.nix
+++ b/hosts/commons/system/ssh.nix
diff --git a/modules/systems/users.nix b/hosts/commons/system/users.nix
index 2b769c4..2b769c4 100644
--- a/modules/systems/users.nix
+++ b/hosts/commons/system/users.nix
diff --git a/users/fcuny/desktop/default.nix b/users/fcuny/desktop/default.nix
index 9f0bcf3..3a1e21a 100644
--- a/users/fcuny/desktop/default.nix
+++ b/users/fcuny/desktop/default.nix
@@ -9,6 +9,7 @@
     ./terminal.nix
     ./gtk.nix
     ./xdg.nix
+    ./trust
   ];
 
   home.packages = [
@@ -17,4 +18,18 @@
     pkgs.gnome3.nautilus
     pkgs.transmission-remote-gtk
   ];
+
+  environment = {
+    sessionVariables = {
+      TERMINAL = [ "alacritty" ];
+      TERM = [ "xterm-256color" ];
+    };
+
+    # Activate home-manager environment, if not already enabled
+    loginShellInit = ''
+      [ -d "$HOME/.nix-profile" ] || /nix/var/nix/profiles/per-user/$USER/home-manager/activate &> /dev/null
+    '';
+    homeBinInPath = true;
+    localBinInPath = true;
+  };
 }
diff --git a/users/fcuny/desktop/gtk.nix b/users/fcuny/desktop/gtk.nix
index 492c331..8bc11a2 100644
--- a/users/fcuny/desktop/gtk.nix
+++ b/users/fcuny/desktop/gtk.nix
@@ -16,7 +16,6 @@
 
     gtk2 = {
       extraConfig = ''
-        gtk-application-prefer-dark-theme = true
         gtk-xft-antialias = 1
         gtk-xft-hinting = 1
         gtk-xft-hintstyle = "hintslight"
@@ -26,11 +25,12 @@
 
     gtk3 = {
       extraConfig = {
-        gtk-application-prefer-dark-theme = true;
         gtk-xft-antialias = 1;
         gtk-xft-hinting = 1;
         gtk-xft-hintstyle = "hintslight";
       };
     };
   };
+
+  services.gvfs.enable = true;
 }
diff --git a/users/fcuny/desktop/trust/default.nix b/users/fcuny/desktop/trust/default.nix
new file mode 100644
index 0000000..d881926
--- /dev/null
+++ b/users/fcuny/desktop/trust/default.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./git.nix
+    ./keyring.nix
+    ./pass.nix
+    ./pgp.nix
+  ];
+}
diff --git a/users/fcuny/desktop/trust/git.nix b/users/fcuny/desktop/trust/git.nix
new file mode 100644
index 0000000..52607a3
--- /dev/null
+++ b/users/fcuny/desktop/trust/git.nix
@@ -0,0 +1,8 @@
+{
+  programs.git = {
+    signing = {
+      signByDefault = true;
+      key = "23348B57F01D4234B5CFBA0923208AC01EB6EEA1";
+    };
+  };
+}
diff --git a/users/fcuny/desktop/trust/keyring.nix b/users/fcuny/desktop/trust/keyring.nix
new file mode 100644
index 0000000..222448a
--- /dev/null
+++ b/users/fcuny/desktop/trust/keyring.nix
@@ -0,0 +1,5 @@
+{ config, lib, pkgs, ... }:
+
+{
+  services.gnome.gnome-keyring.enable = true;
+}
diff --git a/users/fcuny/desktop/pass.nix b/users/fcuny/desktop/trust/pass.nix
index d430ec8..d430ec8 100644
--- a/users/fcuny/desktop/pass.nix
+++ b/users/fcuny/desktop/trust/pass.nix
diff --git a/users/fcuny/desktop/trust/pgp.nix b/users/fcuny/desktop/trust/pgp.nix
new file mode 100644
index 0000000..0d59837
--- /dev/null
+++ b/users/fcuny/desktop/trust/pgp.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+{
+  services.gpg-agent = {
+    enable = true;
+    enableSshSupport = true;
+    pinentryFlavor = "gnome3";
+  };
+
+  programs.gpg = {
+    enable = true;
+  };
+}
+