From 6ee0af88cdadb2f9ce46917f381a2446f861e663 Mon Sep 17 00:00:00 2001 From: Love Billenius Date: Wed, 15 Apr 2026 11:18:22 +0200 Subject: [PATCH] lsps and stuff --- flake.lock | 6 ++--- modules/hosts/kronos/configuration.nix | 12 ++++++++++ modules/nixos/packages/c.nix | 2 ++ modules/nixos/packages/default.nix | 5 ++++ modules/nixos/packages/java.nix | 9 ++++++++ modules/nixos/packages/lua.nix | 7 ++++++ modules/nixos/packages/nix.nix | 5 +++- modules/nixos/packages/node.nix | 7 +++++- modules/nixos/packages/python.nix | 32 +++++++++++++++++++++++++- modules/nixos/packages/rust.nix | 6 ++++- modules/nixos/packages/shell.nix | 7 ++++++ modules/nixos/packages/tex.nix | 7 ++++++ modules/nixos/packages/typst.nix | 7 ++++++ 13 files changed, 105 insertions(+), 7 deletions(-) create mode 100644 modules/nixos/packages/java.nix create mode 100644 modules/nixos/packages/lua.nix create mode 100644 modules/nixos/packages/shell.nix create mode 100644 modules/nixos/packages/tex.nix create mode 100644 modules/nixos/packages/typst.nix diff --git a/flake.lock b/flake.lock index afb71d9..64ad06f 100644 --- a/flake.lock +++ b/flake.lock @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1776136611, - "narHash": "sha256-b2pu3Pb28W0bJzQVP3OJHZC5+dgOOeqjlli2WVakKEU=", + "lastModified": 1776184304, + "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "8a423e444b17dde406097328604a64fc7429e34e", + "rev": "3c7524c68348ef79ce48308e0978611a050089b2", "type": "github" }, "original": { diff --git a/modules/hosts/kronos/configuration.nix b/modules/hosts/kronos/configuration.nix index bbcb3d0..40d1220 100644 --- a/modules/hosts/kronos/configuration.nix +++ b/modules/hosts/kronos/configuration.nix @@ -27,10 +27,15 @@ in ./hardware.nix ./disko.nix nixosModules.packages.c + nixosModules.packages.java + nixosModules.packages.lua nixosModules.packages.nix nixosModules.packages.node nixosModules.packages.rust + nixosModules.packages.shell nixosModules.packages.tpm + nixosModules.packages.tex + nixosModules.packages.typst nixosModules.packages.uefi nixosModules.base nixosModules.zfsRoot @@ -98,5 +103,12 @@ in package = pkgs.mariadb; }; + services.pcscd.enable = true; + programs.gnupg.agent = { + enable = true; + pinentryPackage = pkgs.pinentry-curses; + enableSSHSupport = true; + }; + system.stateVersion = "25.11"; } diff --git a/modules/nixos/packages/c.nix b/modules/nixos/packages/c.nix index 6b6671b..0a360f4 100644 --- a/modules/nixos/packages/c.nix +++ b/modules/nixos/packages/c.nix @@ -3,10 +3,12 @@ environment.systemPackages = with pkgs; [ binutils clang + clang-tools cmake gcc gdb gnumake + lldb ninja pkg-config ]; diff --git a/modules/nixos/packages/default.nix b/modules/nixos/packages/default.nix index 054585d..085aceb 100644 --- a/modules/nixos/packages/default.nix +++ b/modules/nixos/packages/default.nix @@ -2,10 +2,15 @@ c = import ./c.nix; common = import ./common.nix; desktop = import ./desktop.nix; + java = import ./java.nix; + lua = import ./lua.nix; nix = import ./nix.nix; node = import ./node.nix; python = import ./python.nix; rust = import ./rust.nix; + shell = import ./shell.nix; tpm = import ./tpm.nix; + tex = import ./tex.nix; + typst = import ./typst.nix; uefi = import ./uefi.nix; } diff --git a/modules/nixos/packages/java.nix b/modules/nixos/packages/java.nix new file mode 100644 index 0000000..ca5d59d --- /dev/null +++ b/modules/nixos/packages/java.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: +{ + environment.systemPackages = with pkgs; [ + google-java-format + jdt-language-server + kotlin-language-server + ktlint + ]; +} diff --git a/modules/nixos/packages/lua.nix b/modules/nixos/packages/lua.nix new file mode 100644 index 0000000..8a5330e --- /dev/null +++ b/modules/nixos/packages/lua.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + environment.systemPackages = with pkgs; [ + lua-language-server + stylua + ]; +} diff --git a/modules/nixos/packages/nix.nix b/modules/nixos/packages/nix.nix index b6e8fdd..e88d382 100644 --- a/modules/nixos/packages/nix.nix +++ b/modules/nixos/packages/nix.nix @@ -1,4 +1,7 @@ { pkgs, ... }: { - environment.systemPackages = with pkgs; [ nil ]; + environment.systemPackages = with pkgs; [ + nil + nixfmt + ]; } diff --git a/modules/nixos/packages/node.nix b/modules/nixos/packages/node.nix index 662c7b9..f758eb2 100644 --- a/modules/nixos/packages/node.nix +++ b/modules/nixos/packages/node.nix @@ -1,4 +1,9 @@ { pkgs, ... }: { - environment.systemPackages = with pkgs; [ nodejs ]; + environment.systemPackages = with pkgs; [ + nodejs + prettier + typescript + typescript-language-server + ]; } diff --git a/modules/nixos/packages/python.nix b/modules/nixos/packages/python.nix index d341e55..bdda6af 100644 --- a/modules/nixos/packages/python.nix +++ b/modules/nixos/packages/python.nix @@ -1,4 +1,34 @@ { pkgs, ... }: { - environment.systemPackages = with pkgs; [ python3 ]; + environment.systemPackages = with pkgs; [ + pyright + ruff + uv + + (python3.withPackages ( + python-pkgs: with python-pkgs; [ + numpy + pandas + requests + beautifulsoup4 + + ipython + + rich + tqdm + pydantic + pyyaml + httpx + + pytest + + types-requests + types-beautifulsoup4 + types-pyyaml + pandas-stubs + ] + )) + + python3Packages.debugpy + ]; } diff --git a/modules/nixos/packages/rust.nix b/modules/nixos/packages/rust.nix index 9f74b6b..dcdd4e5 100644 --- a/modules/nixos/packages/rust.nix +++ b/modules/nixos/packages/rust.nix @@ -1,4 +1,8 @@ { pkgs, ... }: { - environment.systemPackages = with pkgs; [ rustup ]; + environment.systemPackages = with pkgs; [ + rust-analyzer + rustfmt + rustup + ]; } diff --git a/modules/nixos/packages/shell.nix b/modules/nixos/packages/shell.nix new file mode 100644 index 0000000..52656b4 --- /dev/null +++ b/modules/nixos/packages/shell.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + environment.systemPackages = with pkgs; [ + bash-language-server + shfmt + ]; +} diff --git a/modules/nixos/packages/tex.nix b/modules/nixos/packages/tex.nix new file mode 100644 index 0000000..9143ab4 --- /dev/null +++ b/modules/nixos/packages/tex.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + environment.systemPackages = with pkgs; [ + texlab + texlivePackages.latexindent + ]; +} diff --git a/modules/nixos/packages/typst.nix b/modules/nixos/packages/typst.nix new file mode 100644 index 0000000..1e674d9 --- /dev/null +++ b/modules/nixos/packages/typst.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + environment.systemPackages = with pkgs; [ + tinymist + typstyle + ]; +}