nix

commit 3db9bd7379eda028a69139744bdb8b9e9346ecef
parent 598d6b7f290ba6bd9dd649ee3d9b73142a59082f
Author: mtmn <miro@haravara.org>
Date:   Sat,  9 May 2026 13:08:44 +0200

chore: add ghcup, flakes

Diffstat:
M
flake.lock
 | 
12
++++++------
M
hosts/void/default.nix
 | 
19
+++----------------
M
hosts/void/overlays/config/shell/rc/void
 | 
0

M
modules/mixins/dotfiles/config/nvim/fnl/config/lsp.fnl
 | 
1
+
A
modules/mixins/dotfiles/config/shell/profile/ghcup
 | 
3
+++

5 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -32,11 +32,11 @@
       },
       "locked": {
         "dir": "bandeno",
-        "lastModified": 1778233897,
-        "narHash": "sha256-tpc/0PII/oIhhJ5FQc9vGIc0jpRItNSx5P2cJ410l1I=",
+        "lastModified": 1778332863,
+        "narHash": "sha256-QHiMM7U4A9naT5WcomDBW0KEgseGHwzAsgpejxD/vms=",
         "owner": "~mtmn",
         "repo": "tools",
-        "rev": "880fdd2211ff296e5fa9c9ea91f0ac7d63b3c794",
+        "rev": "0f476415a9fc9b6e7a9538c88005c1baae89b82b",
         "type": "sourcehut"
       },
       "original": {
@@ -332,11 +332,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1778124196,
-        "narHash": "sha256-pYEytCNic/czazbV9r3tbQ6BZzqRBg/41x2dIC5ymOo=",
+        "lastModified": 1778274207,
+        "narHash": "sha256-I4puXmX1iovcCHZlRmztO3vW0mAbbRvq4F8wgIMQ1MM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "68a8af93ff4297686cb68880845e61e5e2e41d92",
+        "rev": "b3da656039dc7a6240f27b2ef8cc6a3ef3bccae7",
         "type": "github"
       },
       "original": {
diff --git a/hosts/void/default.nix b/hosts/void/default.nix
@@ -29,12 +29,14 @@
       gron
       datasette
       tokyocabinet
+      jotdown
       dhall
       pandoc
       codespelunker
       opensearch-cli
       graphviz
       lowdown
+      harper
     ];
 
     vcs = [
@@ -95,18 +97,12 @@
       clang-tools
       parallel
       pbpctrl
-      jotdown
       podman
       tenv
       cosign
       treefmt
     ];
 
-    lsp = [
-      zls_0_15
-      just-lsp
-    ];
-
     nix = [
       comma
       nh
@@ -140,16 +136,6 @@
       ])
     ];
 
-    supercollider = lib.concatLists [
-      [supercollider]
-      (with supercolliderPlugins; [sc3-plugins])
-    ];
-
-    haskell = lib.concatLists [
-      (with haskell; [compiler.ghc914])
-      (with haskellPackages; [cabal-install hlint fourmolu])
-    ];
-
     beam = lib.concatLists [
       (with beamMinimal28Packages; [rebar3 erlang erlang-language-platform])
       [gleam]
@@ -180,6 +166,7 @@
     other = [
       babashka
       nickel
+      zls
     ];
   }));
 }
diff --git a/hosts/void/overlays/config/shell/rc/void b/hosts/void/overlays/config/shell/rc/void
Binary files differ.
diff --git a/modules/mixins/dotfiles/config/nvim/fnl/config/lsp.fnl b/modules/mixins/dotfiles/config/nvim/fnl/config/lsp.fnl
@@ -48,6 +48,7 @@
                  :ts_ls {}
                  :elmls {}
                  :zls {}
+                 :hls {}
                  :purescriptls {}}]
     (vim.lsp.config :purescriptls
                     {:cmd [:npx :purescript-language-server :--stdio]})
diff --git a/modules/mixins/dotfiles/config/shell/profile/ghcup b/modules/mixins/dotfiles/config/shell/profile/ghcup
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+[ -f "$HOME/.ghcup/env" ] && . "$HOME/.ghcup/env"