diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 3b4c8d9..0184b49 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -18,10 +18,10 @@
   boot.loader.systemd-boot.enable = true;
 
   home-manager = {
-    extraSpecialArgs = {inherit inputs pkgs pkgs-stable;};
+    extraSpecialArgs = {inherit inputs pkgs pkgs-stable username;};
     backupFileExtension = "backup";
     users = {
-      foglar = import ./home.nix;
+      ${username} = import ./home.nix;
     };
   };
 
diff --git a/nixos/desktop/hyprland/packages.nix b/nixos/desktop/hyprland/packages.nix
index 0b563b2..3caca25 100644
--- a/nixos/desktop/hyprland/packages.nix
+++ b/nixos/desktop/hyprland/packages.nix
@@ -12,9 +12,6 @@
       #swww
       playerctl
 
-      kitty
-      kitty-img
-
       hyprshade
       swappy
       grimblast
diff --git a/nixos/packages/applications.nix b/nixos/packages/applications.nix
index 49b6f97..f188162 100644
--- a/nixos/packages/applications.nix
+++ b/nixos/packages/applications.nix
@@ -35,8 +35,8 @@
         loupe
         simple-scan
         vesktop
+        gnome.gnome-font-viewer
         evince
-        gnome-font-viewer
       ]);
   };
 }
diff --git a/nixos/packages/programming/code.nix b/nixos/packages/programming/code.nix
index 6c56615..222f00e 100644
--- a/nixos/packages/programming/code.nix
+++ b/nixos/packages/programming/code.nix
@@ -5,13 +5,12 @@
   ...
 }: {
   options = {
-    programming.vscode.enable = lib.mkEnableOption "enable vscode";
+    program.vscode.enable = lib.mkEnableOption "enable vscode";
   };
 
-  config = lib.mkIf config.programming.vscode.enable {
+  config = lib.mkIf config.program.vscode.enable {
     home.packages = with pkgs; [
       vscode
-      gopls
     ];
 
     home.sessionVariables = {
diff --git a/nixos/packages/programming/git.nix b/nixos/packages/programming/git.nix
index 46462b2..c6c4e68 100644
--- a/nixos/packages/programming/git.nix
+++ b/nixos/packages/programming/git.nix
@@ -2,17 +2,18 @@
   pkgs,
   lib,
   config,
+  username,
   ...
   }:
 {
   options = {
-    programming.git.enable = lib.mkEnableOption "enable git";
+    program.git.enable = lib.mkEnableOption "enable git";
   };
 
-  config = lib.mkIf config.programming.git.enable {
+  config = lib.mkIf config.program.git.enable {
     programs.git = {
       enable = true;
-      userName = "foglar";
+      userName = "${username}";
       userEmail = "kohout.fi.2023@skola.ssps.cz";
     };
 
diff --git a/nixos/packages/programming/programming.nix b/nixos/packages/programming/programming.nix
index 91b22e3..c81cdba 100644
--- a/nixos/packages/programming/programming.nix
+++ b/nixos/packages/programming/programming.nix
@@ -17,8 +17,8 @@
 
   config = lib.mkIf config.programming.enable {
     
-    programming.vscode.enable = lib.mkDefault true;
-    programming.git.enable = lib.mkDefault true;
+    program.vscode.enable = lib.mkDefault true;
+    program.git.enable = lib.mkDefault true;
 
     home.packages = with pkgs; [
       neovim