flake.nix

@@ -6,6 +6,9 @@
     ags.url = "github:Aylur/ags";
     stylix.url = "github:danth/stylix";
 
+  nixvim = {
+    url = "github:nix-community/nixvim";
+    inputs.nixpkgs.follows = "nixpkgs";
   };
   firefox-addons = {
     url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";

home/default.nix

@@ -3,17 +3,18 @@
 {
 
   imports = [
+    ./rofi
+    ./firefox
+    ./alacritty
+    ./hyprland
     ./zsh
     ./gtk
     ./git
     ./ags
-    ./misc
-    ./rofi
     ./helix
-    ./firefox
+    ./misc
-    ./alacritty
-    ./hyprland
     inputs.ags.homeManagerModules.default
+    inputs.nixvim.homeManagerModules.nixvim   
   ];
 
 } 

home/firefox/default.nix

@@ -38,7 +38,6 @@
           { name = "Zophar's Domain"; url = "https://www.zophar.net/music"; }
           { name = "Spotify Downloader"; url = "https://spotify-downloader.com/"; }
           { name = "Hyprland"; url = "https://wiki.hyprland.org/"; }
-          { name = "monkeytype"; url = "https://monkeytype.com/"; }
         ];
       }];
         

home/helix/default.nix

@@ -8,7 +8,7 @@
       keys.normal = {
         space.space = "file_picker";
          Z.Z = ":wq";
-         Z.Q = ":q!";
+         Z.Q = ":q";
       };
     };
   };

home/hyprland/default.nix

@@ -52,7 +52,7 @@
         "$mod, M, exec, mbsync -a && alacritty -e neomutt" 
         "$mod, A, exec, rofi -show drun"
         "$mod, F, exec, freetube"
-        "$mod, C, exec, hyprpicker -a"
+        "$mod, C, exec, hyprpickr -a"
         "$mod+Shift, W, exec, bash ~/nix/home/hyprland/vm.sh"
         "$mod+Shift, Z, exec, grim - | swappy -f -"
         "$mod, Z, exec, sh ~/nix/home/hyprland/screen.sh"

home/misc/default.nix

@@ -7,6 +7,7 @@
     homeDirectory = "/home/joy";
     stateVersion = "23.11";
     sessionVariables = {
+#      EDITOR = "nvim";
     };
   };
  

home/zsh/default.nix

@@ -29,8 +29,7 @@
       em = "hx ~/nix/modules/misc/default.nix";
       es = "hx ~/nix/modules/stylix/default.nix";
       ep = "hx ~/nix/modules/packages/default.nix";
-      ex = "hx ~/nix/home/helix/default.nix";
+      ev = "hx ~/nix/home/neovim/default.nix";
-      efox = "hx ~/nix/home/firefox/default.nix";
     };
 
     history.size = 1000000;

modules/misc/default.nix

@@ -19,7 +19,6 @@
   nixpkgs.config.allowUnfree = true;
   programs.steam.enable = true;
   programs.hyprland.enable = true;
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
   users.defaultUserShell = pkgs.zsh;
   programs.zsh.enable = true; 
   nix.settings.experimental-features = [ "nix-command" "flakes"];