12 files changed, 7 insertions, 68 deletions
diff --git a/modules/common/adguard/default.nix b/modules/adguard/default.nix
index 9cb7cc2..9cb7cc2 100644
--- a/modules/common/adguard/default.nix
+++ b/modules/adguard/default.nix
diff --git a/modules/common/default.nix b/modules/common/default.nix
deleted file mode 100644
index b2c7196..0000000
--- a/modules/common/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  imports =[
-    # names are self explanatory
-    ./adguard
-    ./doas
-    ./fonts
-    ./gnupg
-    ./i18n 
-    ./nh   
-    ./pipewire
-    ./searx
-    ./ssh
-    ./sudo
-    ./users
-  ];
-
-  nix = {
-    settings = {
-      # Enable flakes
-      experimental-features = [ "nix-command" "flakes" ];
-
-      # Optimize storage
-      auto-optimise-store = true;
-
-      # substituters = lib.mkForce [ ];
-      # trusted-substituters = lib.mkForce [ ];
-      # require-sigs = false;
-    };
-  };
-
-  # Allow unfree packages
-  nixpkgs = {
-    config.allowUnfree = true;
-  };
-
-  # List packages installed in system profile. 
-  # These should be tools in case user tools brake.
-  # To search, run:
-  # $ nix search <pkgname>
-  # or
-  # $ nh search <pkgname>
-  environment.systemPackages = with pkgs; [
-  	alacritty
-    git
-    helix
-    xdg-utils
-  ];
-}
diff --git a/modules/common/doas/default.nix b/modules/common/doas/default.nix
deleted file mode 100644
index bc528d1..0000000
--- a/modules/common/doas/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  security.doas = {
-    enable = true;
-
-    extraRules = [
-      {
-        users = [ "aethrvmn" ];
-        keepEnv = true;
-        persist = true;
-      }
-    ];
-  };
-}
diff --git a/modules/common/sudo/default.nix b/modules/common/sudo/default.nix
deleted file mode 100644
index 8ad7bf9..0000000
--- a/modules/common/sudo/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  security.sudo = {
-    enable = false;
-  };
-}
diff --git a/modules/common/fonts/default.nix b/modules/fonts/default.nix
index d8696e7..d8696e7 100644
--- a/modules/common/fonts/default.nix
+++ b/modules/fonts/default.nix
diff --git a/modules/common/gnupg/default.nix b/modules/gnupg/default.nix
index fc6e537..fc6e537 100644
--- a/modules/common/gnupg/default.nix
+++ b/modules/gnupg/default.nix
diff --git a/modules/common/i18n/default.nix b/modules/i18n/default.nix
index 786332c..786332c 100644
--- a/modules/common/i18n/default.nix
+++ b/modules/i18n/default.nix
diff --git a/modules/common/nh/default.nix b/modules/nh/default.nix
index a5e09ac..a5e09ac 100644
--- a/modules/common/nh/default.nix
+++ b/modules/nh/default.nix
diff --git a/modules/common/pipewire/default.nix b/modules/pipewire/default.nix
index 3c65b82..3c65b82 100644
--- a/modules/common/pipewire/default.nix
+++ b/modules/pipewire/default.nix
diff --git a/modules/common/searx/default.nix b/modules/searx/default.nix
index e8b3873..e8b3873 100644
--- a/modules/common/searx/default.nix
+++ b/modules/searx/default.nix
diff --git a/modules/common/ssh/default.nix b/modules/ssh/default.nix
index 70b67e2..70b67e2 100644
--- a/modules/common/ssh/default.nix
+++ b/modules/ssh/default.nix
diff --git a/modules/common/users/default.nix b/modules/users/default.nix
index 460fb8a..db3d759 100644
--- a/modules/common/users/default.nix
+++ b/modules/users/default.nix
@@ -5,6 +5,10 @@
   users = {
     defaultUserShell = pkgs.zsh;
   
+    groups.aethrvmn = {
+      members = [ "aethrvmn" ];
+    };
+
     users.aethrvmn = {
       isNormalUser = true;
       extraGroups = [
@@ -13,7 +17,9 @@
         "video"
         "wheel"
       ];
-      password = "gg";
+      home = "/home/aethrvmn";
+      
+      group = "aethrvmn";
 
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF3R0qrWQ9omz87lt4YRCdI+QV55KxMqxU+Vz1mUM4ye me@aethrvmn.gr"