From 9ba924955f94b3824d7a6c80e17ff1873e007093 Mon Sep 17 00:00:00 2001
From: Dmitri <dmitri.ollari@protonmail.com>
Date: Sat, 4 Oct 2025 13:40:54 +0200
Subject: [PATCH] yep

---
 configuration.nix | 41 +--------------------------------------
 home.nix          | 49 ++++++++++++++++++++++++++++++-----------------
 2 files changed, 32 insertions(+), 58 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index e89f81b..2598cb1 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -62,32 +62,7 @@
     isNormalUser = true;
     description = "user";
     extraGroups = [ "networkmanager" "wheel" "docker" ];
-    packages = with pkgs; [
-      firefox
-      nextcloud-client
-      keepassxc
-      signal-desktop
-      luarocks
-      python3
-      unzip
-      wget
-      go
-      nodejs
-      tree-sitter
-      gcc
-      ripgrep
-      fd
-      cargo
-      texliveFull
-      jdk21
-      eza
-      zoxide
-      fzf
-      docker-compose
-      btop
-      freecad
-      orca-slicer
-    ];
+    packages = with pkgs; [ ];
   };
 
   users.extraUsers.user = { shell = pkgs.zsh; };
@@ -145,14 +120,6 @@
   # List packages installed in system profile. To search, run:
   environment.systemPackages = with pkgs; [ git neovim ];
 
-  environment = {
-    variables = {
-      JAVA_HOME = "${pkgs.jdk21}/lib/openjdk";
-      GTK_THEME = "Adwaita:dark";
-      XCURSOR_THEME = "Bibata-Modern-Clasic";
-    };
-  };
-
   system = {
     stateVersion = "25.05";
     autoUpgrade = {
@@ -167,10 +134,4 @@
     options = "--delete-older-than 30d";
   };
 
-  # home-manager = {
-  #   extraSpecialArgs = { inherit input; };
-  #   users = { "user" = import ./home.nix; };
-  # };
-  # home-manager.users.user = import ./home.nix;
-
 }
diff --git a/home.nix b/home.nix
index 3e5df13..589cf46 100644
--- a/home.nix
+++ b/home.nix
@@ -15,7 +15,33 @@
 
   # The home.packages option allows you to install Nix packages into your
   # environment.
-  home.packages = with pkgs; [ librewolf ];
+  home.packages = with pkgs; [
+    librewolf
+    firefox
+    nextcloud-client
+    keepassxc
+    signal-desktop
+    luarocks
+    python3
+    unzip
+    wget
+    go
+    nodejs
+    tree-sitter
+    gcc
+    ripgrep
+    fd
+    cargo
+    texliveFull
+    jdk21
+    eza
+    zoxide
+    fzf
+    docker-compose
+    btop
+    freecad
+    orca-slicer
+  ];
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
   # plain files is through 'home.file'.
@@ -32,24 +58,11 @@
     # '';
   };
 
-  # Home Manager can also manage your environment variables through
-  # 'home.sessionVariables'. These will be explicitly sourced when using a
-  # shell provided by Home Manager. If you don't want to manage your shell
-  # through Home Manager then you have to manually source 'hm-session-vars.sh'
-  # located at either
-  #
-  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  /etc/profiles/per-user/user/etc/profile.d/hm-session-vars.sh
-  #
   home.sessionVariables = {
-    # EDITOR = "emacs";
+    EDITOR = "nvim";
+    JAVA_HOME = "${pkgs.jdk21}/lib/openjdk";
+    GTK_THEME = "Adwaita:dark";
+    XCURSOR_THEME = "Bibata-Modern-Clasic";
   };
 
   # Let Home Manager install and manage itself.