home: amneesh: move ubuntu->arch and use existing config

Signed-off-by: Amneesh Singh <amneesh@ti.com>

home/README

@@ -4,5 +4,5 @@ bat          : default user for remilia  (Oracle VM    - NixOS Unstable)
 spin         : default user for hina     (Oracle VM    - NixOS Unstable)
 spark        : default user for marisa   (RPi4         - NixOS Unstable)
 kero         : default user for suwako   (ARM OracleVM - NixOS Unstable)
-amneesh      : default user for nightbug (Workplace PC - Ubuntu 22.04)
+amneesh      : default user for nightbug (Workplace PC - Arch Linux)
 

home/amneesh/default.nix

@@ -9,16 +9,25 @@
     homeDirectory = "/home/amneesh";
     username = "amneesh";
     stateVersion = "24.05";
-
-    packages = with pkgs; [
-      htop
-      nattovim
-      clang-tools
-      llvmPackages.clang
-    ];
   };
 
-  xdg.mime.enable = true;
   targets.genericLinux.enable = true;
-  programs.bash.enable = true;
+
+  imports = [
+    ./pkgs.nix
+
+    # From personal
+    ../natto/ags
+    ../natto/emacs.nix
+    ../natto/browser.nix
+    ../natto/dunst.nix
+    ../natto/gtk.nix
+    ../natto/cursor.nix
+
+    # When wayland
+    ../natto/wayland.nix
+    ../natto/hyprland.nix
+    ../natto/tofi.nix
+    ../natto/foot.nix
+  ];
 }

home/amneesh/pkgs.nix

@@ -0,0 +1,17 @@
+{
+  pkgs,
+  inputs,
+  ...
+}:
+{
+
+  xdg.mime.enable = true;
+  programs.bash.enable = true;
+
+  home.packages = with pkgs; [
+    htop
+    clang-tools
+    llvmPackages.clang
+    (nattovim.override { nvimPackage = inputs.nvim-overlay.packages.${pkgs.system}.neovim; })
+  ];
+}

home/default.nix

@@ -9,6 +9,8 @@ let
     { programs.home-manager.enable = true; }
     ./common/zsh
     ./common/direnv
+    ./common/laptop.nix
+    inputs.agenix.homeManagerModules.default
   ];
 
   mkPkgs =
@@ -29,26 +31,21 @@ in
   flake.homeConfigurations =
     let
 
-      nattoModules = [
-        ./natto
-        ./common/fonts
-        ./common/emacs
-        ./common/laptop.nix
-        inputs.agenix.homeManagerModules.default
-      ] ++ common;
     in
     {
       natto-laptop = inputs.home-manager.lib.homeManagerConfiguration {
         inherit extraSpecialArgs;
-        modules = nattoModules ++ [
+        modules = [
+          ./natto
           { isLaptop = true; }
-        ];
+        ]
+        ++ common;
         pkgs = mkPkgs "x86_64-linux";
       };
 
       natto = inputs.home-manager.lib.homeManagerConfiguration {
         inherit extraSpecialArgs;
-        modules = nattoModules;
+        modules = [ ./natto ];
         pkgs = mkPkgs "x86_64-linux";
       };
 
@@ -65,7 +62,8 @@ in
               stateVersion = "23.05";
             };
           }
-        ] ++ common;
+        ]
+        ++ common;
         pkgs = mkPkgs "aarch64-linux";
       };
 
@@ -79,7 +77,8 @@ in
               stateVersion = "23.05";
             };
           }
-        ] ++ common;
+        ]
+        ++ common;
         pkgs = mkPkgs "x86_64-linux";
       };
 
@@ -93,7 +92,8 @@ in
               stateVersion = "23.05";
             };
           }
-        ] ++ common;
+        ]
+        ++ common;
         pkgs = mkPkgs "x86_64-linux";
       };
 
@@ -107,16 +107,17 @@ in
               stateVersion = "24.05";
             };
           }
-        ] ++ common;
+        ]
+        ++ common;
         pkgs = mkPkgs "aarch64-linux";
       };
 
       amneesh = inputs.home-manager.lib.homeManagerConfiguration {
         inherit extraSpecialArgs;
         modules = [
-          ./common/emacs
           ./amneesh
-        ] ++ common;
+        ]
+        ++ common;
         pkgs = mkPkgs "x86_64-linux";
       };
     };

home/natto/config/hypr/hyprland.conf

@@ -1,4 +1,4 @@
-monitor=, highrr, auto, 1, bitdepth, 10
+monitor=, highrr, auto, 1
 
 input {
     kb_layout = us,us
@@ -59,6 +59,10 @@ animations {
     animation = workspaces, 1, 6, overshot
 }
 
+cursor {
+  no_hardware_cursors = true
+}
+
 dwindle {
     pseudotile = yes
     preserve_split = yes

home/natto/cursor.nix

@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+{
+  home.pointerCursor = {
+    package = pkgs.catppuccin-cursors.mochaFlamingo;
+    name = "catppuccin-mocha-flamingo-cursors";
+    size = 32;
+    x11 = {
+      enable = true;
+      defaultCursor = "crosshair";
+    };
+    gtk.enable = true;
+  };
+}

home/natto/default.nix

@@ -20,6 +20,8 @@
     ./music.nix
     ./zsh.nix
     ./games.nix
+    ./cursor.nix
+    ./emacs.nix
 
     # when xserver
     # ./xsession.nix

home/natto/emacs.nix

@@ -1,7 +1,7 @@
 { pkgs, inputs, ... }:
 let
   emacs = pkgs.emacs-git-pgtk;
-  configFile = ./config/config.org;
+  configFile = ./config/emacs/config.org;
   enable = true;
 in
 {

home/natto/stuff.nix

@@ -13,23 +13,11 @@
   age.identityPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ];
 
   home = {
-    pointerCursor = {
-      package = pkgs.catppuccin-cursors.mochaFlamingo;
-      name = "catppuccin-mocha-flamingo-cursors";
-      size = 32;
-      x11 = {
-        enable = true;
-        defaultCursor = "crosshair";
-      };
-      gtk.enable = true;
-    };
-
     sessionVariables = {
       QT_X11_NO_MITSHM = "1";
       HM_CONF_DIR = "/etc/nixos";
       QT_QPA_PLATFORMTHEME = "gtk2";
     };
-
   };
   i18n = {
     inputMethod = {