changed nixvim config a bit and added some fonts

15 files changed, 255 insertions, 594 deletions

diff --git a/flake.lock b/flake.lock
index 2a86b28..150241d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -53,74 +53,6 @@
         "url": "https://codeberg.org/LGFae/awww"
       }
     },
-    "base16": {
-      "inputs": {
-        "fromYaml": "fromYaml"
-      },
-      "locked": {
-        "lastModified": 1755819240,
-        "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
-        "owner": "SenchoPens",
-        "repo": "base16.nix",
-        "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SenchoPens",
-        "repo": "base16.nix",
-        "type": "github"
-      }
-    },
-    "base16-fish": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1754405784,
-        "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
-        "owner": "tomyun",
-        "repo": "base16-fish",
-        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tomyun",
-        "repo": "base16-fish",
-        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
-        "type": "github"
-      }
-    },
-    "base16-helix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1752979451,
-        "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
-        "owner": "tinted-theming",
-        "repo": "base16-helix",
-        "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-helix",
-        "type": "github"
-      }
-    },
-    "base16-vim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732806396,
-        "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
-        "owner": "tinted-theming",
-        "repo": "base16-vim",
-        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-vim",
-        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
-        "type": "github"
-      }
-    },
     "bemenu": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -184,42 +116,6 @@
         "type": "github"
       }
     },
-    "eww": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "nixpkgs": "nixpkgs_4",
-        "rust-overlay": "rust-overlay_3"
-      },
-      "locked": {
-        "lastModified": 1751292678,
-        "narHash": "sha256-PJW4LvW9FmkG9HyUtgXOq7MDjYtBc/iJuOxyf29nD0Y=",
-        "owner": "elkowar",
-        "repo": "eww",
-        "rev": "fddb4a09b107237819e661151e007b99b5cab36d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "elkowar",
-        "repo": "eww",
-        "type": "github"
-      }
-    },
-    "firefox-gnome-theme": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1758112371,
-        "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=",
-        "owner": "rafaelmardojai",
-        "repo": "firefox-gnome-theme",
-        "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rafaelmardojai",
-        "repo": "firefox-gnome-theme",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -237,22 +133,6 @@
       }
     },
     "flake-compat_2": {
-      "locked": {
-        "lastModified": 1709944340,
-        "narHash": "sha256-xr54XK0SjczlUxRo5YwodibUSlpivS9bqHt8BNyWVQA=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "baa7aa7bd0a570b3b9edd0b8da859fee3ffaa4d4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "ref": "refs/pull/65/head",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_3": {
       "flake": false,
       "locked": {
         "lastModified": 1747046372,
@@ -268,7 +148,7 @@
         "type": "github"
       }
     },
-    "flake-compat_4": {
+    "flake-compat_3": {
       "locked": {
         "lastModified": 1733328505,
         "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
@@ -282,7 +162,7 @@
         "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
       }
     },
-    "flake-compat_5": {
+    "flake-compat_4": {
       "flake": false,
       "locked": {
         "lastModified": 1751685974,
@@ -345,11 +225,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762810396,
-        "narHash": "sha256-dxFVgQPG+R72dkhXTtqUm7KpxElw3u6E+YlQ2WaDgt8=",
+        "lastModified": 1762980239,
+        "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "0bdadb1b265fb4143a75bd1ec7d8c915898a9923",
+        "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da",
         "type": "github"
       },
       "original": {
@@ -379,27 +259,6 @@
         "type": "github"
       }
     },
-    "flake-parts_5": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1756770412,
-        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "4524271976b625a4a605beefd893f270620fd751",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-schemas": {
       "locked": {
         "lastModified": 1721999734,
@@ -450,22 +309,6 @@
         "type": "github"
       }
     },
-    "fromYaml": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1731966426,
-        "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
-        "owner": "SenchoPens",
-        "repo": "fromYaml",
-        "rev": "106af9e2f715e2d828df706c386a685698f3223b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SenchoPens",
-        "repo": "fromYaml",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -488,27 +331,10 @@
         "type": "github"
       }
     },
-    "gnome-shell": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1748186689,
-        "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=",
-        "owner": "GNOME",
-        "repo": "gnome-shell",
-        "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "GNOME",
-        "ref": "48.2",
-        "repo": "gnome-shell",
-        "type": "github"
-      }
-    },
     "helix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5",
-        "rust-overlay": "rust-overlay_4"
+        "nixpkgs": "nixpkgs_4",
+        "rust-overlay": "rust-overlay_3"
       },
       "locked": {
         "lastModified": 1762973522,
@@ -633,17 +459,17 @@
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_5",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems_2",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1762992484,
-        "narHash": "sha256-KsMb0niSk2zxZcSWjIkgcDIGwoKZXDYXdw9lVKdgga8=",
+        "lastModified": 1763071594,
+        "narHash": "sha256-s5FF0rQE6UIBAUfqk5ZqGedU3bhW0OvXfmz5lzJGurY=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "64ee8f8a72d62069a6bef45ca05bef1d0d412e1f",
+        "rev": "43527d363472b52f17dd9f9f4f87ec25cbf8a399",
         "type": "github"
       },
       "original": {
@@ -923,14 +749,14 @@
       "inputs": {
         "flake-parts": "flake-parts",
         "neovim-src": "neovim-src",
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1762992291,
-        "narHash": "sha256-2YbtrpTS2YwxH+ZuKH+F9+bHdTetymcF2sbEy3rfqzg=",
+        "lastModified": 1763078664,
+        "narHash": "sha256-HDuT9S50/3+2blDIL4Y5qX8g5bA5FtpzP9lyagmyNq4=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "8252d1519230c247b720a52ae25642ee1200c940",
+        "rev": "994eb1828abe40f256e27ff38663b4f3f819d4cb",
         "type": "github"
       },
       "original": {
@@ -942,11 +768,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1762991150,
-        "narHash": "sha256-L9wWdIn9jBYbx+RhyPZwQ5bQx1bpOEYqkP8jMEdSiks=",
+        "lastModified": 1763078375,
+        "narHash": "sha256-oGwmSPl+FA0y2uPEGkkavr5sxLkpHR6+Cio8eZ8OtPo=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "fbcdbd458f27e427800c8105ebc8697563fba1b0",
+        "rev": "d017f3c9a0b745e0c57feb8c92dcc852948f7301",
         "type": "github"
       },
       "original": {
@@ -957,8 +783,8 @@
     },
     "niri": {
       "inputs": {
-        "nixpkgs": "nixpkgs_8",
-        "rust-overlay": "rust-overlay_5"
+        "nixpkgs": "nixpkgs_7",
+        "rust-overlay": "rust-overlay_4"
       },
       "locked": {
         "lastModified": 1763014447,
@@ -999,16 +825,16 @@
     },
     "nixcord": {
       "inputs": {
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_3",
         "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_9"
+        "nixpkgs": "nixpkgs_8"
       },
       "locked": {
-        "lastModified": 1762995962,
-        "narHash": "sha256-3vE5vz2v+1YXIx+C7fxGPnR7g+obTHZlSjImK/upZ0M=",
+        "lastModified": 1763083547,
+        "narHash": "sha256-Gdk7+CBp/kefPCPIwrt6PHD3Vd9hhe58DVcew803x9o=",
         "owner": "KaylorBen",
         "repo": "nixcord",
-        "rev": "738f5333d8eb5c43cb53c22fd9d9c15945f52017",
+        "rev": "db15ef80264e0c9f60aea019b657e3f9523445bd",
         "type": "github"
       },
       "original": {
@@ -1050,11 +876,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1762756533,
-        "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=",
+        "lastModified": 1763049705,
+        "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d",
+        "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c",
         "type": "github"
       },
       "original": {
@@ -1066,27 +892,11 @@
     },
     "nixpkgs_10": {
       "locked": {
-        "lastModified": 1762844143,
-        "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_11": {
-      "locked": {
-        "lastModified": 1762482733,
-        "narHash": "sha256-g/da4FzvckvbiZT075Sb1/YDNDr+tGQgh4N8i5ceYMg=",
+        "lastModified": 1762943920,
+        "narHash": "sha256-ITeH8GBpQTw9457ICZBddQEBjlXMmilML067q0e6vqY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e1ebeec86b771e9d387dd02d82ffdc77ac753abc",
+        "rev": "91c9a64ce2a84e648d0cf9671274bb9c2fb9ba60",
         "type": "github"
       },
       "original": {
@@ -1096,7 +906,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_12": {
+    "nixpkgs_11": {
       "locked": {
         "lastModified": 1761880412,
         "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=",
@@ -1112,7 +922,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_13": {
+    "nixpkgs_12": {
       "locked": {
         "lastModified": 1748026106,
         "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
@@ -1128,7 +938,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_14": {
+    "nixpkgs_13": {
       "locked": {
         "lastModified": 1744536153,
         "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
@@ -1144,7 +954,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_15": {
+    "nixpkgs_14": {
       "locked": {
         "lastModified": 1762363567,
         "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=",
@@ -1160,22 +970,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_16": {
-      "locked": {
-        "lastModified": 1758690382,
-        "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1706847834,
@@ -1209,22 +1003,6 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1725534445,
-        "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
-      "locked": {
         "lastModified": 1759381078,
         "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
         "owner": "nixos",
@@ -1239,7 +1017,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1762363567,
         "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=",
@@ -1255,13 +1033,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_6": {
       "locked": {
-        "lastModified": 1762604901,
-        "narHash": "sha256-Pr2jpryIaQr9Yx8p6QssS03wqB6UifnnLr3HJw9veDw=",
+        "lastModified": 1762943920,
+        "narHash": "sha256-ITeH8GBpQTw9457ICZBddQEBjlXMmilML067q0e6vqY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f6b44b2401525650256b977063dbcf830f762369",
+        "rev": "91c9a64ce2a84e648d0cf9671274bb9c2fb9ba60",
         "type": "github"
       },
       "original": {
@@ -1271,7 +1049,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1757967192,
         "narHash": "sha256-/aA9A/OBmnuOMgwfzdsXRusqzUpd8rQnQY8jtrHK+To=",
@@ -1287,7 +1065,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_9": {
+    "nixpkgs_8": {
       "locked": {
         "lastModified": 1754028485,
         "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=",
@@ -1303,49 +1081,40 @@
         "type": "github"
       }
     },
-    "nixvim": {
-      "inputs": {
-        "flake-parts": "flake-parts_3",
-        "nixpkgs": "nixpkgs_11",
-        "nuschtosSearch": "nuschtosSearch",
-        "systems": "systems_4"
-      },
+    "nixpkgs_9": {
       "locked": {
-        "lastModified": 1762904125,
-        "narHash": "sha256-+T9oUulnXOQmy37GGOivHSvEyViA4gQ41mFZEPEDuOA=",
-        "owner": "nix-community",
-        "repo": "nixvim",
-        "rev": "84902b354fd0f122c40880b90dc8ac89d4d0daea",
+        "lastModified": 1762977756,
+        "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
-        "repo": "nixvim",
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nur": {
+    "nixvim": {
       "inputs": {
-        "flake-parts": [
-          "stylix",
-          "flake-parts"
-        ],
-        "nixpkgs": [
-          "stylix",
-          "nixpkgs"
-        ]
+        "flake-parts": "flake-parts_3",
+        "nixpkgs": "nixpkgs_10",
+        "nuschtosSearch": "nuschtosSearch",
+        "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1758998580,
-        "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=",
+        "lastModified": 1763109970,
+        "narHash": "sha256-3azi7sNWVxHiUGMPcEwsd3ErYoMEdLRX/JmgoYEe+os=",
         "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728",
+        "repo": "nixvim",
+        "rev": "6c2ac251d7cfc2416f23257df13c86d84d3eee34",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "repo": "NUR",
+        "repo": "nixvim",
         "type": "github"
       }
     },
@@ -1374,10 +1143,10 @@
     },
     "nvf": {
       "inputs": {
-        "flake-compat": "flake-compat_5",
+        "flake-compat": "flake-compat_4",
         "flake-parts": "flake-parts_4",
         "mnw": "mnw",
-        "nixpkgs": "nixpkgs_12",
+        "nixpkgs": "nixpkgs_11",
         "systems": "systems_5"
       },
       "locked": {
@@ -1396,7 +1165,7 @@
     },
     "pre-commit-hooks": {
       "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_2",
         "gitignore": "gitignore",
         "nixpkgs": [
           "hyprland",
@@ -1423,20 +1192,18 @@
         "bemenu": "bemenu",
         "chaotic": "chaotic",
         "disko": "disko",
-        "eww": "eww",
         "helix": "helix",
         "home-manager": "home-manager_2",
         "hyprland": "hyprland",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
         "niri": "niri",
         "nixcord": "nixcord",
-        "nixpkgs": "nixpkgs_10",
+        "nixpkgs": "nixpkgs_9",
         "nixpkgs-stable": "nixpkgs-stable",
         "nixvim": "nixvim",
         "nvf": "nvf",
         "satty": "satty",
-        "spicetify-nix": "spicetify-nix",
-        "stylix": "stylix"
+        "spicetify-nix": "spicetify-nix"
       }
     },
     "rust-overlay": {
@@ -1484,27 +1251,6 @@
     "rust-overlay_3": {
       "inputs": {
         "nixpkgs": [
-          "eww",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1725675754,
-        "narHash": "sha256-hXW3csqePOcF2e/PYnpXj72KEYyNj2HzTrVNmS/F7Ug=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "8cc45e678e914a16c8e224c3237fb07cf21e5e54",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "rust-overlay_4": {
-      "inputs": {
-        "nixpkgs": [
           "helix",
           "nixpkgs"
         ]
@@ -1523,7 +1269,7 @@
         "type": "github"
       }
     },
-    "rust-overlay_5": {
+    "rust-overlay_4": {
       "inputs": {
         "nixpkgs": [
           "niri",
@@ -1544,9 +1290,9 @@
         "type": "github"
       }
     },
-    "rust-overlay_6": {
+    "rust-overlay_5": {
       "inputs": {
-        "nixpkgs": "nixpkgs_14"
+        "nixpkgs": "nixpkgs_13"
       },
       "locked": {
         "lastModified": 1748140821,
@@ -1564,15 +1310,15 @@
     },
     "satty": {
       "inputs": {
-        "nixpkgs": "nixpkgs_13",
-        "rust-overlay": "rust-overlay_6"
+        "nixpkgs": "nixpkgs_12",
+        "rust-overlay": "rust-overlay_5"
       },
       "locked": {
-        "lastModified": 1763055456,
-        "narHash": "sha256-GOIDPqwUBk+XFR/0crkR9aACaiHKSbfYJtuRjqqn08A=",
+        "lastModified": 1763137684,
+        "narHash": "sha256-BxMI/dC/PmSNj90+WNvkPzIk8lC8oZCTiSdPfiDfmRA=",
         "owner": "gabm",
         "repo": "Satty",
-        "rev": "7dc30b1e453daebc57f628216767dfb998f87a20",
+        "rev": "6c3434fa3688b626ad0ee07373c1822cf00bcc82",
         "type": "github"
       },
       "original": {
@@ -1583,7 +1329,7 @@
     },
     "spicetify-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_15",
+        "nixpkgs": "nixpkgs_14",
         "systems": "systems_6"
       },
       "locked": {
@@ -1600,38 +1346,6 @@
         "type": "github"
       }
     },
-    "stylix": {
-      "inputs": {
-        "base16": "base16",
-        "base16-fish": "base16-fish",
-        "base16-helix": "base16-helix",
-        "base16-vim": "base16-vim",
-        "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-parts": "flake-parts_5",
-        "gnome-shell": "gnome-shell",
-        "nixpkgs": "nixpkgs_16",
-        "nur": "nur",
-        "systems": "systems_7",
-        "tinted-foot": "tinted-foot",
-        "tinted-kitty": "tinted-kitty",
-        "tinted-schemes": "tinted-schemes",
-        "tinted-tmux": "tinted-tmux",
-        "tinted-zed": "tinted-zed"
-      },
-      "locked": {
-        "lastModified": 1762264356,
-        "narHash": "sha256-QVfC53Ri+8n3e7Ujx9kq6all3+TLBRRPRnc6No5qY5w=",
-        "owner": "nix-community",
-        "repo": "stylix",
-        "rev": "647bb8dd96a206a1b79c4fd714affc88b409e10b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "stylix",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -1722,102 +1436,6 @@
         "type": "github"
       }
     },
-    "systems_7": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "tinted-foot": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1726913040,
-        "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
-        "owner": "tinted-theming",
-        "repo": "tinted-foot",
-        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-foot",
-        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
-        "type": "github"
-      }
-    },
-    "tinted-kitty": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735730497,
-        "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
-        "owner": "tinted-theming",
-        "repo": "tinted-kitty",
-        "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-kitty",
-        "type": "github"
-      }
-    },
-    "tinted-schemes": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1757716333,
-        "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=",
-        "owner": "tinted-theming",
-        "repo": "schemes",
-        "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "schemes",
-        "type": "github"
-      }
-    },
-    "tinted-tmux": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1757811970,
-        "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=",
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "type": "github"
-      }
-    },
-    "tinted-zed": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1757811247,
-        "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=",
-        "owner": "tinted-theming",
-        "repo": "base16-zed",
-        "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-zed",
-        "type": "github"
-      }
-    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": [
diff --git a/flake.nix b/flake.nix
index e102ba3..130d621 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,11 +24,7 @@
 
         bemenu.url = "github:Cloudef/bemenu";
 
-        eww.url = "github:elkowar/eww";
-
         awww.url = "git+https://codeberg.org/LGFae/awww";
-
-        stylix.url = "github:nix-community/stylix";
         
         satty.url = "github:gabm/Satty";
 
@@ -46,20 +42,13 @@
   };
 
   outputs =  inputs @{
-    self,
     nixpkgs,
-    home-manager,
-    disko,
-    chaotic,
     hyprland,
-    stylix,
-    satty,
+    niri,
+    nixvim,
     neovim-nightly-overlay,
+    spicetify-nix,
     nixcord,
-    nixvim,
-    helix,
-    niri,
-    bemenu,
     ...
  }: let
       mkHost = { hostname, path }: 
diff --git a/home/editors/nixvim.nix b/home/editors/nixvim.nix
index 2835e1e..17ea2ec 100644
--- a/home/editors/nixvim.nix
+++ b/home/editors/nixvim.nix
@@ -1,7 +1,6 @@
-{ inputs, pkgs, ... }:
+{ pkgs,  inputs, ... }:
 {
   imports = [ inputs.nixvim.homeModules.nixvim ];
-
   programs.nixvim = {
     enable = true;
     package = inputs.neovim-nightly-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default;
@@ -11,24 +10,96 @@
     waylandSupport = true;
     colorschemes.gruvbox.enable = true;
 
-    plugins = {
-      lualine.enable = true;
-      nvim-autopairs.enable = true;
-      nix.enable = true;
-      treesitter.enable = true;
-      lsp = {
-        enable = true;
-	servers = {
-	  nil_ls.enable = true;
-	  clangd.enable = true;
-	  };
-      };
-    };
+     plugins = {
+       lualine.enable = true;
+       nvim-autopairs.enable = true;
+       neoscroll.enable = true;
+       bufferline.enable = true;
+       treesitter = {
+         enable = true;
+         settings = {
+           indent.enable = true;
+         };
+       };
+       web-devicons.enable = true;
+       telescope = {
+         enable = true;
+         extensions = {
+            fzf-native = {
+               enable = true;
+             };
+           };
+       };
+       hardtime = {
+         enable = false;
+         settings = {
+           disableMouse = true;
+           enabled = false;
+           restrictionMode = "hint";
+           hint = true;
+           maxCount = 40;
+           maxTime = 1000;
+         };
+       };
+       nix.enable = true;
+       lsp = {
+         enable = true;
+          servers = {
+          nil_ls.enable = true;
+          clangd.enable = true;
+          };
+       };
+     };
 
     opts = {
       number = true;
       relativenumber = true;
+      termguicolors = true;
+      # mouse = "a";
+      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;
+      clipboard = {
+        providers.wl-copy.enable = true;
+        register = "wl-copy";
+      };
     };
+
+    keymaps = [
+    {
+      key    = "<Up>";
+      action = "<Nop>";
+      mode   = [ "n" "i" "v" ];
+      options = { silent = true; };
+    }
+    { key    = "<Down>";
+      action = "<Nop>";
+      mode   = [ "n" "i" "v" ];
+      options = { silent = true; };
+    }
+    {
+      key    = "<Left>";
+      action = "<Nop>";
+      mode   = [ "n" "i" "v" ];
+      options = { silent = true; };
+    }
+    {
+      key    = "<Right>";
+      action = "<Nop>";
+      mode   = [ "n" "i" "v" ];
+      options = { silent = true; };
+    }
+  ];
   };
 }
diff --git a/home/editors/nvf.nix b/home/editors/nvf.nix
index 428f41f..ab805ca 100644
--- a/home/editors/nvf.nix
+++ b/home/editors/nvf.nix
@@ -1,11 +1,11 @@
-{ inputs, pkgs, ... }:
+{ pkgs, neovim-nightly-overlay, ... }:
 
 {
   programs.nvf = {
     enable = true;
 
     settings.vim = {
-      package= inputs.neovim-nightly-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default;
+      package = neovim-nightly-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default;
 
       viAlias = true;
       vimAlias = true;
diff --git a/home/home.nix b/home/home.nix
index e56d1f3..39f4567 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -2,19 +2,22 @@
 
 {
   imports = [
-    ./wayland/hyprland/binds.nix
+    # Window Managers
+    ./wayland/hyprland/hyprland.nix
+    ./wayland/niri/niri.nix
+    # Wayland specific programs
     ./wayland/waybar.nix
+    # Editors
+    ./editors/nixvim.nix
+    ./editors/helix.nix
+    # Programs
     ./terminals/foot.nix
     ./shells/fish.nix
     ./shells/starship.nix
     ./programs/spicetify.nix
-#    ./editors/nvf.nix
-    ./editors/nixvim.nix
-    ./editors/helix.nix
-    ./wayland/xdg.nix
-    ./wayland/eww.nix
     ./programs/nixcord.nix
-#    ./stylix.nix
+    # Other
+    ./xdg.nix
 ];
 
   home.username = "adam";
@@ -55,66 +58,27 @@
 
   programs.btop.enable = true;
 
-programs.git = {
-  enable = true;
-  settings = {
-    user.name = "adikro";
-    user.email = "adikro@disroot.org";
-    init.defaultBranch = "main";
-  };
-};
-
-gtk = {
-  enable = true;
-  theme = {
-    name = "Adwaita-dark";
-    package = pkgs.gnome-themes-extra;
-  };
-};
-
-qt = {
-  enable = true;
-  style.name = "Breeze-Dark";
-};
-
-wayland.windowManager.hyprland = {
-  enable = true;
-  settings = {
-
-  general = {
-    gaps_in = 6;
-    gaps_out = 16;
-    border_size = 2;
-  };
-
-  decoration = {
-    rounding = 12;
+  programs.git = {
+    enable = true;
+    settings = {
+      user.name = "adikro";
+      user.email = "adikro@disroot.org";
+      init.defaultBranch = "main";
+    };
   };
 
-  "$mod" = "ALT";
-    monitor = [
-      "DP-1,2560x1440@240,0x0,1,vrr,0"
-    ];
-    workspace = [
-      "1,monitor:DP-1,default:true"
-      "2,monitor:DP-1"
-      "3,monitor:DP-1"
-      "4,monitor:DP-1"
-      "5,monitor:DP-1"
-    ];
-
-    input = {
-      accel_profile = "flat";
-      sensitivity = -0.6;
-      repeat_rate = 45;
-      repeat_delay = 750;
+  gtk = {
+    enable = true;
+    theme = {
+      name = "Adwaita-dark";
+      package = pkgs.gnome-themes-extra;
     };
+  };
 
-    animations = {
-      enabled = false;
-    };
+  qt = {
+    enable = true;
+    style.name = "Breeze-Dark";
   };
-};
 
   programs.home-manager.enable = true;
 }
diff --git a/home/programs/nixcord.nix b/home/programs/nixcord.nix
index ead23aa..2f73eb1 100644
--- a/home/programs/nixcord.nix
+++ b/home/programs/nixcord.nix
@@ -1,7 +1,6 @@
-{ pkgs, inputs, lib, config, ... }:
+{ inputs, ... }:
 {
   imports = [ inputs.nixcord.homeModules.nixcord ];
-
   programs.nixcord = {
     enable = true;
     discord.enable = false;
diff --git a/home/programs/spicetify.nix b/home/programs/spicetify.nix
index a581bd6..9d66181 100644
--- a/home/programs/spicetify.nix
+++ b/home/programs/spicetify.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, inputs, ... }:
+{ pkgs, inputs, ... }:
 
 let
   spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
@@ -15,7 +15,6 @@ in {
       hidePodcasts
     ];
 
-#    theme = spicePkgs.themes.onepunch;
     theme = spicePkgs.themes.catppuccin;
     colorScheme = "mocha";
   };
diff --git a/home/stylix.nix b/home/stylix.nix
deleted file mode 100644
index 16830cc..0000000
--- a/home/stylix.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ inputs, ... }:
-{
-  imports = [ inputs.stylix.homeModules.stylix ];
-
-  stylix = {
-    enable = true;
-  };
-}
diff --git a/home/wayland/eww.nix b/home/wayland/eww.nix
deleted file mode 100644
index fe7df23..0000000
--- a/home/wayland/eww.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-{
-  programs.eww = {
-    enable = true;
-    enableFishIntegration = true;
-  };
-}
diff --git a/home/wayland/hyprland/hyprland.nix b/home/wayland/hyprland/hyprland.nix
new file mode 100644
index 0000000..fe85283
--- /dev/null
+++ b/home/wayland/hyprland/hyprland.nix
@@ -0,0 +1,45 @@
+{ ... }:
+{
+  imports = [
+    ./binds.nix
+  ];
+
+  wayland.windowManager.hyprland = {
+    enable = true;
+    settings = {
+
+    general = {
+      gaps_in = 6;
+      gaps_out = 16;
+      border_size = 2;
+    };
+
+    decoration = {
+      rounding = 12;
+    };
+
+    "$mod" = "ALT";
+      monitor = [
+        "DP-1,2560x1440@240,0x0,1,vrr,0"
+      ];
+      workspace = [
+        "1,monitor:DP-1,default:true"
+        "2,monitor:DP-1"
+        "3,monitor:DP-1"
+        "4,monitor:DP-1"
+        "5,monitor:DP-1"
+      ];
+
+      input = {
+        accel_profile = "flat";
+        sensitivity = -0.6;
+        repeat_rate = 45;
+        repeat_delay = 500;
+      };
+
+      animations = {
+        enabled = false;
+      };
+    };
+  };
+}
diff --git a/home/wayland/niri/niri.nix b/home/wayland/niri/niri.nix
new file mode 100644
index 0000000..facb35d
--- /dev/null
+++ b/home/wayland/niri/niri.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+
+}
diff --git a/home/wayland/xdg.nix b/home/xdg.nix
index f4b1294..f4b1294 100644
--- a/home/wayland/xdg.nix
+++ b/home/xdg.nix
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 47ac758..dd474cb 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -12,7 +12,6 @@
       ../../modules/networking.nix
       ../../modules/scx.nix
       ../../modules/tor.nix
-      ../../modules/disko.nix
       ../../modules/hyprland.nix
       ../../modules/niri.nix
       ../../modules/dwl.nix
@@ -31,7 +30,7 @@
   };
 
   services.spotifyd = {
-  enable = true;
+    enable = true;
   };
 
   programs.gnupg.agent = {
@@ -110,13 +109,13 @@ environment.sessionVariables = {
   ELECTRON_ENABLE_WAYLAND = "1";
   };
 
-programs.fish.enable = true;
+    programs.fish.enable = true;
 
-     users.users.adam = {
-     isNormalUser = true;
-     extraGroups = [ "wheel" "input" ];
-     home = "/home/adam";
-     shell = pkgs.fish;
+    users.users.adam = {
+      isNormalUser = true;
+      extraGroups = [ "wheel" "input" ];
+      home = "/home/adam";
+      shell = pkgs.fish;
    };
 
    environment.systemPackages = with pkgs; [
@@ -128,31 +127,25 @@ programs.fish.enable = true;
 
     wineWowPackages.waylandFull
     winetricks
-    vim
-    lan-mouse_git
     tuigreet
-    hyprland
     linux-firmware
     dbus 
     nh
     gamemode
     mangohud
-    grim
     grimblast
-    slurp
     wl-clipboard
-    swappy
-    git
     nix-output-monitor
     nvd
     rivalcfg
     easyeffects
     lutris
-    nix-tree
    ];
 
   fonts.packages = with pkgs; [
     nerd-fonts.jetbrains-mono 
+    nerd-fonts.fira-mono
+    nerd-fonts.fira-code
 ];
 
 system.stateVersion = "25.05";
diff --git a/modules/disko.nix b/modules/disko.nix
deleted file mode 100644
index d53acaf..0000000
--- a/modules/disko.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ config, inputs, ... }:
-{
-  imports  = [ inputs.disko.nixosModules.disko ];
-
-
-}
diff --git a/modules/dwl.nix b/modules/dwl.nix
index b0ca904..983cb57 100644
--- a/modules/dwl.nix
+++ b/modules/dwl.nix
@@ -2,8 +2,8 @@
 {
   programs.dwl = {
     enable = true;
-    package = pkgs.dwl.overrideAttrs {
-      src = ./dwl;
-    };
+#    package = pkgs.dwl.overrideAttrs {
+#      src = ./dwl;
+#    };
   };
 }