flake.lock

@@ -72,22 +72,6 @@
         "type": "github"
       }
     },
-    "cmp-vimtex": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1716040164,
-        "narHash": "sha256-CO70M+l/9c4vqNm0XloOTzGQTmogHbSwvUFKQxYGsuw=",
-        "owner": "micangl",
-        "repo": "cmp-vimtex",
-        "rev": "a64b1b5eec0460144c91c4f20a45c74b8ded48ae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "micangl",
-        "repo": "cmp-vimtex",
-        "type": "github"
-      }
-    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -513,11 +497,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718450675,
+        "lastModified": 1713612213,
-        "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=",
+        "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6",
+        "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1",
         "type": "github"
       },
       "original": {
@@ -529,39 +513,36 @@
     "hyprland": {
       "inputs": {
         "hyprcursor": "hyprcursor",
+        "hyprland-protocols": "hyprland-protocols",
         "hyprlang": "hyprlang",
-        "hyprutils": "hyprutils",
-        "hyprwayland-scanner": "hyprwayland-scanner",
         "nixpkgs": "nixpkgs_4",
         "systems": "systems_4",
+        "wlroots": "wlroots",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1718835324,
+        "lastModified": 1713283263,
-        "narHash": "sha256-U5eKTPAXppfSIqKqMIgbyuTBy1gr2seSOUl8sUSR8FE=",
+        "narHash": "sha256-Urb/njWiHYUudXpmK8EKl9Z58esTIG0PxXw5LuM2r5g=",
-        "ref": "refs/heads/main",
+        "owner": "hyprwm",
-        "rev": "fabc30df52ab5d2c369fc8acd4ff909a6ba3b8ac",
+        "repo": "Hyprland",
-        "revCount": 4870,
+        "rev": "fe7b748eb668136dd0558b7c8279bfcd7ab4d759",
-        "submodules": true,
+        "type": "github"
-        "type": "git",
-        "url": "https://github.com/hyprwm/Hyprland"
       },
       "original": {
-        "submodules": true,
+        "owner": "hyprwm",
-        "type": "git",
+        "ref": "v0.39.1",
-        "url": "https://github.com/hyprwm/Hyprland"
+        "repo": "Hyprland",
+        "type": "github"
       }
     },
     "hyprland-protocols": {
       "inputs": {
         "nixpkgs": [
           "hyprland",
-          "xdph",
           "nixpkgs"
         ],
         "systems": [
           "hyprland",
-          "xdph",
           "systems"
         ]
       },
@@ -581,10 +562,6 @@
     },
     "hyprlang": {
       "inputs": {
-        "hyprutils": [
-          "hyprland",
-          "hyprutils"
-        ],
         "nixpkgs": [
           "hyprland",
           "nixpkgs"
@@ -595,11 +572,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717881852,
+        "lastModified": 1713121246,
-        "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=",
+        "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "ec6938c66253429192274d612912649a0cfe4d28",
+        "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
         "type": "github"
       },
       "original": {
@@ -608,56 +585,6 @@
         "type": "github"
       }
     },
-    "hyprutils": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1718804078,
-        "narHash": "sha256-CqRZne63BpYlPd/i8lXV0UInUt59oKogiwdVtBRHt60=",
-        "owner": "hyprwm",
-        "repo": "hyprutils",
-        "rev": "4f1351295c55a8f51219b25aa4a6497a067989d0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprutils",
-        "type": "github"
-      }
-    },
-    "hyprwayland-scanner": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1718119275,
-        "narHash": "sha256-nqDYXATNkyGXVmNMkT19fT4sjtSPBDS1LLOxa3Fueo4=",
-        "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
-        "rev": "1419520d5f7f38d35e05504da5c1b38212a38525",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
-        "type": "github"
-      }
-    },
     "impermanence": {
       "locked": {
         "lastModified": 1708968331,
@@ -961,11 +888,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1718530797,
+        "lastModified": 1715087517,
-        "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=",
+        "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b60ebf54c15553b393d144357375ea956f89e9a9",
+        "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
         "type": "github"
       },
       "original": {
@@ -1180,7 +1107,6 @@
         "agenix": "agenix",
         "arkenfox-userjs": "arkenfox-userjs",
         "asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver",
-        "cmp-vimtex": "cmp-vimtex",
         "devshell": "devshell",
         "disko": "disko",
         "flake-parts": "flake-parts",
@@ -1401,9 +1327,29 @@
         "type": "github"
       }
     },
+    "wlroots": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1713124002,
+        "narHash": "sha256-vPeZCY+sdiGsz4fl3AVVujfyZyQBz6+vZdkUE4hQ+HI=",
+        "owner": "hyprwm",
+        "repo": "wlroots-hyprland",
+        "rev": "611a4f24cd2384378f6e500253983107c6656c64",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "wlroots-hyprland",
+        "rev": "611a4f24cd2384378f6e500253983107c6656c64",
+        "type": "github"
+      }
+    },
     "xdph": {
       "inputs": {
-        "hyprland-protocols": "hyprland-protocols",
+        "hyprland-protocols": [
+          "hyprland",
+          "hyprland-protocols"
+        ],
         "hyprlang": [
           "hyprland",
           "hyprlang"
@@ -1418,11 +1364,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718619174,
+        "lastModified": 1714662532,
-        "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=",
+        "narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623",
+        "rev": "1f228ba2f1f254195c0b571302b37482861abee3",
         "type": "github"
       },
       "original": {

flake.nix

@@ -45,8 +45,6 @@
     hawtkeys-nvim.url = "github:tris203/hawtkeys.nvim";
     none-ls-shellcheck-nvim.flake = false;
     none-ls-shellcheck-nvim.url = "github:gbprod/none-ls-shellcheck.nvim";
-    cmp-vimtex.flake = false;
-    cmp-vimtex.url = "github:micangl/cmp-vimtex";
 
     # river
     river.url = "git+https://github.com/riverwm/river?submodules=1";
@@ -54,11 +52,7 @@
 
     # Hyprland
     hypr-contrib.url = "github:hyprwm/contrib";
-    hyprland = {
+    hyprland.url = "github:hyprwm/Hyprland/v0.39.1";
-      type = "git";
-      url = "https://github.com/hyprwm/Hyprland";
-      submodules = true;
-    };
 
     # Laptop
     asus-touchpad-numpad-driver.url = "github:MoritzBoehme/asus-touchpad-numpad-driver/german-layout";

modules/programs/hyprland/_config.nix

@@ -50,9 +50,9 @@ in
       layout = dwindle
   }
 
-  # cursor {
+  cursor {
-  #     inactive_timeout = 1
+      inactive_timeout = 1
-  # }
+  }
 
   decoration {
       # See https://wiki.hyprland.org/Configuring/Variables/ for more

modules/programs/nvim/default.nix

@@ -16,11 +16,6 @@ in
         source = ./plugins/snippets;
       };
 
-      home.packages = with pkgs; [
-        xdotool
-      ];
-
-
       programs.neovim = {
         enable = true;
         package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;

modules/programs/nvim/plugins/coding.nix

@@ -36,17 +36,10 @@ in
         { plugin = pkgs.vimPlugins.cmp-async-path; }
         { plugin = pkgs.vimPlugins.cmp-buffer; }
         { plugin = pkgs.vimPlugins.cmp-cmdline; }
-        { plugin = pkgs.vimPlugins.cmp-nvim-lsp-signature-help; }
         { plugin = pkgs.vimPlugins.cmp-nvim-lsp; }
-        { plugin = pkgs.vimPlugins.cmp-spell; }
-        {
-          plugin = pkgs.vimUtils.buildVimPlugin {
-            pname = "cmp-vimtex";
-            version = lib.my.mkVersionInput inputs.cmp-vimtex;
-            src = inputs.cmp-vimtex;
-          };
-        }
         { plugin = pkgs.vimPlugins.cmp_luasnip; }
+        { plugin = pkgs.vimPlugins.cmp-spell; }
+        { plugin = pkgs.vimPlugins.cmp-nvim-lsp-signature-help; }
         {
           plugin = pkgs.vimPlugins.copilot-cmp;
           opts = { };
@@ -217,18 +210,6 @@ in
       cmd = [ "ConformInfo" "Format" ];
       conf = readFile ./lua/conform.lua;
     }
-    { plugin = pkgs.vimPlugins.plantuml-syntax; }
+    { plugin = plantuml-syntax; }
-    {
-      plugin = pkgs.vimPlugins.vimtex;
-      lazy = false;
-      conf = /* lua */ ''
-        vim.g.vimtex_view_method = "zathura"
-        vim.g.vimtex_mappings_disable = vim.fn.executable("texlab") == 1 and { ["n"] = { "K" } } or {} -- disable `K` as it conflicts with LSP hover
-        vim.g.vimtex_quickfix_method = vim.fn.executable("pplatex") == 1 and "pplatex" or "latexlog"
-      '';
-      keys = [
-        { key = "<localleader>l"; cmd = ""; desc = "+vimtex"; }
-      ];
-    }
   ];
 }

modules/programs/nvim/plugins/lua/conform.lua

@@ -2,7 +2,6 @@ local conform = require("conform")
 
 local formatters_by_ft = {
   ["*"] = { "codespell", "trim_whitespace" },
-  gleam = { "gleam" },
   go = { "gofmt" },
   json = { "jq" },
   lua = { "stylua" },
@@ -10,9 +9,9 @@ local formatters_by_ft = {
   python = { { "ruff_fix", "isort" }, { "ruff_format", "black" } },
   rust = { "rustfmt" },
   sh = { "shfmt" },
-  tex = { "latexindent" },
   toml = { "taplo" },
   yaml = { "yamlfix" },
+  gleam = { "gleam" },
 }
 
 conform.setup({

modules/programs/nvim/plugins/lua/nvim-cmp.lua

@@ -69,7 +69,6 @@ cmp.setup({
     { priority = 3, name = "copilot" },
     { priority = 3, name = "nvim_lsp_signature_help" },
     { priority = 4, name = "luasnip" },
-    { priority = 4, name = "vimtex" },
   }),
 })
 

modules/programs/nvim/plugins/treesitter.nix

@@ -1,7 +1,8 @@
 { pkgs, ... }:
 
+with builtins;
 {
-  config.home-manager.users.moritz.programs.neovim.lazy.plugins = [
+  config.home-manager.users.moritz.programs.neovim.lazy.plugins = with pkgs.vimPlugins; [
     (
       let
         parserDir = pkgs.symlinkJoin {
@@ -10,14 +11,13 @@
         };
       in
       {
-        plugin = pkgs.vimPlugins.nvim-treesitter;
+        plugin = nvim-treesitter;
         event = [ "BufReadPost" "BufNewFile" ];
         opts = {
           sync_install = false;
           auto_install = false;
           highlight = {
             enable = true;
-            disable = [ "latex" ];
           };
           textobjects =
             {
@@ -60,8 +60,8 @@
         '';
         priority = 100;
         dependencies = [
-          { plugin = pkgs.vimPlugins.nvim-treesitter-textobjects; }
+          { plugin = nvim-treesitter-textobjects; }
-          { plugin = pkgs.vimPlugins.nvim-ts-context-commentstring; opts = { }; }
+          { plugin = nvim-ts-context-commentstring; opts = { }; }
         ];
       }
     )