hm changes

15 files changed, 70 insertions, 689 deletions

diff --git a/flake.lock b/flake.lock
index 1a1a75c..7a6c689 100644
--- a/flake.lock
+++ b/flake.lock
@@ -138,22 +138,6 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1751685974,
-        "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=",
-        "ref": "refs/heads/main",
-        "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1",
-        "revCount": 92,
-        "type": "git",
-        "url": "https://git.lix.systems/lix-project/flake-compat.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.lix.systems/lix-project/flake-compat.git"
-      }
-    },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
         "lastModified": 1650374568,
         "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
         "owner": "edolstra",
@@ -167,7 +151,7 @@
         "type": "github"
       }
     },
-    "flake-compat_3": {
+    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1767039857,
@@ -185,69 +169,6 @@
     },
     "flake-parts": {
       "inputs": {
-        "nixpkgs-lib": [
-          "neovim-nightly-overlay",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1775087534,
-        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1775087534,
-        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_3": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nvf",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1769996383,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_4": {
-      "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
@@ -303,7 +224,7 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1694529238,
@@ -321,7 +242,7 @@
     },
     "flake-utils_3": {
       "inputs": {
-        "systems": "systems_7"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -383,11 +304,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777476904,
-        "narHash": "sha256-EeLoE8n4+QCbteyAsYXxhfr97RFfWL1ga0xwfL6lpKw=",
+        "lastModified": 1777780644,
+        "narHash": "sha256-CYpc+mk28rmcQWGygeM8CA+Z8SZYy8BOyQtiW18spao=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8c8e5389e75a36bee53920de8ee24f017b3ae03e",
+        "rev": "b9311028044a9e9b2cf27db15ef0a87d464e212d",
         "type": "github"
       },
       "original": {
@@ -528,11 +449,11 @@
       },
       "locked": {
         "dir": "packages/nix",
-        "lastModified": 1776469299,
-        "narHash": "sha256-6KV0OgBCKrbVP4EM9hqcospkoPImbt6VZ18Mbgi9bqY=",
+        "lastModified": 1777567645,
+        "narHash": "sha256-ccIaFXZnxFBwQh3xF63CerpzqU3QHm8IM3tyQ43WPJk=",
         "owner": "SteamClientHomebrew",
         "repo": "Millennium",
-        "rev": "19741152e4237810141a0f18868a6993939e556a",
+        "rev": "fcb0e5627deecf2fc03067ee3dfb63d37e8e82d4",
         "type": "github"
       },
       "original": {
@@ -610,21 +531,6 @@
         "type": "github"
       }
     },
-    "mnw": {
-      "locked": {
-        "lastModified": 1770419553,
-        "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=",
-        "owner": "Gerg-L",
-        "repo": "mnw",
-        "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Gerg-L",
-        "repo": "mnw",
-        "type": "github"
-      }
-    },
     "mygui": {
       "locked": {
         "lastModified": 1716480759,
@@ -660,66 +566,6 @@
         "type": "github"
       }
     },
-    "ndg": {
-      "inputs": {
-        "nixpkgs": [
-          "nvf",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1776882296,
-        "narHash": "sha256-DWZozXwMsgvUqfVlL1mQ8dOxW7GJ/8CdyaDN+1niZRg=",
-        "owner": "feel-co",
-        "repo": "ndg",
-        "rev": "ab7d78d4884b3a34968cf9fa3d16c0c1246d5c6e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "feel-co",
-        "ref": "refs/tags/v2.6.0",
-        "repo": "ndg",
-        "type": "github"
-      }
-    },
-    "neovim-nightly-overlay": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "neovim-src": "neovim-src",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1777421059,
-        "narHash": "sha256-j+RatOnOaHNQ7NeTx9Y+mCxk4LdfW1i110CfzvldrZ8=",
-        "owner": "nix-community",
-        "repo": "neovim-nightly-overlay",
-        "rev": "b6c0276d965f099bfa2c81b063185b91420ed71e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "neovim-nightly-overlay",
-        "type": "github"
-      }
-    },
-    "neovim-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1777418282,
-        "narHash": "sha256-0Ob0no3cz2zs2RjO1B1tBWtm0p+uSSO0w11l73fgROU=",
-        "owner": "neovim",
-        "repo": "neovim",
-        "rev": "c33e60f748ac4fbfcdc327ff85c18a6ff8258f88",
-        "type": "github"
-      },
-      "original": {
-        "owner": "neovim",
-        "repo": "neovim",
-        "type": "github"
-      }
-    },
     "niri": {
       "inputs": {
         "niri-stable": "niri-stable",
@@ -732,11 +578,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1777472199,
-        "narHash": "sha256-gJr/OrHv6s8ANqv915sb69LLThow1u5yAO/ouElVGGM=",
+        "lastModified": 1777737732,
+        "narHash": "sha256-k5mLtKOpLNdhMHY1TPGcAFefnWDctZsYQ6X4YDvLFhU=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "323a80f2ce4541c595d491acbd15a8800201cbae",
+        "rev": "73b10d69d6c8b3836ff6581004024282f0a4cd15",
         "type": "github"
       },
       "original": {
@@ -765,11 +611,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1777468255,
-        "narHash": "sha256-lBZc1UMy+1P1T/E41j3jQrpS7EFI3qegd+ktHZdamIg=",
+        "lastModified": 1777733745,
+        "narHash": "sha256-1TlpdT0WYyBGtUS3PH4oXHUmdno2EUh2TfHadK2BmJo=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "dd1c3bcb9f1ef416df33ffa22d1d9bcee1398e7d",
+        "rev": "1f07cffa9f355298a31d7efe1b400ede93a97728",
         "type": "github"
       },
       "original": {
@@ -786,11 +632,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777358134,
-        "narHash": "sha256-05PDthJs6UBkLjLN03qzO0EpjGnwkC/6f+T6I6GKdAY=",
+        "lastModified": 1777730630,
+        "narHash": "sha256-bRJ0gAxAMtv6X4sFgiJfEZMRaHxzT37yp6Mj0rAULcI=",
         "owner": "powerofthe69",
         "repo": "nix-gaming-edge",
-        "rev": "cc5d6ade3dea271bed0631888b6ca597991f06cd",
+        "rev": "78319d4a685238bb5611dc7a35d6ca812a035af4",
         "type": "github"
       },
       "original": {
@@ -848,11 +694,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1777077449,
-        "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=",
+        "lastModified": 1777428379,
+        "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160",
+        "rev": "755f5aa91337890c432639c60b6064bb7fe67769",
         "type": "github"
       },
       "original": {
@@ -864,11 +710,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1777077449,
-        "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=",
+        "lastModified": 1777428379,
+        "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160",
+        "rev": "755f5aa91337890c432639c60b6064bb7fe67769",
         "type": "github"
       },
       "original": {
@@ -880,11 +726,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1777268161,
-        "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
+        "lastModified": 1777578337,
+        "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
+        "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab",
         "type": "github"
       },
       "original": {
@@ -910,53 +756,6 @@
         "type": "github"
       }
     },
-    "nixvim": {
-      "inputs": {
-        "flake-parts": "flake-parts_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1777236345,
-        "narHash": "sha256-ALOqlq7bE30lsX4rA76hXeQ2aLLEpb44hS+D1+jWS88=",
-        "owner": "nix-community",
-        "repo": "nixvim",
-        "rev": "a67d9cd6ff725a763afe88727aac73208ded3bf4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixvim",
-        "type": "github"
-      }
-    },
-    "nvf": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts_3",
-        "mnw": "mnw",
-        "ndg": "ndg",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1777478067,
-        "narHash": "sha256-2vZnUuv8fg2sIE6pXgGxZQQ3ZhQW1XE7Sxieg8gK2p4=",
-        "owner": "NotAShelf",
-        "repo": "nvf",
-        "rev": "13c4ad4b4bb926c22945e2fb8862769fe51f27f1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NotAShelf",
-        "repo": "nvf",
-        "type": "github"
-      }
-    },
     "omnisearch": {
       "inputs": {
         "beaker-src": "beaker-src",
@@ -965,11 +764,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776229871,
-        "narHash": "sha256-IqZAw2Z3uwkuq5gv+XoRA4I+P9yxWPb5fPAL14SlEME=",
+        "lastModified": 1777508256,
+        "narHash": "sha256-K+tTlkGEruE/LrGpykxa7yaDg3Z6V+Tmo6YprUMSzKg=",
         "ref": "refs/heads/master",
-        "rev": "92dd87eb57e12f9c6936e7ee2a00bf8d92b472c8",
-        "revCount": 121,
+        "rev": "a9db276fd872951769451142137a5e0f88ed15bc",
+        "revCount": 122,
         "shallow": false,
         "type": "git",
         "url": "https://git.bwaaa.monster/omnisearch"
@@ -1005,12 +804,12 @@
     },
     "otter-launcher": {
       "inputs": {
-        "flake-parts": "flake-parts_4",
+        "flake-parts": "flake-parts",
         "home-manager": "home-manager_2",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_5"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1776906414,
@@ -1048,21 +847,17 @@
         "disko": "disko",
         "fsel": "fsel",
         "home-manager": "home-manager",
-        "neovim-nightly-overlay": "neovim-nightly-overlay",
         "niri": "niri",
         "nix-gaming-edge": "nix-gaming-edge",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-stable": "nixpkgs-stable_2",
-        "nixvim": "nixvim",
-        "nvf": "nvf",
         "omnisearch": "omnisearch",
         "openmw-nix": "openmw-nix",
         "otter-launcher": "otter-launcher",
         "satty": "satty",
         "sops-nix": "sops-nix",
         "spicetify-nix": "spicetify-nix",
-        "subtui": "subtui",
         "waybar": "waybar",
         "yazi": "yazi"
       }
@@ -1163,7 +958,7 @@
     },
     "snowfall-lib": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
         "flake-utils-plus": "flake-utils-plus",
         "nixpkgs": [
           "openmw-nix",
@@ -1209,14 +1004,14 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_6"
+        "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1777183994,
-        "narHash": "sha256-zahis/vVFOsWv/HeyHbU13jxnrCC+ppIg49xG+viWxg=",
+        "lastModified": 1777789800,
+        "narHash": "sha256-XHCvLGu/bEEZRzXVKFu1i+2YB102Nr00n8e7xrzsfVs=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "501256c3e670ca1679501ce3839ea805df00d8ba",
+        "rev": "d0e921cc48aab6137d203a3eab19601dc2bdc0c3",
         "type": "github"
       },
       "original": {
@@ -1225,26 +1020,6 @@
         "type": "github"
       }
     },
-    "subtui": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1777120747,
-        "narHash": "sha256-r6uHOz3ffeVtizN+NeFqKTjcvCguuR0LwoUrCEwFziQ=",
-        "owner": "MattiaPun",
-        "repo": "SubTUI",
-        "rev": "cc4149f59c8d0e727207230e36410fcab9e257a8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "MattiaPun",
-        "repo": "SubTUI",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -1277,36 +1052,6 @@
     },
     "systems_3": {
       "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_5": {
-      "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
         "owner": "nix-systems",
@@ -1320,7 +1065,7 @@
         "type": "github"
       }
     },
-    "systems_6": {
+    "systems_4": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1335,7 +1080,7 @@
         "type": "github"
       }
     },
-    "systems_7": {
+    "systems_5": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1352,7 +1097,7 @@
     },
     "waybar": {
       "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_2",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -1430,11 +1175,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1777190831,
-        "narHash": "sha256-/aRe0XpElRx8zLYAjhd3SroJn90hRqfCqhHJEZKUQB0=",
+        "lastModified": 1777731325,
+        "narHash": "sha256-GwkNEp/tPf2eDBTpTLpimTsKaH5enVuU4OM4AZ9ZKdc=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "c4c533e3efca8da498b137dfc907bc5e20090f93",
+        "rev": "62dd22b8daee4fa90dfcc94b1d5d39e1ead3ba0e",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 7260f92..fb57535 100644
--- a/flake.nix
+++ b/flake.nix
@@ -60,27 +60,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    subtui = {
-      url = "github:MattiaPun/SubTUI";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    # Editors
-    nixvim = {
-      url = "github:nix-community/nixvim";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    nvf = {
-      url = "github:NotAShelf/nvf";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    neovim-nightly-overlay = {
-      url = "github:nix-community/neovim-nightly-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     # Other
     omnisearch = {
       # url = "git+https://git.bwaaa.monster/omnisearch";
diff --git a/hm/default.nix b/hm/default.nix
index a8babd7..d6b4fad 100644
--- a/hm/default.nix
+++ b/hm/default.nix
@@ -4,7 +4,6 @@
     ./soft/soft.nix
     ./conf/conf.nix
     ./env/env.nix
-    ./editors/editors.nix
     ./shell/shell.nix
   ];
 }
diff --git a/hm/editors/editors.nix b/hm/editors/editors.nix
deleted file mode 100644
index 1dac436..0000000
--- a/hm/editors/editors.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./helix.nix
-    ./nixvim/nixvim.nix
-    ./nvf/nvf.nix
-  ];
-}
diff --git a/hm/editors/helix.nix b/hm/editors/helix.nix
deleted file mode 100644
index d20db0e..0000000
--- a/hm/editors/helix.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.hm.editors.helix;
-in
-{
-  options.hm.editors.helix.enable = lib.mkEnableOption "enables helix editor";
-  config = lib.mkIf cfg.enable {
-    programs.helix = {
-      enable = true;
-     package = pkgs.helix;
-    };
-  };
-}
diff --git a/hm/editors/nixvim/binds.nix b/hm/editors/nixvim/binds.nix
deleted file mode 100644
index e69de29..0000000
--- a/hm/editors/nixvim/binds.nix
+++ /dev/null
diff --git a/hm/editors/nixvim/nixvim.nix b/hm/editors/nixvim/nixvim.nix
deleted file mode 100644
index ea6398b..0000000
--- a/hm/editors/nixvim/nixvim.nix
+++ /dev/null
@@ -1,271 +0,0 @@
-{
-  inputs,
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.hm.editors.nixvim;
-in
-{
-  imports = [ inputs.nixvim.homeModules.nixvim ];
-
-  options.hm.editors.nixvim.enable = lib.mkEnableOption "enables nixvim config framework";
-
-  config = lib.mkIf cfg.enable {
-    programs.nixvim = {
-      diagnostics.virtual_text = false;
-      enable = true;
-      package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;
-
-      viAlias = true;
-      vimAlias = true;
-      defaultEditor = true;
-      waylandSupport = true;
-      colorschemes.gruvbox.enable = true;
-
-      globals.mapleader = " ";
-
-      clipboard = {
-        providers.wl-copy.enable = true;
-        register = "unnamedplus";
-      };
-
-      opts = {
-        smartindent = true;
-        autoindent = true;
-        breakindent = true;
-        number = true;
-        relativenumber = true;
-        termguicolors = true;
-        ignorecase = true;
-        smartcase = true;
-        expandtab = true;
-        shiftwidth = 2;
-        encoding = "utf-8";
-        fileencoding = "utf-8";
-        undofile = true;
-        swapfile = true;
-        backup = false;
-        autoread = true;
-        cursorline = true;
-        ruler = true;
-        gdefault = true;
-        scrolloff = 5;
-      };
-
-      keymaps = [
-        {
-          mode = [ "" ];
-          key = "<F1>";
-          action = "<NOP>";
-          options.silent = true;
-        }
-        {
-          mode = "n";
-          key = "<leader>gs";
-          action = "<cmd>Neogit<CR>";
-          options.desc = "Neogit Status";
-        }
-        {
-          mode = "n";
-          key = "<leader>ff";
-          action = "<cmd>Telescope find_files<CR>";
-          options.desc = "Find Files";
-        }
-        {
-          mode = "n";
-          key = "gd";
-          action = "<cmd>lua vim.lsp.buf.definition()<CR>";
-          options.desc = "Go to Definition";
-        }
-        {
-          mode = "n";
-          key = "K";
-          action = "<cmd>lua vim.lsp.buf.hover()<CR>";
-          options.desc = "Hover Docs";
-        }
-        {
-          mode = "n";
-          key = "<leader>ca";
-          action = "<cmd>lua vim.lsp.buf.code_action()<CR>";
-          options.desc = "Code Actions";
-        }
-        {
-          mode = "n";
-          key = "<leader>rn";
-          action = "<cmd>lua vim.lsp.buf.rename()<CR>";
-          options.desc = "Rename Symbol";
-        }
-        {
-          mode = "n";
-          key = "<leauer>fs";
-          action = "<cmd>Telescope lsp_document_symbols<CR>";
-          options.desc = "Find Symbols (Functions/Variables)";
-        }
-        {
-          mode = "n";
-          key = "<leader>fg";
-          action = "<cmd>Telescope live_grep<CR>";
-          options.desc = "Live Grep";
-        }
-        {
-          mode = "n";
-          key = "<leader>ma";
-          action = "<cmd>MCpattern<CR>";
-          options.desc = "Select all matches of pattern";
-        }
-        {
-          mode = "n";
-          key = "<leader>ha";
-          action = ''<cmd>lua require("harpoon.mark").add_file()<CR>'';
-          options.desc = "Harpoon: Mark File";
-        }
-        {
-          mode = "n";
-          key = "<leader>hh";
-          action = ''<cmd>lua require("harpoon.ui").toggle_quick_menu()<CR>'';
-          options.desc = "Harpoon: Show Menu";
-        }
-        {
-          mode = "n";
-          key = "<leader>xx";
-          action = "<cmd>Trouble diagnostics toggle<CR>";
-          options.desc = "Toggle Trouble (Diagnostics)";
-        }
-        {
-          mode = "n";
-          key = "<leader>p";
-          action = "<cmd>Telescope yank_history<CR>";
-          options.desc = "Open Yank History";
-        }
-      ];
-
-      plugins = {
-        overseer.enable = true;
-        # neotest.enable = true;
-
-        tiny-inline-diagnostic = {
-          enable = true;
-          settings = {
-            preset = "minimal";
-            show_all_diags_on_cursorline = true;
-            options = {
-              multilines = {
-                enabled = true;
-                always_show = true;
-              };
-            };
-          };
-        };
-        comment.enable = true;
-        flash = {
-          enable = true;
-          settings = {
-            search.enabled = true;
-            jump.autojump = true;
-          };
-        };
-        notify = {
-          enable = true;
-          settings.topDown = false;
-        };
-        yanky = {
-          enable = true;
-          settings.ring.history_length = 100;
-          settings.system_clipboard.sync_with_ring = true;
-        };
-        lualine = {
-          enable = true;
-          settings = {
-            options.theme = "gruvbox-material";
-            sections = {
-              lualine_b = [ "diagnostics" ];
-              lualine_c = [ "filename" ];
-              lualine_x = [ "filetype" ];
-            };
-          };
-        };
-
-        treesitter-context = {
-          enable = true;
-          settings = {
-            indent.enable = true;
-            max_lines = 2;
-            trim_scope = "outer";
-          };
-        };
-        oil.enable = true;
-        nvim-autopairs.enable = true;
-        neoscroll.enable = true;
-        bufferline.enable = true;
-        web-devicons.enable = true;
-        lsp-kind.enable = true;
-
-        blink-cmp = {
-          enable = true;
-          settings = {
-            keymap = {
-              preset = "default";
-              "<C-space>" = [
-                "show"
-                "show_documentation"
-                "hide"
-              ];
-              # "<CR>" = [
-              #   "accept"
-              #   "fallback"
-              # ];
-              # "<Tab>" = [
-              #   "select_next"
-              #   "fallback"
-              # ];
-              # "<S-Tab>" = [
-              #   "select_prev"
-              #   "fallback"
-              # ];
-            };
-          };
-        };
-
-        # gitsigns.enable = true;
-        which-key.enable = true;
-        harpoon = {
-          enable = true;
-          enableTelescope = true;
-        };
-        toggleterm.enable = true;
-        treesitter.enable = true;
-        telescope = {
-          enable = true;
-          extensions.fzf-native.enable = true;
-        };
-        noice.enable = true;
-        dressing.enable = true;
-
-        conform-nvim = {
-          enable = true;
-          settings = {
-            formatters_by_ft = {
-              nix = [ "alejandra" ];
-            };
-            format_on_save = {
-              lsp_fallback = true;
-              timeout_ms = 500;
-            };
-          };
-        };
-
-        lsp = {
-          enable = true;
-          servers = {
-            zls.enable = true;
-            nil_ls.enable = true;
-            clangd.enable = true;
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/hm/editors/nvf/nvf.nix b/hm/editors/nvf/nvf.nix
deleted file mode 100644
index dc6c072..0000000
--- a/hm/editors/nvf/nvf.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  inputs,
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.hm.editors.nvf;
-in
-{
-  imports = [ inputs.nvf.homeManagerModules.default ];
-
-  options.hm.editors.nvf.enable = lib.mkEnableOption "enables nvf configuration framework";
-  config = lib.mkIf cfg.enable {
-    programs.nvf = {
-      enable = true;
-
-      settings.vim = {
-        package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;
-
-        viAlias = true;
-        vimAlias = true;
-
-        theme = {
-          enable = true;
-          name = "gruvbox";
-          style = "dark";
-        };
-
-        statusline = {
-          lualine = {
-            enable = true;
-            theme = "gruvbox-material";
-          };
-        };
-
-        autopairs.nvim-autopairs.enable = true;
-
-        lsp.enable = true;
-
-        languages = {
-          nix = {
-            enable = true;
-            format = {
-              enable = true;
-              type = "alejandra";
-            };
-          };
-          clang.enable = true;
-        };
-      };
-    };
-  };
-}
diff --git a/hm/soft/editor.nix b/hm/soft/editor.nix
new file mode 100644
index 0000000..c99c683
--- /dev/null
+++ b/hm/soft/editor.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, lib, ... }:
+let
+  cfg = config.hm.soft.editor;
+in
+{
+  options.hm.soft.editor.enable = lib.mkEnableOption "enables the vis editor along with the nixd language server";
+  config = lib.mkIf cfg.enable {
+    home.packages = with pkgs; [
+      vis
+      nixd
+    ];
+  };
+}
diff --git a/hm/soft/soft.nix b/hm/soft/soft.nix
index 6675083..05740bb 100644
--- a/hm/soft/soft.nix
+++ b/hm/soft/soft.nix
@@ -3,6 +3,7 @@
   imports = [
     ./browser.nix
     ./chat.nix
+    ./editor.nix
     ./email.nix
     ./kdenlive.nix
     ./mangohud.nix
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 8ee67e5..82909c2 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -109,15 +109,6 @@
     thunar.enable = true;
   };
 
-  environment.systemPackages = with pkgs; [
-    (inputs.subtui.packages.x86_64-linux.subtui)
-    stow
-    gimp
-    vis
-    lua-language-server
-    nil
-  ];
-
   boot = {
     kernelModules = [
       "nct6687"
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index eea90e7..002f28e 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -1,4 +1,4 @@
-{ username, ... }:
+{ username, pkgs, ... }:
 {
   imports = [ ../../hm/default.nix ];
 
@@ -21,7 +21,6 @@
       };
       xdg-mime.enable = true;
     };
-    editors.nixvim.enable = true;
     env = {
       fsel.enable = true;
       mako.enable = true;
@@ -50,6 +49,7 @@
       sioyek.enable = true;
       browser.librewolf.enable = true;
       email.thunderbird.enable = true;
+      editor.enable = true;
       media.enable = true;
       mpv.enable = true;
       chat.enable = true;
@@ -87,4 +87,8 @@
       };
     };
   };
+
+  home.packages = with pkgs; [
+    stow  
+  ];
 }
diff --git a/hosts/pendrive/home.nix b/hosts/pendrive/home.nix
index 9ae18ad..f78960a 100644
--- a/hosts/pendrive/home.nix
+++ b/hosts/pendrive/home.nix
@@ -17,7 +17,6 @@
       git.enable = true;
       xdg-dirs.enable = true;
     };
-    editors.nixvim.enable = true;
     env = {
       niri.enable = true;
       cursor.enableMiyabi = true;
diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix
index b986f93..8bbc3b6 100644
--- a/hosts/thinkpad/configuration.nix
+++ b/hosts/thinkpad/configuration.nix
@@ -91,12 +91,5 @@
       niri.enable = true;
     };
   };
-  environment.systemPackages = with pkgs; [
-    stow
-    vis
-    gimp
-    appimage-run
-    (inputs.subtui.packages.x86_64-linux.subtui)
-  ];
   # boot.kernelParams = [ "iomem=relaxed" ];
 }
diff --git a/hosts/thinkpad/home.nix b/hosts/thinkpad/home.nix
index 35f227d..7ebeb94 100644
--- a/hosts/thinkpad/home.nix
+++ b/hosts/thinkpad/home.nix
@@ -1,4 +1,4 @@
-{ username, ... }:
+{ username, pkgs, ... }:
 {
   imports = [ ../../hm/default.nix ];
 
@@ -21,7 +21,6 @@
       };
       xdg-mime.enable = true;
     };
-    editors.nixvim.enable = true;
     env = {
       fsel.enable = true;
       mako.enable = true;
@@ -49,6 +48,7 @@
       sioyek.enable = true;
       browser.librewolf.enable = true;
       email.thunderbird.enable = true;
+      editor.enable = true;
       media.enable = true;
       mpv.enable = true;
       chat.enable = true;
@@ -59,4 +59,8 @@
       yt-dlp.enable = true;
     };
   };
+
+  home.packages = with pkgs; [
+    stow
+  ];
 }