diff --git a/flake.lock b/flake.lock index 0ebfc80..66b2de1 100644 --- a/flake.lock +++ b/flake.lock @@ -202,7 +202,7 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixvim", "nixpkgs" @@ -261,11 +261,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1716368878, - "narHash": "sha256-lo7AHe+F4+VJshf4AZWtXpnHUvJsrMJxnqCfeIBn/54=", + "lastModified": 1716397752, + "narHash": "sha256-T9AOVfpb9A3PCXIvi/0rTelhZvcMu+Duz+1BT4ziQds=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "35e5b442c1602ed30b588addb66d3289f33dfb76", + "rev": "7481fce8f1bec8f8478c06142f75a6f4703dbba5", "type": "github" }, "original": { @@ -296,22 +296,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "locked": { "lastModified": 1688025799, "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", @@ -326,7 +310,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -340,6 +324,22 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-compat_4": { "flake": false, "locked": { @@ -357,22 +357,6 @@ } }, "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { "flake": false, "locked": { "lastModified": 1673956053, @@ -388,7 +372,7 @@ "type": "github" } }, - "flake-compat_7": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1696426674, @@ -426,48 +410,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1714641030, - "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "neovim-nightly-overlay", - "hercules-ci-effects", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, - "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nixpak", @@ -488,7 +430,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixpkgs-wayland", @@ -510,7 +452,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -531,7 +473,7 @@ "type": "github" } }, - "flake-parts_7": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "schizofox", @@ -552,7 +494,7 @@ "type": "github" } }, - "flake-parts_8": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -625,24 +567,6 @@ "inputs": { "systems": "systems_5" }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_6" - }, "locked": { "lastModified": 1701680307, "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", @@ -657,9 +581,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1685518550, @@ -731,28 +655,6 @@ } }, "hercules-ci-effects": { - "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713898448, - "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, - "hercules-ci-effects_2": { "inputs": { "flake-parts": [ "nixpak", @@ -920,11 +822,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1716365376, - "narHash": "sha256-941FKboG8Wc/hb1wvrEEKnC4DwDlSLgrjRL+whgWwUU=", + "lastModified": 1716410236, + "narHash": "sha256-lyxJeurqTLdsXVm8o9mc25gSD0L3m72cL20fnxJ7SO4=", "ref": "refs/heads/main", - "rev": "93fea890433ec11d7a915f5e0466b2e8b513e895", - "revCount": 4724, + "rev": "3775776a07dc54347dd0859c7b6fc63aa3a4c7fd", + "revCount": 4726, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1039,7 +941,7 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs-lib": "nixpkgs-lib" }, "locked": { @@ -1056,52 +958,6 @@ "type": "github" } }, - "neovim-flake": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "dir": "contrib", - "lastModified": 1715815279, - "narHash": "sha256-Pf7ZlqPnr195NZb5ADzMVsXurPMjRZ+JMXf6JxvXArE=", - "owner": "neovim", - "repo": "neovim", - "rev": "9ca81b025990911c2a0dbda92af39ba84983bac3", - "type": "github" - }, - "original": { - "dir": "contrib", - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, - "neovim-nightly-overlay": { - "inputs": { - "flake-compat": "flake-compat", - "flake-parts": "flake-parts_2", - "hercules-ci-effects": "hercules-ci-effects", - "neovim-flake": "neovim-flake", - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1715817852, - "narHash": "sha256-UH5o7hT72oAavJTG2NxlpMyQe3BQMniQAsgTugWtlc4=", - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "rev": "7b5ca2486bba58cac80b9229209239740b67cf90", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -1125,9 +981,9 @@ }, "nix-eval-jobs": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_3", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -1183,8 +1039,8 @@ }, "nixpak": { "inputs": { - "flake-parts": "flake-parts_4", - "hercules-ci-effects": "hercules-ci-effects_2", + "flake-parts": "flake-parts_2", + "hercules-ci-effects": "hercules-ci-effects", "nixpkgs": [ "nixpkgs" ] @@ -1270,17 +1126,17 @@ }, "nixpkgs-wayland": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1716366111, - "narHash": "sha256-1i1YJjeGBiIzBjZir1pQBwueHjRkpcPEsSrNbiyqMg4=", + "lastModified": 1716402128, + "narHash": "sha256-0GiKUz7JImcx+TG082iSep1Ap/sFJ36IPzSYVSQDBhA=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "088d7d9e7278f38cd9d01a4099e47fad5b1da66d", + "rev": "8b85dc01079bc537183cf9bcf4c17eb714121643", "type": "github" }, "original": { @@ -1289,22 +1145,6 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1716293225, @@ -1338,22 +1178,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1715774670, - "narHash": "sha256-iJYnKMtLi5u6hZhJm94cRNSDG5Rz6ZzIkGbhPFtDRm0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b3fcfcfabd01b947a1e4f36622bbffa3985bdac6", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1716293225, "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", @@ -1369,7 +1193,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1715037484, "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=", @@ -1385,7 +1209,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1716293225, "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", @@ -1401,7 +1225,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1686020360, "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=", @@ -1417,7 +1241,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1714912032, "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", @@ -1433,11 +1257,27 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1711163522, + "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_6", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_4", "flake-root": "flake-root", "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", @@ -1463,11 +1303,11 @@ }, "nur": { "locked": { - "lastModified": 1716375775, - "narHash": "sha256-2X4zwYV6Xudaqo3IhlwsMAQT+bZHs2nBD8Gv3ENHqTg=", + "lastModified": 1716410853, + "narHash": "sha256-a90YI98Ha+nKwOOvNxvo81ZNhdFTsnCvvROC8xxXQ+g=", "owner": "nix-community", "repo": "NUR", - "rev": "0ed3297ed7a3d5308db5a57ccd067beaf196e4a7", + "rev": "f52674dd1a7f8539bedd6a0d19ab32e62771619b", "type": "github" }, "original": { @@ -1478,7 +1318,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "gitignore": "gitignore", "nixpkgs": [ "nixvim", @@ -1514,9 +1354,8 @@ "home-manager": "home-manager_2", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", - "neovim-nightly-overlay": "neovim-nightly-overlay", "nixpak": "nixpak", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-wayland": "nixpkgs-wayland", "nixvim": "nixvim", "nur": "nur", @@ -1546,8 +1385,8 @@ }, "schizofox": { "inputs": { - "flake-compat": "flake-compat_5", - "flake-parts": "flake-parts_7", + "flake-compat": "flake-compat_4", + "flake-parts": "flake-parts_5", "home-manager": "home-manager_4", "nixpak": [ "nixpak" @@ -1556,7 +1395,7 @@ "nixpkgs" ], "searx-randomizer": "searx-randomizer", - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1714677453, @@ -1575,7 +1414,7 @@ "searx-randomizer": { "inputs": { "crane": "crane", - "flake-parts": "flake-parts_8", + "flake-parts": "flake-parts_6", "nixpkgs": [ "schizofox", "nixpkgs" @@ -1597,8 +1436,8 @@ }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_8" + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1704167711, @@ -1622,11 +1461,11 @@ "nix-filter": "nix-filter" }, "locked": { - "lastModified": 1716111286, - "narHash": "sha256-aMosSX4jv4ZYIO6HifjJarl4T3w8lLlPiLkePuqCUEU=", + "lastModified": 1716403535, + "narHash": "sha256-4iG/+feETnV/8W6HNXt33q6LBfjHkhvlDutZ2m4fyDk=", "owner": "Duckonaut", "repo": "split-monitor-workspaces", - "rev": "0d15779044df5ece4260d9a5be9e803e0ae8a2ea", + "rev": "5df9830acf7c710544c41e47172a6171f2859d15", "type": "github" }, "original": { @@ -1644,17 +1483,17 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_5", "gnome-shell": "gnome-shell", "home-manager": "home-manager_5", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1716206302, - "narHash": "sha256-5Qc3aQGVyPEOuN82zVamStaV81HebHvLjk3fGfpyCPY=", + "lastModified": 1716395969, + "narHash": "sha256-Qse5s/R8QKdI6yYnDv9pcDSrR8qVWzJ2m1QMjkuVxuU=", "owner": "danth", "repo": "stylix", - "rev": "81df8443556335016d6f0bc22630a95776a56d8b", + "rev": "e7543c51eff9e73c85450c473e1f24513a5e0a0f", "type": "github" }, "original": { @@ -1739,21 +1578,6 @@ } }, "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_7": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1768,7 +1592,7 @@ "type": "github" } }, - "systems_8": { + "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1828,8 +1652,8 @@ }, "waybar": { "inputs": { - "flake-compat": "flake-compat_7", - "nixpkgs": "nixpkgs_10" + "flake-compat": "flake-compat_6", + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1716362227, diff --git a/flake.nix b/flake.nix index 70083aa..7e163ee 100644 --- a/flake.nix +++ b/flake.nix @@ -9,23 +9,28 @@ nixosConfigurations = import ./hosts {inherit inputs;}; }; inputs = { + # Unstable nixpkgs baby! nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - hyprland.url = - # "git+https://github.com/hyprwm/Hyprland?ref=refs/tags/v0.40.0&submodules=1"; - "git+https://github.com/hyprwm/Hyprland?submodules=1"; + # Hyprland, my main compositor + hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + # Plugins for hyprland hyprland-plugins = { url = "github:hyprwm/hyprland-plugins"; inputs.hyprland.follows = "hyprland"; }; - nixpak = { - url = "github:nixpak/nixpak"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; + # Plugin to get split monitor workspaces split-monitor-workspaces = { url = "github:Duckonaut/split-monitor-workspaces"; inputs.hyprland.follows = "hyprland"; }; + # Sandboxing + nixpak = { + url = "github:nixpak/nixpak"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # Wayland packages + nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; + doomemacs = { url = "github:doomemacs/doomemacs"; flake = false; @@ -60,8 +65,6 @@ }; agenix.url = "github:ryantm/agenix"; - neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; - waybar.url = "github:Alexays/Waybar"; fenix = { url = "github:nix-community/fenix"; diff --git a/modules/editors/nixvim/plug/lsp/lsp.nix b/modules/editors/nixvim/plug/lsp/lsp.nix index bb7a8be..3ad668e 100644 --- a/modules/editors/nixvim/plug/lsp/lsp.nix +++ b/modules/editors/nixvim/plug/lsp/lsp.nix @@ -14,9 +14,9 @@ gopls = {enable = true;}; terraformls = {enable = true;}; tsserver = {enable = false;}; - yamlls = { - enable = true; - }; + yamlls.enable = true; + typst-lsp.enable = true; + texlab.enable = true; }; keymaps = { silent = true;