From bd94372c5182e529bd958000186ed2377a9d464b Mon Sep 17 00:00:00 2001
From: joy <mail@joygnu.org>
Date: Fri, 18 Oct 2024 00:18:15 +0200
Subject: [PATCH] norm gone

---
 modules/programs/default.nix                        | 4 ----
 modules/programs/{norm => home}/code/default.nix    | 0
 modules/programs/home/default.nix                   | 1 +
 modules/programs/{norm => home}/misc/default.nix    | 2 +-
 modules/programs/norm/default.nix                   | 8 --------
 modules/programs/norm/gpg/default.nix               | 8 --------
 modules/services/default.nix                        | 1 +
 modules/{programs/norm => services}/ssh/default.nix | 0
 8 files changed, 3 insertions(+), 21 deletions(-)
 rename modules/programs/{norm => home}/code/default.nix (100%)
 rename modules/programs/{norm => home}/misc/default.nix (92%)
 delete mode 100644 modules/programs/norm/default.nix
 delete mode 100644 modules/programs/norm/gpg/default.nix
 rename modules/{programs/norm => services}/ssh/default.nix (100%)

diff --git a/modules/programs/default.nix b/modules/programs/default.nix
index 7de5b20..b91a125 100644
--- a/modules/programs/default.nix
+++ b/modules/programs/default.nix
@@ -5,8 +5,4 @@
       "joy" = import ./home;
     };
   };
-
-  imports = [
-    ./norm
-  ];
 }
diff --git a/modules/programs/norm/code/default.nix b/modules/programs/home/code/default.nix
similarity index 100%
rename from modules/programs/norm/code/default.nix
rename to modules/programs/home/code/default.nix
diff --git a/modules/programs/home/default.nix b/modules/programs/home/default.nix
index d1ab100..f0dd3c4 100644
--- a/modules/programs/home/default.nix
+++ b/modules/programs/home/default.nix
@@ -14,5 +14,6 @@
     ./tmux
     ./mail
     ./yazi
+    ./misc
   ];
 }
diff --git a/modules/programs/norm/misc/default.nix b/modules/programs/home/misc/default.nix
similarity index 92%
rename from modules/programs/norm/misc/default.nix
rename to modules/programs/home/misc/default.nix
index 6f56b6a..eb3dbc1 100644
--- a/modules/programs/norm/misc/default.nix
+++ b/modules/programs/home/misc/default.nix
@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
+  home.packages = with pkgs; [
     # cli
     git
     htop
diff --git a/modules/programs/norm/default.nix b/modules/programs/norm/default.nix
deleted file mode 100644
index 768d79c..0000000
--- a/modules/programs/norm/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  imports = [
-    ./ssh
-    ./gpg
-    ./misc
-    ./code
-  ];
-}
diff --git a/modules/programs/norm/gpg/default.nix b/modules/programs/norm/gpg/default.nix
deleted file mode 100644
index 95e24d2..0000000
--- a/modules/programs/norm/gpg/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{pkgs, ...}: {
-  services.pcscd.enable = true;
-  programs.gnupg.agent = {
-    enable = true;
-    pinentryPackage = pkgs.pinentry-curses;
-    enableSSHSupport = true;
-  };
-}
diff --git a/modules/services/default.nix b/modules/services/default.nix
index 6f8e980..252d301 100644
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -8,6 +8,7 @@
     ./docker
     ./invidious
     ./forgejo
+    ./ssh
     ./misc
   ];
 }
diff --git a/modules/programs/norm/ssh/default.nix b/modules/services/ssh/default.nix
similarity index 100%
rename from modules/programs/norm/ssh/default.nix
rename to modules/services/ssh/default.nix