cleanup

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731774881,
+        "lastModified": 1731959031,
-        "narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=",
+        "narHash": "sha256-TGcvIjftziC1CjuiHCzrYDwmOoSFYIhdiKmLetzB5L0=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "b31a6a4da8199ae3489057db7d36069a70749a56",
+        "rev": "4468981c1c50999f315baa1508f0e53c4ee70c52",
         "type": "github"
       },
       "original": {
@@ -108,11 +108,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1732593794,
+        "lastModified": 1733135686,
-        "narHash": "sha256-VhS+81/eTDiin5ULZLWvqI+9ggI+qXNUSvi3dIQfBX4=",
+        "narHash": "sha256-++1Btq9w+ZPQYP45X3G1iXEXwllo3b2UdeKVwQdUAoQ=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "9b7d4fb4739c0bf808d31e2b66b337f1234e4447",
+        "rev": "074cadca26132cbd19f44ae5a45072f28f050ed9",
         "type": "gitlab"
       },
       "original": {
@@ -252,11 +252,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732482255,
+        "lastModified": 1733133928,
-        "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
+        "narHash": "sha256-gU40r9AfpIr4eq+0noM8yH1Hxf+EA3dqfIpFtQl8Y1E=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
+        "rev": "873e39d5f4437d2f3ab06881fea8e63e45e1d011",
         "type": "github"
       },
       "original": {
@@ -329,11 +329,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1732629163,
+        "lastModified": 1733073275,
-        "narHash": "sha256-IUNhY9+sf7zysRntzP2ZxbIipL3IuI6MgOb3gB33X6o=",
+        "narHash": "sha256-8F5SUIglJyqSKv+iDglxkfFIeHSYPw5iexeFjzZDzVc=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "1fb720b62aeb474873ba43426ddc53afde1e6cdd",
+        "rev": "6d7544458d0fafcae410c1978a0cabce2fb4a346",
         "type": "github"
       },
       "original": {
@@ -408,11 +408,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731702627,
+        "lastModified": 1732288281,
-        "narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=",
+        "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1",
+        "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c",
         "type": "github"
       },
       "original": {
@@ -453,11 +453,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728031945,
+        "lastModified": 1733130915,
-        "narHash": "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw=",
+        "narHash": "sha256-w4JpoG29Co6cbNfX8Z+V58i6OV2gGmgrZ012P8Zc4pw=",
         "owner": "Mic92",
         "repo": "nix-ld",
-        "rev": "4524c512e8729ccb5a1b9239d01e1474cbf074a2",
+        "rev": "a340f96f2be41a3b3e87cb676747a9e6908c19a7",
         "type": "github"
       },
       "original": {
@@ -468,11 +468,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731676054,
+        "lastModified": 1732758367,
-        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
+        "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
+        "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59",
         "type": "github"
       },
       "original": {
@@ -500,11 +500,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1731797254,
+        "lastModified": 1733016324,
-        "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
+        "narHash": "sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
+        "rev": "7e1ca67996afd8233d9033edd26e442836cc2ad6",
         "type": "github"
       },
       "original": {
@@ -516,11 +516,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1732014248,
+        "lastModified": 1733015953,
-        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
+        "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
+        "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
         "type": "github"
       },
       "original": {
@@ -557,11 +557,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1731363552,
+        "lastModified": 1732021966,
-        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
+        "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
+        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
         "type": "github"
       },
       "original": {
@@ -598,11 +598,11 @@
         "tinted-tmux": "tinted-tmux"
       },
       "locked": {
-        "lastModified": 1732608183,
+        "lastModified": 1732993760,
-        "narHash": "sha256-T5k5ill+PNIEW6KuS4CpUacMtZNJe2J2q5eBOF4xWuU=",
+        "narHash": "sha256-t1J6wgzGjvvGNfdd0ei8HnZf9sTw+SpvCNAX0i6Qgwc=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "7689e621f87bce7b6ab1925dfd70ad1f4c80f334",
+        "rev": "d13ffb381c83b6139b9d67feff7addf18f8408fe",
         "type": "github"
       },
       "original": {

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;
     };
   };
 

nixos/desktop/hyprland/packages.nix

@@ -12,9 +12,6 @@
       #swww
       playerctl
 
-      kitty
-      kitty-img
-
       hyprshade
       swappy
       grimblast

nixos/packages/applications.nix

@@ -35,6 +35,7 @@
         loupe
         simple-scan
         vesktop
+        gnome.gnome-font-viewer
         evince
       ]);
   };

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 = {

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";
     };
 

nixos/packages/programming/programming.nix

@@ -17,8 +17,8 @@
 
   config = lib.mkIf config.programming.enable {
     
-    programming.vscode.enable = lib.mkDefault true;
+    program.vscode.enable = lib.mkDefault true;
-    programming.git.enable = lib.mkDefault true;
+    program.git.enable = lib.mkDefault true;
 
     home.packages = with pkgs; [
       neovim

nixos/packages/terminal_tools.nix

@@ -11,18 +11,27 @@
 
   imports = [
     ./tools/oh-my-posh.nix
+    ./tools/shell.nix
+    ./tools/kitty.nix
+    ./tools/tmux.nix
   ];
 
   config = lib.mkIf config.terminal_tools.enable {
+    
+    sh.bash = {
+      enable = lib.mkDefault true;
+      oh-my-posh.enable = lib.mkDefault true;
+    };
 
-    shell.bash.enable = lib.mkDefault true;
+    program = {
-    shell.bash.oh-my-posh.enable = lib.mkDefault true;
+      kitty.enable = lib.mkDefault true;
+      tmux.enable = lib.mkDefault true;
+    };
 
     programs = {
       bat.enable = true;
       btop.enable = true;
       fzf.enable = true;
-      tmux.enable = true;
     };
 
     stylix.targets = {
@@ -39,20 +48,6 @@
       enableBashIntegration = true;
     };
 
-    programs.kitty = {
-      enable = true;
-      font.name = lib.mkDefault "JetBrainsMono Nerd Font";
-      #themeFile = "tokyo_night_night";
-      #themeFile = "Catppuccin-Mocha";
-      settings = {
-        font_size = 11.5;
-        confirm_os_window_close = 0;
-        hide_window_decorations = 0;
-        enable_audio_bell = false;
-        window_padding_width = 25;
-      };
-    };
-
     home.packages = with pkgs; [
       pfetch
       zoxide

nixos/packages/tools/kitty.nix

@@ -0,0 +1,32 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  options = {
+    program.kitty.enable = lib.mkEnableOption "Enable kitty terminal emulator";
+  };
+
+  config = lib.mkIf config.program.kitty.enable {
+    programs.kitty = {
+      enable = true;
+      font.name = lib.mkDefault "JetBrainsMono Nerd Font";
+      #themeFile = "tokyo_night_night";
+      #themeFile = "Catppuccin-Mocha";
+      settings = {
+        font_size = 11.5;
+        confirm_os_window_close = 0;
+        hide_window_decorations = 0;
+        enable_audio_bell = false;
+        window_padding_width = 25;
+      };
+    };
+
+    home.packages = with pkgs; [
+      kitty
+      kitty-img
+      kitty-themes
+    ];
+  };
+}

nixos/packages/tools/oh-my-posh.nix

@@ -5,10 +5,10 @@
   ...
 }: {
   options = {
-    shell.oh-my-posh.enable = lib.mkEnableOption "enable oh-my-posh";
+    sh.bash.oh-my-posh.enable = lib.mkEnableOption "enable oh-my-posh";
   };
 
-  config = lib.mkIf config.shell.oh-my-posh.enable {
+  config = lib.mkIf config.sh.bash.oh-my-posh.enable {
     programs.oh-my-posh = {
       enable = true;
       enableBashIntegration = true;

nixos/packages/tools/shell.nix

@@ -1,10 +1,15 @@
-{lib, ...}: {
+{
+  lib,
+  config,
+  ...
+}: {
   options = {
-    shell.enable =
+    sh.bash.enable =
       lib.mkEnableOption "enables shell tools";
   };
 
-  config = lib.mkIf lib.config.shell.enable {
+  config = lib.mkIf config.sh.bash.enable {
+    
     programs.bash = {
       enable = true;
       enableCompletion = true;

nixos/packages/tools/tmux.nix

@@ -0,0 +1,72 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  options = {
+    program.tmux.enable = lib.mkEnableOption "tmux";
+  };
+
+  config = lib.mkIf config.program.tmux.enable {
+    programs.tmux = {
+      enable = true;
+      clock24 = true;
+      terminal = "screen-256color";
+
+      shortcut = "Space";
+
+      plugins = [
+        {
+          plugin = pkgs.tmuxPlugins.dracula;
+          extraConfig = ''
+            #set -g @dracula-show-powerline true
+            #set -g @dracula-show-flags true
+            set -g @dracula-plugins "cpu-usage ram-usage battery time"
+            set -g @dracula-show-left-icon session
+            set -g @dracula-battery-colors "red dark_gray"
+            set -g @dracula-show-timezone false
+            set -g @dracula-day-month true
+            set -g @dracula-military-time true
+          '';
+        }
+
+        #pkgs.tmuxPlugins.tmux-fzf
+        pkgs.tmuxPlugins.sensible
+        pkgs.tmuxPlugins.yank
+        pkgs.tmuxPlugins.jump
+      ];
+
+      extraConfig = ''
+        set-option -sa terminal-overrides ",xterm*:Tc"
+
+        # Set pane to top
+        set -g status-position top
+
+        # Mouse enable
+        set -g mouse on
+
+        # Start count on 1 instead of 0
+        set -g base-index 1
+        set -g pane-base-index 1
+        set-window-option -g pane-base-index 1
+        set-option -g renumber-windows only
+
+        bind -n M-H previous-window
+        bind -n M-L next-window
+
+        # set vi mode
+        set-window-option -g mode-keys vi
+        setw -g mode-keys vi
+
+        #keybindings for copying
+        bind-key -T copy-mode-vi v send-keys -X begin-selection
+        bind-key -T copy-mode-vi C-v send-keys -X rectangle toggle
+        bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
+
+        bind '"' split-window -v -c "#{pane_current_path}"
+        bind % split-window -h -c "#{pane_current_path}"
+      '';
+    };
+  };
+}

nixos/system/sys/fonts.nix

@@ -12,7 +12,7 @@
     fonts.packages = with pkgs; [
       noto-fonts
       noto-fonts-emoji
-      (nerdfonts.override {fonts = ["JetBrainsMono"];})
+      nerd-fonts.jetbrains-mono
       monaspace
     ];
   };

nixos/system/sys/style.nix

@@ -1,7 +1,7 @@
 {
   lib,
   config,
-  pkgs,
+  pkgs-stable,
   ...
 }: {
   options = {
@@ -12,7 +12,7 @@
     stylix = {
       enable = true;
       image = ../../../config/backgrounds/aurora_borealis.png;
-      base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
+      base16Scheme = "${pkgs-stable.base16-schemes}/share/themes/catppuccin-mocha.yaml";
       #base16Scheme = "${pkgs.base16-schemes}/share/themes/onedark.yaml";
       #base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml";
       polarity = "dark";
@@ -20,7 +20,7 @@
 
       # Set the cursor theme.
       cursor = {
-        package = pkgs.bibata-cursors;
+        package = pkgs-stable.bibata-cursors;
         name = "Bibata-Modern-Ice";
         size = 24;
       };
@@ -35,7 +35,7 @@
 
         monospace = {
           name = "JetBrainsMono Nerd Font";
-          package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
+          package = (pkgs-stable.nerdfonts.override { fonts = [ "JetBrainsMono" ]; });
         };
       };
     };