nixos

commit 9c482ecc8391250204c097fa1ce72197c9d0fa98
parent ea3dba7cfaf70848760f3a0286d11559e5a317b3
Author: Toni Brown <me@tb148.net>
Date:   Tue, 13 Jan 2026 09:15:29 +0800

Update flake inputs and home packages

- Update catppuccin/nix, home-manager, nixpkgs, nixpkgs-stable,
  and nixpkgs-staging
- Replace jetbrains.idea-ultimate with jetbrains.idea
- Add obs-studio, qalculate-qt, vlc, and vokoscreen-ng
- Remove slang-server derivation and disable it in Zed config

Diffstat:
M
flake.lock
 | 
30
+++++++++++++++---------------
M
home.nix
 | 
8
++++++--
D
slang-server.nix
 | 
52
----------------------------------------------------
M
zed-editor.nix
 | 
3
+--

4 files changed, 22 insertions(+), 71 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765990358,
-        "narHash": "sha256-l8x0gU8mnYaGMl+gWrsSHKBJlZWD8KXJfHTkRlFiPI0=",
+        "lastModified": 1767967164,
+        "narHash": "sha256-Cx4VETh9dGoQYDtWhre7g66d7SAr+h1h6f+SSHxVrck=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "de1b60ca45a578f59f7d84c8d338b346017b2161",
+        "rev": "e973584280e3b0e1d5b5a1a5e9948dc222c54af7",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766171975,
-        "narHash": "sha256-47Ee0bTidhF/3/sHuYnWRuxcCrrm0mBNDxBkOTd3wWQ=",
+        "lastModified": 1768248913,
+        "narHash": "sha256-Kr45H5StnR9hgEhpKD8/BDZLvEpLVJb51lvIDQ9EC7U=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bb35f07cc95a73aacbaf1f7f46bb8a3f40f265b5",
+        "rev": "360620ec9d5ffc186b5b1fca4c5f5b2e1634a5cf",
         "type": "github"
       },
       "original": {
@@ -42,10 +42,10 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1766070988,
-        "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
+        "lastModified": 1768127708,
+        "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=",
         "ref": "nixos-unstable",
-        "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
+        "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38",
         "shallow": true,
         "type": "git",
         "url": "https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git"
@@ -59,10 +59,10 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1765838191,
-        "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=",
+        "lastModified": 1768028080,
+        "narHash": "sha256-50aDK+8eLvsLK39TzQhKNq50/HcXyP4hyxOYoPoVxjo=",
         "ref": "nixos-25.11",
-        "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6",
+        "rev": "d03088749a110d52a4739348f39a63f84bb0be14",
         "shallow": true,
         "type": "git",
         "url": "https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git"
@@ -76,10 +76,10 @@
     },
     "nixpkgs-staging": {
       "locked": {
-        "lastModified": 1766226744,
-        "narHash": "sha256-/sRuSPvYGHrPu1d55YUHRpn+GRtK7i9vIebV84Le1UQ=",
+        "lastModified": 1768259000,
+        "narHash": "sha256-K/dsw/r5QBzejvWxV+nS9x6m1Cv/IdNoQM7zPOT/z2E=",
         "ref": "staging",
-        "rev": "131ec92bb06e9b4a2e0b528e2cba75e25687a62b",
+        "rev": "4f3be6e36fddf57b39000ab1cbaddcfcf7795e3b",
         "shallow": true,
         "type": "git",
         "url": "https://mirrors.tuna.tsinghua.edu.cn/git/nixpkgs.git"
diff --git a/home.nix b/home.nix
@@ -50,11 +50,10 @@
         ffmpeg
         fish
         gtkwave
-        jetbrains.idea-ultimate
-        nerd-fonts.iosevka
         iosevka-bin
         iverilog
         jdk21
+        jetbrains.idea
         jupyter
         krita
         libreoffice-qt-fresh
@@ -62,18 +61,23 @@
         logisim-evolution
         mars-mips
         neocities
+        nerd-fonts.iosevka
         nodejs
+        obs-studio
         osu-lazer-bin
         pnpm
         ponysay
         proton-pass
         protonmail-bridge
+        qalculate-qt
         sageWithDoc
         sarasa-gothic
         sequoia-sq
         thunderbird
         unrar
         virtualenv
+        vlc
+        vokoscreen-ng
     ];
 
     programs.bat.enable = true;
diff --git a/slang-server.nix b/slang-server.nix
@@ -1,52 +0,0 @@
-{
-    lib,
-    stdenv,
-    fetchFromGitHub,
-    boost,
-    catch2_3,
-    cmake,
-    ninja,
-    fmt_12,
-    mimalloc,
-    python3,
-}:
-stdenv.mkDerivation (finalAttrs: {
-    pname = "slang-server";
-    version = "0.2.0";
-
-    src = fetchFromGitHub {
-        owner = "hudson-trading";
-        repo = "slang-server";
-        tag = "v0.2.0";
-        hash = "sha256-FZHV/ezCrhXLwUHGGVTTUSynyw9SA0Roo5KyIpaN7KI=";
-        fetchSubmodules = true;
-    };
-
-    postPatch = ''
-        substituteInPlace external/slang/external/CMakeLists.txt --replace-fail \
-          'set(mimalloc_min_version "2.2")' \
-          'set(mimalloc_min_version "${lib.versions.majorMinor mimalloc.version}")'
-    '';
-
-    cmakeFlags = [
-        "-DCMAKE_INSTALL_INCLUDEDIR=include"
-        "-DCMAKE_INSTALL_LIBDIR=lib"
-    ];
-
-    nativeBuildInputs = [
-        cmake
-        ninja
-        python3
-    ];
-
-    strictDeps = true;
-
-    buildInputs = [
-        boost
-        catch2_3
-        fmt_12
-        mimalloc
-    ];
-
-    doCheck = true;
-})
diff --git a/zed-editor.nix b/zed-editor.nix
@@ -26,7 +26,6 @@
             package-version-server
             prettier
             ruff
-            (callPackage ./slang-server.nix {})
             svelte-language-server
             tailwindcss-language-server
             taplo
@@ -75,9 +74,9 @@
                         };
                     };
                     language_servers = [
-                        "slang"
                         "veridian"
                         "verible"
+                        "!slang"
                     ];
                 };
             };