From ed325e09fb7890a985d7041ed5832bb80fa1d781 Mon Sep 17 00:00:00 2001
From: foglar <kohout.fi.2023@skola.ssps.cz>
Date: Sat, 14 Dec 2024 14:13:49 +0100
Subject: [PATCH] fix leanix

---
 flake.nix                   |  2 +-
 leanix/configuration.nix    | 12 ++++++------
 leanix/home.nix             | 38 +++++++++++++++++++++++++++----------
 nixos/packages/packages.nix | 20 ++++++++++---------
 4 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7266bd3..7c8f496 100644
--- a/flake.nix
+++ b/flake.nix
@@ -77,7 +77,7 @@
       };
       leanix = nixpkgs.lib.nixosSystem {
         specialArgs = {
-          inherit inputs system pkgs-stable;
+          inherit inputs system pkgs pkgs-stable username hostname;
         };
 
         modules = [
diff --git a/leanix/configuration.nix b/leanix/configuration.nix
index cb2ed2f..b84a670 100644
--- a/leanix/configuration.nix
+++ b/leanix/configuration.nix
@@ -1,8 +1,8 @@
 {
   inputs,
-  lib,
   pkgs,
   pkgs-stable,
+  username,
   ...
 }: {
   imports = [
@@ -14,11 +14,11 @@
 
   nix.settings.experimental-features = ["nix-command" "flakes"];
 
-  inputs.home-manager = {
+  home-manager = {
     extraSpecialArgs = {inherit inputs pkgs pkgs-stable;};
     backupFileExtension = "backup";
     users = {
-      konsta = import ./home.nix;
+      ${username} = import ./home.nix;
     };
   };
 
@@ -26,14 +26,14 @@
   boot.loader.systemd-boot.enable = true;
 
   environment.sessionVariables = {
-    FLAKE = "/home/konsta/.dotfiles";
+    FLAKE = "/home/${username}/.dotfiles";
 
     DEFAULT_BROWSER = "${pkgs.firefox}/bin/firefox";
   };
 
-  users.users.konsta = {
+  users.users.${username} = {
     isNormalUser = true;
-    description = "konsta";
+    description = "${username}";
     extraGroups = ["wheel"];
   };
 
diff --git a/leanix/home.nix b/leanix/home.nix
index d8b94f3..94e89de 100644
--- a/leanix/home.nix
+++ b/leanix/home.nix
@@ -1,26 +1,44 @@
-{lib, ...}: {
-  home.username = "konsta";
-  home.homeDirectory = "/home/konsta";
+{
+  pkgs-stable,
+  username,
+  ...
+}: {
+  home.username = "${username}";
+  home.homeDirectory = "/home/${username}";
   home.stateVersion = "24.11"; # Please read the comment before changing.
 
   imports = [
     ../nixos/packages/packages.nix
   ];
 
-  program.firefox.enable = lib.mkDefault true;
+  program.firefox.enable = true;
 
-  group.terminal_tools.enable = true;
+  group = {
+    hacking.enable = false;
+    applications.enable = false;
+    terminal_tools.enable = true;
+    programming.enable = false;
+  };
 
   program = {
-    kitty.enable = lib.mkDefault false;
-    tmux.enable = lib.mkDefault false;
-    zoxide.enable = lib.mkDefault false;
+    kitty.enable = false;
+    tmux.enable = false;
+    zoxide.enable = false;
+    vscode.enable = false;
+    git.enable = false;
+    neovim.enable = false;
+    spotify.enable = false;
   };
 
   sh.bash = {
-    enable = lib.mkDefault true;
-    oh-my-posh.enable = lib.mkDefault false;
+    enable = true;
+    oh-my-posh.enable = false;
   };
 
+  home.applications = with pkgs-stable; [
+    libreoffice
+    inkscape
+  ];
+
   programs.home-manager.enable = true;
 }
diff --git a/nixos/packages/packages.nix b/nixos/packages/packages.nix
index a53c3f9..b99a08e 100644
--- a/nixos/packages/packages.nix
+++ b/nixos/packages/packages.nix
@@ -13,19 +13,21 @@
     ./applications/spotify.nix
   ];
 
-  group.terminal_tools.enable = lib.mkDefault true;
-  group.programming.enable = lib.mkDefault true;
-  group.games.enable = lib.mkDefault false;
-  group.applications.enable = lib.mkDefault true;
-  group.hacking.enable = lib.mkDefault true;
+  group = {
+    terminal_tools.enable = lib.mkDefault true;
+    programming.enable = lib.mkDefault true;
+    games.enable = lib.mkDefault false;
+    applications.enable = lib.mkDefault true;
+    hacking.enable = lib.mkDefault true;
+  };
 
   program.firefox.enable = lib.mkDefault true;
   program.spotify.enable = lib.mkDefault true;
 
   home.packages = with pkgs; [
-      alejandra
-      nh
-      nixd
+    alejandra
+    nh
+    nixd
   ];
 
   nixpkgs.config.allowUnfreePredicate = pkg:
@@ -35,7 +37,7 @@
 
       "pycharm"
       "pycharm-professional"
-      
+
       "steam"
       "steam-unwrapped"