Moved common stuff into ./home/common.nix

home/common.nix

@@ -1,6 +1,84 @@
+{ pkgs, ... }:
 {
   imports = [
     ./components/nethack.nix
     ./components/firefox.nix
   ];
+
+
+  programs = {
+    home-manager.enable = true;
+    fastfetch.enable = true;
+    htop.enable = true;
+
+    bash = {
+      enable = true;
+      historyControl = [ "ignoreboth" ];
+    };
+
+
+    git = {
+      enable = true;
+      userName = "xezo360hye";
+      userEmail = "xezo360hye@gmail.com";
+      extraConfig = {
+        init.defaultBranch = "master";
+        url."https://github.com/".insteadOf = [ "gh:" "github:" ];
+        url."https://git.psf.lt/".insteadOf = [ "psf:" "gitea:" ];
+      };
+    };
+
+
+    nixvim = {
+      enable = true;
+
+      viAlias = true;
+      vimAlias = true;
+      defaultEditor = true;
+
+      colorschemes.tokyonight.enable = true;
+      plugins = {
+        guess-indent.enable = true;
+
+        copilot-lua = {
+          enable = true;
+          suggestion = {
+            autoTrigger = true;
+            keymap = {
+              accept = "<Tab>";
+              acceptLine = "<M-l>";
+              acceptWord = "<M-Right>";
+            };
+          };
+        };
+      };
+    };
+  };
+
+
+  news.display = "show";
+  nixpkgs.config.allowUnfree = true;
+
+  home = {
+    packages = with pkgs; [
+      telegram-desktop
+      libqalculate
+      arduino-cli
+
+      nethack
+      ani-cli
+      ytfzf
+
+      cpufrequtils
+      steam-run
+    ];
+
+    sessionVariables = {
+      ANI_CLI_PLAYER = "mpv";
+    };
+
+    username = "andrey";
+    homeDirectory = "/home/andrey";
+    stateVersion = "24.05";
+  };
 }

home/maidena.nix

@@ -1,58 +1,6 @@
-{ pkgs, ... }:
 {
   imports = [
     ./components/hyprland.nix
   ];
-
-  programs = {
-    home-manager.enable = true;
-
-    bash = {
-      enable = true;
-      historyControl = [ "ignoreboth" ];
-    };
-
-    git = {
-      enable = true;
-      userName = "xezo360hye";
-      userEmail = "xezo360hye@gmail.com";
-      extraConfig = {
-        init.defaultBranch = "master";
-        url."https://github.com/".insteadOf = [ "gh:" "github:" ];
-      };
-    };
-
-    neovim = {
-      enable = true;
-
-      viAlias = true;
-      vimAlias = true;
-      defaultEditor = true;
-
-      extraLuaConfig = ''
-        vim.cmd "colorscheme desert"
-      '';
-    };
-
-    fastfetch = {
-      enable = true;
-      settings = {};
-    };
-  };
-
-  home.packages = with pkgs; [
-    ani-cli
-    ytfzf
-  ];
-
-  home.sessionVariables = {
-    ANI_CLI_PLAYER = "mpv";
-  };
-
-  home = {
-    username = "andrey";
-    homeDirectory = "/home/andrey";
-    stateVersion = "24.05";
-  };
 }
 # vim: ts=2 sw=2 et

home/tokishiko.nix

@@ -1,43 +1,5 @@
-{ pkgs, ... }:
 {
   programs = {
-    home-manager.enable = true;
-
-    bash = {
-      enable = true;
-      historyControl = [ "ignoreboth" ];
-    };
-
-    git = {
-      enable = true;
-      userName = "xezo360hye";
-      userEmail = "xezo360hye@gmail.com";
-      extraConfig = {
-        init.defaultBranch = "master";
-        url."https://github.com/".insteadOf = [ "gh:" "github:" ];
-        url."https://git.psf.lt/".insteadOf = [ "psf:" "gitea:" ];
-      };
-    };
-
-    nixvim = {
-      enable = true;
-
-      viAlias = true;
-      vimAlias = true;
-      defaultEditor = true;
-
-      colorschemes.tokyonight.enable = true;
-      plugins.copilot-lua = {
-        enable = true;
-        filetypes = {
-          markdown = true;
-          yaml = true;
-        };
-      };
-    };
-
-    htop.enable = true;
-    fastfetch.enable = true;
     alacritty.enable = true;
   };
 
@@ -46,33 +8,8 @@
     noArgb = true;
   };
 
-  nixpkgs.config.allowUnfree = true;
-  news.display = "show";
-
-  home = {
-    packages = with pkgs; [
-      telegram-desktop
-      arduino-cli
-      ani-cli
-      ytfzf
-      nethack
-      cpufrequtils
-      qbittorrent
-      steam-run
-      libqalculate
-    ];
-
-    sessionVariables = {
-      ANI_CLI_PLAYER = "mpv";
-    };
-
-    file = {
-      ".config/awesome/rc.lua".source = ./awesomerc.lua;
-    };
-
-    username = "andrey";
-    homeDirectory = "/home/andrey";
-    stateVersion = "24.05";
+  home.file = {
+    ".config/awesome/rc.lua".source = ./components/awesomerc.lua;
   };
 }
 # vim: ts=2 sw=2 et