From c3e0d0fe67166a9fc3f3edbc01414c805ff5ce35 Mon Sep 17 00:00:00 2001 From: Cow Date: Sat, 25 Jul 2026 09:13:04 -0700 Subject: [PATCH] flake: update, neovim: use nixd --- flake.lock | 86 +++++++++++++++++++-------------------- modules/neovim.nix | 12 +++++- profiles/base-desktop.nix | 5 +-- 3 files changed, 55 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index b5ccb52..9bdeff4 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1784513880, - "narHash": "sha256-IG6L8wx+1Uq7ZbB3WhETwIV+jVks+Z3y6zMXT2h7Nk8=", + "lastModified": 1784946059, + "narHash": "sha256-I4YxAGQ0VtGjVc/q8MJAG2AcJWsiQ2chKMIwersuy6M=", "ref": "refs/heads/main", - "rev": "5763e4272ca5ede09fa5b866bc4a1135fc49f676", - "revCount": 69, + "rev": "f638ef739f9e2a2115d52fd558ada82dd81457b7", + "revCount": 71, "type": "git", "url": "ssh://git@git.cow.computer/cow/nixos-private" }, @@ -876,11 +876,11 @@ ] }, "locked": { - "lastModified": 1784317287, - "narHash": "sha256-XaUkSwrOGj94laWQx/6PfN90OEeOOjXgqheFgBQ4b1s=", + "lastModified": 1784941389, + "narHash": "sha256-0JkfLCA2fx8ixxe1iOJWnFIDJCZ98llih5MOP9RJrHI=", "owner": "cowingtonpost1", "repo": "helium-nix", - "rev": "6a30ede9a34d87a38f8f635976a9211fcb57f175", + "rev": "03989026f84d38ad63434643c30c4b848957c8e1", "type": "github" }, "original": { @@ -909,11 +909,11 @@ ] }, "locked": { - "lastModified": 1784588016, - "narHash": "sha256-ouZe80aWEhMLVMkqICFDN+JUw+0FJtCr/bh+hHtRtMg=", + "lastModified": 1784913159, + "narHash": "sha256-JWq0BfjO4ktpH5USfQNQzdvHpIDT8fSKD5K7LvdMRFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "deeb6b7eb7e0c44ae1819c051ce175bd92a85100", + "rev": "079a3b5d1aa6a719920a51316253b7d6dd22738d", "type": "github" }, "original": { @@ -929,11 +929,11 @@ ] }, "locked": { - "lastModified": 1784657752, - "narHash": "sha256-Gb06AVgM+R0UidlnYZczcWZYodsuNw5Kd27W65yoM0o=", + "lastModified": 1784851520, + "narHash": "sha256-eMVXzz9gliBU1q0y6MQIwKSP34174PE4KR8xpV/3kfs=", "owner": "StevenBlack", "repo": "hosts", - "rev": "509f7aa62a5acc7ff0c09a11f9b269e4b5988039", + "rev": "dc2660e079004db6c98765d7496d352990af086a", "type": "github" }, "original": { @@ -945,25 +945,25 @@ "htmx-src": { "flake": false, "locked": { - "narHash": "sha256-nm6avZuEBg67SSyyZUhjpXVNstHHgUxrtBHqJgowU08=", + "narHash": "sha256-2D8I0L0u6qb57QpeVn88RrT0xatDwQwG/lWOTjuEFPc=", "type": "file", - "url": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js" + "url": "https://cdn.jsdelivr.net/npm/htmx.org@2.0.10/dist/htmx.min.js" }, "original": { "type": "file", - "url": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js" + "url": "https://cdn.jsdelivr.net/npm/htmx.org@2.0.10/dist/htmx.min.js" } }, "htmx-ws-src": { "flake": false, "locked": { - "narHash": "sha256-2fg6KyEJoO24q0fQqbz9RMaYNPQrMwpZh29tkSqdqGY=", + "narHash": "sha256-woiluaeAoxH/CyDkpk6LYNWCzxH8PHgwgnrlBFGJxgk=", "type": "file", - "url": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.2" + "url": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.4" }, "original": { "type": "file", - "url": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.2" + "url": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.4" } }, "ibm-plex-mono-src": { @@ -1115,11 +1115,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1784636793, - "narHash": "sha256-7qgPwwlb0d5OnO4GWS6iOSc6zXwAq7I8IlYgi+uytdo=", - "rev": "eb7009316b012d48a82735e36bc9485a32558658", + "lastModified": 1784923365, + "narHash": "sha256-6Ynmy55XUPKHU7uMXduJSJEiGe5UkW+VTsJ3yYQKrZ8=", + "rev": "a78d68300b5436f57ac43aa49fb49195d14e199d", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/eb7009316b012d48a82735e36bc9485a32558658.tar.gz?rev=eb7009316b012d48a82735e36bc9485a32558658" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/a78d68300b5436f57ac43aa49fb49195d14e199d.tar.gz?rev=a78d68300b5436f57ac43aa49fb49195d14e199d" }, "original": { "type": "tarball", @@ -1357,11 +1357,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1784310968, - "narHash": "sha256-rkSPTePrKqs4dg+i7ZFCq93+HrClac6oSwXX927SVjA=", + "lastModified": 1784723954, + "narHash": "sha256-1CfD8ZUjCkTgjsneLZ/lxCHhgDfqxxE7/GX0MmsgiqA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "779c32a00155994c86cde8213a8dd4df139d4355", + "rev": "a017f5b72210026af5b3ac5949f08d94380a6fbd", "type": "github" }, "original": { @@ -1504,11 +1504,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1784497964, - "narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=", + "lastModified": 1784796856, + "narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163", + "rev": "e2587caef70cea85dd97d7daab492899902dbf5d", "type": "github" }, "original": { @@ -1591,11 +1591,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1784057377, - "narHash": "sha256-yycNej5//EsRbV10moBoh+/63vXEwZD1ZFEiRm6C9rQ=", + "lastModified": 1784814601, + "narHash": "sha256-T32JXjZ7kIbhBn8/Har171yGg6IBdl97cxAWameqZDE=", "owner": "nix-community", "repo": "nixvim", - "rev": "07180a087e4a00720dc0731cbcd8dec796974381", + "rev": "f316e949e0ed9df0e1e0bf645c6dce721d4e230e", "type": "github" }, "original": { @@ -1883,11 +1883,11 @@ "selfhosted-icons": { "flake": false, "locked": { - "lastModified": 1784459132, - "narHash": "sha256-fJA683XPAmivrfoVDIKkov18gSfJEeuqoSS0y6zGlIU=", + "lastModified": 1784884557, + "narHash": "sha256-jnCMyZG7iACvAjJfnOPJsIXapCqAdFFd2uX0F/M5nms=", "owner": "selfhst", "repo": "icons", - "rev": "47eb6b11d006d7708fad53f4893048c0d515117a", + "rev": "c675384d99c87bd52209babcf2d6f8ad23777386", "type": "github" }, "original": { @@ -2198,11 +2198,11 @@ "tailwindcss-animated-src": "tailwindcss-animated-src" }, "locked": { - "lastModified": 1784649639, - "narHash": "sha256-A9aUUoZkkEi5GV0CsgC8yjaxl+XdZoD4+ixB+tCXGxw=", + "lastModified": 1784940214, + "narHash": "sha256-pamKCbpPld1qbPuDW8k8csoUJgGJElLMuG9tj2x4/r8=", "ref": "refs/heads/master", - "rev": "ce9570e7dd90fc860be88c4c28aa8aa081a006f3", - "revCount": 2958, + "rev": "01117fddd3502c57bc20a65a75a66a4900d5d67d", + "revCount": 3006, "type": "git", "url": "https://tangled.org/@tangled.org/core" }, @@ -2282,11 +2282,11 @@ ] }, "locked": { - "lastModified": 1784247270, - "narHash": "sha256-Ne4ICx6dW/OVUN9VCITlIPkjbuGc6RKNjPdZtDHZOGs=", + "lastModified": 1784913087, + "narHash": "sha256-9EMLVUwtpRrO/phJWgm7RjqfCR1ZZhukxsC9CcxzmJU=", "ref": "refs/heads/main", - "rev": "9ccec274aab92d37fd48dcf6f2a7baa3a0ad4a55", - "revCount": 459, + "rev": "7244551ae136be55fcb93d2112220f4cafaf25ff", + "revCount": 471, "type": "git", "url": "https://tangled.org/tranquil.farm/tranquil-pds" }, diff --git a/modules/neovim.nix b/modules/neovim.nix index 30c726a..c33fe11 100644 --- a/modules/neovim.nix +++ b/modules/neovim.nix @@ -26,6 +26,7 @@ in options.l.neovim.lsp.lua = mkLSPEnableOption "Lua LSP"; options.l.neovim.lsp.nix = mkLSPEnableOption "Nix LSP"; options.l.neovim.lsp.clangd = mkLSPEnableOption "C/C++ LSP"; + options.l.neovim.lsp.teal = mkLSPEnableOption "Teal LSP"; options.l.neovim.lsp.rust = mkLSPEnableOption "Rust LSP"; options.l.neovim.lsp.python = mkLSPEnableOption "Python LSP/Formatter"; options.l.neovim.lsp.go = mkLSPEnableOption "Go LSP"; @@ -45,7 +46,8 @@ in ]) ++ (lib.lists.optionals (cfg.lsp.nix) [ pkgs.nixfmt - pkgs.nil + # pkgs.nil + pkgs.nixd ]) ++ (lib.lists.optionals (cfg.lsp.clangd) [ pkgs.clang-tools ]) ++ (lib.lists.optionals (cfg.lsp.rust) [ @@ -277,7 +279,8 @@ in servers = { tofu_ls.enable = cfg.lsp.tofu; - nil_ls.enable = cfg.lsp.nix; + # nil_ls.enable = cfg.lsp.nix; + nixd.enable = cfg.lsp.nix; gopls.enable = cfg.lsp.go; rust_analyzer = { enable = cfg.lsp.rust; @@ -287,6 +290,11 @@ in clangd.enable = cfg.lsp.clangd; gleam.enable = cfg.lsp.gleam; lua_ls.enable = cfg.lsp.lua; + teal_ls = { + enable = cfg.lsp.teal; + package = null; + packageFallback = false; + }; nushell.enable = cfg.lsp.nushell; elixirls = { enable = cfg.lsp.elixir; diff --git a/profiles/base-desktop.nix b/profiles/base-desktop.nix index a2806ce..edcafa4 100644 --- a/profiles/base-desktop.nix +++ b/profiles/base-desktop.nix @@ -9,6 +9,7 @@ { imports = [ ./cowca-certificate.nix + inputs.cow-nixos-private.nixosModules.base-desktop ]; nix.settings = { experimental-features = [ @@ -18,12 +19,10 @@ substituters = [ "https://cache.angus.internal" ]; trusted-public-keys = [ "cache.jersey.internal-1:vGcpPuacI3IFpzIRe8ujr83+VS+b+aHiohvpwdd6q+U=" ]; }; - networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + networking.networkmanager.enable = true; networking.nftables.enable = true; time.timeZone = "America/Los_Angeles"; - services.xserver.xkb.layout = "us"; - services.pipewire = { enable = true; pulse.enable = true; -- 2.51.2