2 files changed, 49 insertions, 52 deletions
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 4dbf3bb..21fe566 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -1,14 +1,18 @@
-{ pkgs, ... }:
+{ username, ... }:
 {
-  nixpkgs.config.allowUnfree = true;
+  system.stateVersion = "25.05";
 
   imports = [
       ./hardware-configuration.nix
       ../../sys/default.nix
     ];
 
-  szpont.sys = {
+  sys = {
     core = {
+      allowUnfree.enable = true;
+      flatpak.enable = true;
+      hardwareTools.enable = true;
+
       audio.enable = true;
       bootloader = "systemd-boot";
       drivers = {
@@ -20,11 +24,19 @@
       greet.enable = true;
       home-manager = {
         enable = true;
-        users.adam.path = ./home.nix;
+        users.${username}.path = ./home.nix;
       };
       locale.enable = true;
       network.enable = true;
+      memory = {
+        zram.enable = true;
+        zram.percent = 25;
+        swapfile.enable = true;
+        swapfile.size = 32;
+      };
       security.enable = true;
+      storage.enable = true;
+      users.enable = true;
     };
     srv = {
       files = {
@@ -44,24 +56,4 @@
       niri.enable = true;
     };
   };
-
-  programs.kdeconnect.enable = true;
-
-  services.flatpak.enable = true;
-
-    programs.fish.enable = true;
-    
-    users.users.adam = {
-      isNormalUser = true;
-      extraGroups = [ "wheel" ];
-      home = "/home/adam";
-      shell = pkgs.fish;
-   };
-   
-   environment.systemPackages = with pkgs; [
-    nautilus
-    rivalcfg
-   ];
-
-  system.stateVersion = "25.05";
 }
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index 08140dd..ea33837 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -1,21 +1,20 @@
-{ pkgs, ... }:
+{ username, ... }:
 {
-  imports = [
-    ../../hm/default.nix
-];
+  imports = [ ../../hm/default.nix ];
 
-  home.username = "adam";
-  home.homeDirectory = "/home/adam";
-  home.stateVersion = "25.05";
+  home = {
+    username = "${username}";
+    homeDirectory = "/home/${username}";
+    stateVersion = "25.05";
+  };
 
-  szpont.hm = {
+  hm = {
     conf = {
-      clipboard = {
+      clip = {
         enable = true;
         backend = "wayland";
       };
       git.enable = true;
-      ssh.enable = true;
       xdg-dirs = {
         enable = true;
         mediaPath = /media;
@@ -25,12 +24,14 @@
       nixvim.enable = true;
     };
     env = {
+      niri.enable = true;
+
+      waybar.enable = true;
       themes = {
         enable = true;
         gtk.enable = true;
         qt.enable = true;
       };
-      waybar.enable = true;
     };
     shell = {
       cli.enable = true;
@@ -39,26 +40,30 @@
       starship.enable = true;
     };
     soft = {
-      easyeffects.enable = true;
+      browser = {
+        enable = true;
+        librewolf.enable = true;
+        brave.enable = true;
+      };
+      email = {
+        enable = true;
+        thunderbird.enable = false;
+        evolution.enable = true;
+      };
+      kdeconnect.enable = true;
+      kdenlive.enable = true;
       media.enable = true;
       nixcord.enable = true;
+      obs.enable = true;
+      obsidian.enable = true;
+      onlyoffice.enable = false;
       spicetify.enable = true;
+      torrent.enable = true;
+      vpn = {
+        enable = true;
+        protonvpn.enable = true;
+        mullvad.enable = false;
+      };
     };
   };
-
-  home.packages = with pkgs; [
-    protonvpn-gui
-    evolution
-    kdePackages.kdenlive
-    veracrypt
-    brave
-    qbittorrent-enhanced
-    bitwarden-desktop
-    thunderbird
-  ];
-
-  programs.obsidian.enable = true;
-  programs.onlyoffice.enable = true;
-  programs.librewolf.enable = true;
-  # programs.thunderbird.enable = true;
 }