From 57e3cda0745deb110a17fe149cc51593671c2def Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Sat, 17 Oct 2020 13:05:15 +0200
Subject: [PATCH] Cleanup

---
 modules/{ => profiles}/gorgon.nix | 41 +++++++++++--------------------
 modules/{ => profiles}/work.nix   |  0
 modules/syncthing.nix             |  7 ++++++
 3 files changed, 21 insertions(+), 27 deletions(-)
 rename modules/{ => profiles}/gorgon.nix (82%)
 rename modules/{ => profiles}/work.nix (100%)
 create mode 100644 modules/syncthing.nix

diff --git a/modules/gorgon.nix b/modules/profiles/gorgon.nix
similarity index 82%
rename from modules/gorgon.nix
rename to modules/profiles/gorgon.nix
index fb8734e..62f6f84 100644
--- a/modules/gorgon.nix
+++ b/modules/profiles/gorgon.nix
@@ -6,25 +6,24 @@ let
     MAILDIR = "\$HOME/.var/mail";
     MBLAZE = "\$HOME/.config/mblaze";
     NOTMUCH_CONFIG = "\$HOME/.config/notmuch/config";
-    #GDK_BACKEND= "x11";
     MOZ_ENABLE_WAYLAND= "1";
   };
   unstable = import <nixpkgs-unstable> {};
-  colors = import ./colors.nix;
-in
-{
+in {
+
   imports = [
-    ./direnv.nix
-    ./vim
-    ./tmux.nix
-    ./zsh.nix
-    ./gpg.nix
-    ./ssh.nix
-    ./git.nix
-    ./gtk.nix
-    ./xdg.nix
-    ./keyring.nix
-    ./kitty.nix
+    ../direnv.nix
+    ../vim
+    ../tmux.nix
+    ../zsh.nix
+    ../gpg.nix
+    ../ssh.nix
+    ../git.nix
+    ../gtk.nix
+    ../xdg.nix
+    ../keyring.nix
+    ../kitty.nix
+    ../syncthing.nix
   ];
 
   # Let Home Manager install and manage itself.
@@ -33,7 +32,6 @@ in
   home.sessionVariables = userEnv;
   systemd.user.sessionVariables = userEnv;
 
-
   home.packages = with pkgs; [
     anki
     aspell
@@ -110,17 +108,6 @@ in
     youtube-dl
   ]);
 
-  services.syncthing = {
-    enable = true;
-    tray = false;
-  };
-
-  services.screen-locker = {
-    enable = false;
-    inactiveInterval = 5;
-    lockCmd = "~/bin/lock-session";
-  };
-
   # This value determines the Home Manager release that your
   # configuration is compatible with. This helps avoid breakage
   # when a new Home Manager release introduces backwards
diff --git a/modules/work.nix b/modules/profiles/work.nix
similarity index 100%
rename from modules/work.nix
rename to modules/profiles/work.nix
diff --git a/modules/syncthing.nix b/modules/syncthing.nix
new file mode 100644
index 0000000..c1a8b1e
--- /dev/null
+++ b/modules/syncthing.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, lib, ... }:
+{
+  services.syncthing = {
+    enable = true;
+    tray = false;
+  };
+}