6 files changed, 18 insertions, 27 deletions
diff --git a/hm/soft/browser.nix b/hm/soft/browser.nix
index 8b9e6dc..f1dd97f 100644
--- a/hm/soft/browser.nix
+++ b/hm/soft/browser.nix
@@ -9,7 +9,9 @@ in
   };
   config = lib.mkMerge [
     (lib.mkIf cfg.librewolf.enable {
-      programs.librewolf.enable = true;
+      programs.librewolf = {
+        enable = true;
+      };
     })
 
     (lib.mkIf cfg.brave.enable {
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 356cfb2..37ed03a 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -19,7 +19,7 @@
       bootloader = "systemd-boot";
       drivers = {
         enable = true;
-        amd.enable = true;
+        amdgpu.enable = true;
         stability = "unstable";
       };
       fonts.enable = true;
@@ -29,7 +29,6 @@
         users.${username}.path = ./home.nix;
       };
       locale.enable = true;
-      network.enable = true;
       memory = {
         zram = {
           enable = true;
@@ -40,7 +39,9 @@
           size = 32;
         };
       };
+      network.enable = true;
       security.enable = true;
+      ssh.enable = true;
       storage = {
         enable = true;
         keepDays = 30;
@@ -48,6 +49,7 @@
       users.enable = true;
     };
     srv = {
+      autoclicker.enable = true;
       files = {
         thunar.enable = true;
         utils.enable = true;
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index bcb5e43..fa38457 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -28,7 +28,6 @@
 
       waybar.enable = true;
       themes = {
-        enable = true;
         gtk.enable = true;
         qt.enable = true;
       };
@@ -41,28 +40,21 @@
     };
     soft = {
       browser = {
-        enable = true;
         librewolf.enable = true;
         brave.enable = true;
       };
-      email = {
-        enable = true;
-        thunderbird.enable = false;
-        evolution.enable = true;
-      };
+      email.evolution.enable = true;
       kdeconnect.enable = true;
       kdenlive.enable = true;
       media.enable = true;
+      mpv.enable = true;
       nixcord.enable = true;
       obs.enable = true;
       obsidian.enable = true;
       spicetify.enable = true;
       torrent.enable = true;
-      vpn = {
-        enable = true;
-        protonvpn.enable = true;
-        mullvad.enable = false;
-      };
+      vpn.protonvpn.enable = true;
+      yt-dlp.enable = true;
     };
   };
 }
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index 1f06829..7688f33 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -7,7 +7,7 @@
       ../../os/default.nix
     ];
 
-  os = {
+  sys = {
     core = {
       allowUnfree.enable = true;
 
@@ -21,7 +21,6 @@
         users.${username}.path = ./home.nix;
       };
       locale.enable = true;
-      network.enable = true;
       memory = {
         zram = {
           enable = true;
@@ -32,8 +31,10 @@
           size = 8;
         };
       };
+      network.enable = true;
       power.enable = true;
       security.enable = true;
+      ssh.enable = true;
       storage = {
         enable = true;
         keepDays = 14;
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index 244e1f6..777e270 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -34,21 +34,15 @@
       starship.enable = true;
     };
     soft = {
-      browser = {
-        librewolf.enable = true;
-      };
-      email = {
-        thunderbird.enable = false;
-        evolution.enable = false;
-      };
+      browser.librewolf.enable = true;
       kdeconnect.enable = true;
       mpv.enable = true;
       media.enable = true;
-      yt-dlp.enable = true;
       nixcord.enable = true;
       obsidian.enable = true;
       spicetify.enable = true;
       torrent.enable = true;
+      yt-dlp.enable = true;
     };
   };
 }
diff --git a/os/core/users.nix b/os/core/users.nix
index 9ce0e2d..1bea894 100644
--- a/os/core/users.nix
+++ b/os/core/users.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, username, ... }:
 let
   cfg = config.os.core.users;
 in
@@ -6,7 +6,7 @@ in
   options.os.core.users.enable = lib.mkEnableOption "enables user accounts";
   config = lib.mkIf cfg.enable {
     programs.fish.enable = true;
-    users.users.adam = {
+    users.users.${username} = {
       isNormalUser = true;
       shell = pkgs.fish;
       extraGroups = lib.mkMerge [