From fe1f9416856eceac2853a68820e750e620386e2d Mon Sep 17 00:00:00 2001 From: Alexander Date: Thu, 30 Apr 2026 12:02:22 +0200 Subject: [PATCH] Nixos update 29-04-2026, fix hyprland, fix jdtls --- flake.lock | 158 +++++++++--------- .../fujin/main/certs/homelab-lan-chain.crt | 63 +++++++ machines/fujin/main/default.nix | 5 +- .../main/dotfiles/.config/doom/config.el | 46 ++++- .../fujin/main/dotfiles/.config/doom/init.el | 2 +- machines/fujin/main/home.nix | 2 +- modules/window-manager/hypr/default.nix | 1 - 7 files changed, 186 insertions(+), 91 deletions(-) create mode 100644 machines/fujin/main/certs/homelab-lan-chain.crt diff --git a/flake.lock b/flake.lock index 920db61..ee7b8a7 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1775558810, - "narHash": "sha256-fy95EdPnqQlpbP8+rk0yWKclWShCUS5VKs6P7/1MF2c=", + "lastModified": 1776876344, + "narHash": "sha256-Ubqb/agkuMJK+k19gjQgHux/eOYRc1sRGoOZOho8+VY=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "7371b669b22aa2af980f913fc312a786d2f1abb2", + "rev": "648a13d0ee1e03a843b3e145b8ece15393058701", "type": "github" }, "original": { @@ -107,11 +107,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1776339486, - "narHash": "sha256-6V6fHUYCwM8SajDQVp9/X3AwLZGltve32mVqbin3awA=", + "lastModified": 1777069669, + "narHash": "sha256-cEyV6jpC7pX/TNoHI+VDiTDjQc0rfYAkDLRJP2hZrzc=", "owner": "9001", "repo": "copyparty", - "rev": "a997455b5a3d937f53ad40f431534a0e3865e9f7", + "rev": "6e25d648a900f65a4546a1b17a9761c0f1e9e3cb", "type": "github" }, "original": { @@ -127,11 +127,11 @@ ] }, "locked": { - "lastModified": 1773889306, - "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=", + "lastModified": 1776613567, + "narHash": "sha256-gC9Cp5ibBmGD5awCA9z7xy6MW6iJufhazTYJOiGlCUI=", "owner": "nix-community", "repo": "disko", - "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347", + "rev": "32f4236bfc141ae930b5ba2fb604f561fed5219d", "type": "github" }, "original": { @@ -146,11 +146,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1776591781, - "narHash": "sha256-N3P2tFDyAjjCIZr6+7Yl6MN2oqRRsjgbzyQOIfNfFMs=", + "lastModified": 1777344615, + "narHash": "sha256-pg93DT6h9qGnchIAcJp6Tpt45sJ+8CZXmro2+Xhi/Gc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "0ab23f059a8a22b421a5298aca8b54ddb233935d", + "rev": "b1f0d6617ca484adaf0c3ea410f9681f1532b460", "type": "github" }, "original": { @@ -377,11 +377,11 @@ ] }, "locked": { - "lastModified": 1772461003, - "narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=", + "lastModified": 1776511930, + "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7", + "rev": "39435900785d0c560c6ae8777d29f28617d031ef", "type": "github" }, "original": { @@ -406,11 +406,11 @@ ] }, "locked": { - "lastModified": 1775496928, - "narHash": "sha256-Ds759WU03mGWtu3I43J+5GF5Ni8TvF+GYQUFD+fVeMo=", + "lastModified": 1776426399, + "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "cf95d93d17baa18f1d9b016b3afe27f820521a6e", + "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84", "type": "github" }, "original": { @@ -436,11 +436,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1776514109, - "narHash": "sha256-sGZir5sjqKOUv2fywOFXVolUnVJRtI1KvAqt42ql/mI=", + "lastModified": 1777330550, + "narHash": "sha256-jRRC7Ck+DzH98uWaD9i+ManOquec2qSRcBfyxWvenuA=", "ref": "refs/heads/main", - "rev": "889ee4f26d77ff0c36f5c4767ef0629371fd2c18", - "revCount": 7163, + "rev": "e1bda229bdf070f1eed01858f862ca975783df71", + "revCount": 7196, "type": "git", "url": "https://github.com/hyprwm/Hyprland" }, @@ -482,11 +482,11 @@ ] }, "locked": { - "lastModified": 1774710575, - "narHash": "sha256-p7Rcw13+gA4Z9EI3oGYe3neQ3FqyOOfZCleBTfhJ95Q=", + "lastModified": 1776426575, + "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "0703df899520001209646246bef63358c9881e36", + "rev": "a968d211048e3ed538e47b84cb3649299578f19d", "type": "github" }, "original": { @@ -512,11 +512,11 @@ ] }, "locked": { - "lastModified": 1776426632, - "narHash": "sha256-NX0dSUS86OBXfhD77rsajp3nJKg43HYhVdvlo9FkCsg=", + "lastModified": 1777292613, + "narHash": "sha256-sF3JQ9WY33Gam/WNoveIwVGgvREZNfxRONf4jD5hC3A=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "6059aca0cc623d8d896b02842606036c0954ba88", + "rev": "6c0d26b2676f71f4c382d34c5a59491b0aafd03d", "type": "github" }, "original": { @@ -566,11 +566,11 @@ ] }, "locked": { - "lastModified": 1772459629, - "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=", + "lastModified": 1776426736, + "narHash": "sha256-rl7i4aY+9p8LysJp7o8uRWahCkpFznCgGHXszlTw7b0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "7615ee388de18239a4ab1400946f3d0e498a8186", + "rev": "7833ff33b2e82d3406337b5dcf0d1cec595d83e9", "type": "github" }, "original": { @@ -643,11 +643,11 @@ ] }, "locked": { - "lastModified": 1774911391, - "narHash": "sha256-c4YVwO33Mmw+FIV8E0u3atJZagHvGTJ9Jai6RtiB8rE=", + "lastModified": 1777148223, + "narHash": "sha256-PTf7kRFFzCW6rIYxLH2fWfVJmj86FSYe3k6L8B+IM9o=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e6caa3d4d1427eedbdf556cf4ceb70f2d9c0b56d", + "rev": "fa3992be2dfebe4ab06d753c6ca59bea298e798f", "type": "github" }, "original": { @@ -668,11 +668,11 @@ ] }, "locked": { - "lastModified": 1772459835, - "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=", + "lastModified": 1777148232, + "narHash": "sha256-Uv0WZLhu89SafuSOmYDA7akrPt4wBRmsa1ucasO5aXg=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "0a692d4a645165eebd65f109146b8861e3a925e7", + "rev": "fec9cf1abcc1011e46f0a0986f46bf93c6bf8b92", "type": "github" }, "original": { @@ -697,11 +697,11 @@ ] }, "locked": { - "lastModified": 1775414057, - "narHash": "sha256-mDpHnf+MkdOxEqIM1TnckYYh9p1SXR8B3KQfNZ12M8s=", + "lastModified": 1776728575, + "narHash": "sha256-z9eGphrArEBpl1O/GCH0wlY6z4K9vA6yWh2gAS6qytU=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "86012ee01b0fdd8bf3101ef38816f2efbee42490", + "rev": "f3a80888783702a39691b684d099e16b83ed4702", "type": "github" }, "original": { @@ -750,11 +750,11 @@ ] }, "locked": { - "lastModified": 1776070951, - "narHash": "sha256-z1XVxkqS9znn5CkvkOHttRYV4W5Y7ZoNGxReV6dSB6o=", + "lastModified": 1777282995, + "narHash": "sha256-DeVNOjfSIfwSe4KMcc/QZst68QwhEm6jd/rQYdRZHCQ=", "owner": "Mic92", "repo": "nix-ld", - "rev": "f9e76c43120b9104c5be855bf22da5bf71c8fed1", + "rev": "7b7c075009dff1c3fd5fdcf63dd5d22fdbde34d6", "type": "github" }, "original": { @@ -801,11 +801,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1775490113, - "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=", + "lastModified": 1776983936, + "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7", + "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61", "type": "github" }, "original": { @@ -832,11 +832,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1776434932, - "narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=", + "lastModified": 1777077449, + "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7f47036d3df2add644c46d712d14262b7d86c0c", + "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160", "type": "github" }, "original": { @@ -848,11 +848,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1776169885, - "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", + "lastModified": 1776877367, + "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", "type": "github" }, "original": { @@ -864,11 +864,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1775423009, - "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", + "lastModified": 1776877367, + "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", + "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", "type": "github" }, "original": { @@ -991,11 +991,11 @@ ] }, "locked": { - "lastModified": 1775036584, - "narHash": "sha256-zW0lyy7ZNNT/x8JhzFHBsP2IPx7ATZIPai4FJj12BgU=", + "lastModified": 1776796298, + "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4e0eb042b67d863b1b34b3f64d52ceb9cd926735", + "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad", "type": "github" }, "original": { @@ -1084,11 +1084,11 @@ ] }, "locked": { - "lastModified": 1776119890, - "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=", + "lastModified": 1777338324, + "narHash": "sha256-bc+ZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd", + "rev": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5", "type": "github" }, "original": { @@ -1105,11 +1105,11 @@ "nix-filter": "nix-filter" }, "locked": { - "lastModified": 1774692068, - "narHash": "sha256-GblLHAtf6ytu8wqJnYp5F6FtDm/IIjcM9bPwrPU1otE=", + "lastModified": 1777235927, + "narHash": "sha256-ql1ouZMN4xULMIHQJRNHNMHI2Cw8K0pugR6pXU3cKCs=", "owner": "Duckonaut", "repo": "split-monitor-workspaces", - "rev": "08ff2b4d1144845e8d7c23d6fd00bde12ff8f1fd", + "rev": "2dcc901799b5ebc8558584bcc993971dd64351ed", "type": "github" }, "original": { @@ -1138,11 +1138,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1776170745, - "narHash": "sha256-Tl1aZVP5EIlT+k0+iAKH018GLHJpLz3hhJ0LNQOWxCc=", + "lastModified": 1776893932, + "narHash": "sha256-AFD5cf9eNqXq1brHS63xeZy2xKZMgG9J86XJ9I2eLn8=", "owner": "nix-community", "repo": "stylix", - "rev": "e3861617645a43c9bbefde1aa6ac54dd0a44bfa9", + "rev": "84971726c7ef0bb3669a5443e151cc226e65c518", "type": "github" }, "original": { @@ -1299,11 +1299,11 @@ }, "unstable": { "locked": { - "lastModified": 1776169885, - "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", + "lastModified": 1776877367, + "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", "type": "github" }, "original": { @@ -1320,11 +1320,11 @@ ] }, "locked": { - "lastModified": 1776562531, - "narHash": "sha256-Lh5Ns9DI67E+lSMOCGK0S+mFPy0mz0yOGiJTUXiR9JI=", + "lastModified": 1777349711, + "narHash": "sha256-PGKgo2dO6fK603QGI+DWXdKmS09pbJjjTxwRHdhkGZA=", "owner": "nix-community", "repo": "home-manager", - "rev": "5b56ad02dc643808b8af6d5f3ff179e2ce9593f4", + "rev": "c1140540536d483e2730320100f6835d62c94fdf", "type": "github" }, "original": { @@ -1406,11 +1406,11 @@ ] }, "locked": { - "lastModified": 1773601989, - "narHash": "sha256-2tJf/CQoHApoIudxHeJye+0Ii7scR0Yyi7pNiWk0Hn8=", + "lastModified": 1777035886, + "narHash": "sha256-m1TNuBoSXUBSKhD9UVMkU90M0wFTPTfvIOOltO8IM8A=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "a9b862d1aa000a676d310cc62d249f7ad726233d", + "rev": "ecfcdcc781f48821d83e1e2a0e30d7beca0eeb5e", "type": "github" }, "original": { @@ -1425,11 +1425,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1776538405, - "narHash": "sha256-qjo8xO4p/Kn4OrtVwkW8XPH0xaHq5QLu6MMhSf+gJ/w=", + "lastModified": 1777356688, + "narHash": "sha256-fOhJpz7QAkBWAAih72CmnIfIN0pHfuZjhZQ/hBLNWxo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "179a2e63531541cb009208c913d7ddf7046ea2b6", + "rev": "b3c972b3d8537a9cf7a0db96b164c9c3e580884a", "type": "github" }, "original": { diff --git a/machines/fujin/main/certs/homelab-lan-chain.crt b/machines/fujin/main/certs/homelab-lan-chain.crt new file mode 100644 index 0000000..b7fe6d5 --- /dev/null +++ b/machines/fujin/main/certs/homelab-lan-chain.crt @@ -0,0 +1,63 @@ +-----BEGIN CERTIFICATE----- +MIIFejCCA2KgAwIBAgIUHLPCpX+l4oCWRvL4wNS7ZXogaQ0wDQYJKoZIhvcNAQEL +BQAwLDEQMA4GA1UECgwHSG9tZWxhYjEYMBYGA1UEAwwPSG9tZWxhYiBSb290IENB +MB4XDTI2MDQyNDE1MzAxMFoXDTMxMDQyNDE1MzAxMFowNDEQMA4GA1UECgwHSG9t +ZWxhYjEgMB4GA1UEAwwXSG9tZWxhYiBJbnRlcm1lZGlhdGUgQ0EwggIiMA0GCSqG +SIb3DQEBAQUAA4ICDwAwggIKAoICAQDGw7Tf176ZtPTKBziT/WlCVWydJK4OHHAM +BquF512ZibpJnoCFJBVgD158WAc8r2e8FW5ZbhDiVHXYsJmmIMKpNB2JH28dos67 +CCQ8eJuVPB0RxvsTeilFX0Z6vcOrMDI/tbTc47PxexmnY2vn6EZ31LE1ob7po6sg +CXbymIPYw8MNRlirs0WCbXiRPWv7aX5YfC41e2INoxYIUGkwSQaTm9EMyFCMPQx/ +50NEUG8XcwnIxYxczHO1uPq70Dh5h3PytYyO7nM6VfbhJv5TF6MgSPHRAHnJ1OcM +f9WEoe1sPwBB3SQq+EEc26mhzpWJ1NP8k69VvfQGT1RZGVCGjj2lEnztBvLSxRHt +UDjnWhcrM8an5BVw47Co0moOVgiGR29D0QbnqNhzx73geNYF7indVN+S0esvXmlF +dD8XFUrGBqEDCpVBCdiwnjilgmWTEE5L+geh5rf1Xf4lGqAJ/HG/gzh+0aMyhJRO +hhhqy/y0Bh4u9ndEHlefCb1+THPAkp3zD6AlvRTmen4lQCZmXbUdYy0Vzc3wGOdP +7rw0mkXajlgnIxnmVX24qoU7WZY957O2S5eTFkceCytWpzXsEJRkl+tRvtPXUAJy +fgCJcmYu6ysQ5vDNdzYX9PkuBpn7ONG5fAgK+aPukdcVb9igN26Ao6FKNLoq6XQN +QiwfFwcErQIDAQABo4GLMIGIMCIGA1UdEQQbMBmCF0hvbWVsYWIgSW50ZXJtZWRp +YXRlIENBMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1Ud +DgQWBBSKt8hpuCiRvMO9yVVMg5nxoMhc7jAfBgNVHSMEGDAWgBQE/W2BXGJEBEGW +bYJ1acZu9OpBgDANBgkqhkiG9w0BAQsFAAOCAgEAeh5a2mkimOiJiEkqdC9zMSEs +0qczDOImSjap+5jWcKSArlDhD3Ng8855G0mAcdUWqY5fzxuvbPqEgxCCltZpL1sy +5ULP/tVscJLXm6TNMu+txxdAqsqsif2b41rM1WrKthDJpYYygfJ+w7xV6wIucuIW +ZXWkhdF9ByNSK6a2Cvk+uChgVKup0Lkgmka4JnbJ2aOBhNfYN/M+O+0cKwgLmabS +H34Lz+XNfWcxikh8i0XZv+msdL//wIBXt7ij3MM8I82CpIrKmxUzGLf6kskyra8k +R3UL5GvRjP+/p4kPCukEe+38ehV4LubXnFm+EE1Lk2Ssdg5G/2t3D+AVeX3AsJaW +U4NKJNBnz5s5Bew5xpvvL6SYGo75xDh6ED2liNwPU0Qv/CsoLaVhAAMFrwabE9lH +wC91qrjWdd2CmzBwrlxF7OyDxKY9WslMvTvcgJbM0OaCDZtyk4zcF442DdPNoLaT +0zVqiJ4WQxkGA5airADbT7pZBeZjiQFZdwNN54akLQo5FsMfaqk/X++cbY1mlgqo +H1UCqvwT2bsIaO+fUkiR8YuewNPriIwfmE9cKXWndjTrDfmT5e3aXYjPReDBuRXY +67xBSV15UzxxNt2AX6DpLpgOXqOAFH/jNnYuYZNWZVMEjflzN2WjGQ6jAn+j8vA8 +b3gaJQ8W9LbQV5Nkahs= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFRDCCAyygAwIBAgIUFwT5aSyhaiDHWGC6zoWdus62NG8wDQYJKoZIhvcNAQEL +BQAwLDEQMA4GA1UECgwHSG9tZWxhYjEYMBYGA1UEAwwPSG9tZWxhYiBSb290IENB +MB4XDTI2MDQyNTE1MzAwOFoXDTM2MDQyMjE1MzAwOFowLDEQMA4GA1UECgwHSG9t +ZWxhYjEYMBYGA1UEAwwPSG9tZWxhYiBSb290IENBMIICIjANBgkqhkiG9w0BAQEF +AAOCAg8AMIICCgKCAgEAkWcMIXerDH0x6dochISzaQms6Ialb1V9cEGs+FIm9kNR +drtBAi3p35a+VSUl1bw4m+uczQgiY5unJSLALklGqYy7PBI0AyvAdCMRcnknn6JO +JXmad1fJLnyKmv4EH6Dq34Qqm/7Ka79rQYUOQhigLu+7+iquZX/UzsuYvVpdTQOz +M3yBt3a9wf3kX/aJTfriudW8gMpkYoW3DCDK0B16b1N0cyv2fvDsSR1Xfmi+YVu1 +r8PQ5lvH3C4T6gBJQhTEHWkCkuxgOTQaqOS4zBe6MgyDuiAnEqGIljjkwY/uEzWP +a0vOGgeu5BbktC7iAU+fPbIARTq/RobFBkikxCbb1n4/FyDFHkBFXQU71AEWmkLt +wK1ekHGjw/iIgxkX3haV/UZwd0qlHAmUYMge5YmsXo/Kfl40t1Ma2LBP/NRuz8eP +gMPFE51ZgEf/TVH84G2gcrKxbsIRRcxrnrZ2o2aQk5Ylhg6j4cmiRR27GF5zJgbQ +jA4ZAcRE38YIzHDgS/95eMFz6LJYOEVxfj6zvEFcmV2NAH3rsIdCuNu2Wel7Zzzf +YusIfFyf543evYD9Mewi+46bSs848SzFsT8SynydC6u8cpK84BsquwuInlOQWUvM +smewvacLMENHtKNML0rJEpCCVI8IdYCqsMviuC0fzotP8DeSDBjjS9HUfSxWOIkC +AwEAAaNeMFwwGgYDVR0RBBMwEYIPSG9tZWxhYiBSb290IENBMA4GA1UdDwEB/wQE +AwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQE/W2BXGJEBEGWbYJ1acZu +9OpBgDANBgkqhkiG9w0BAQsFAAOCAgEAA13poaND3jq4dMzGcn2XVz1a6g4B7mxF +GHWXSHe9/Q/kjF2qnEdea7VFLCCzZ0OqC2UpfKnTW4xbCZ/d4QZqcgGXJehfuuhE +oux1Nm0a3jBZQ+EYnJDuAgOb80q0S55Iwfh57l1613xdAh73x1yWtlGH5wlCRj27 +C/ilyws1Yk26N1qzwfh6A42yEjv29Aos4hTn1jUMHJH63A5ke2tRnYDq2HR9x9PW +xhxHm8NsK0jMmvOSOW9n1X6X3UhTfzNyHY8PMCQeXG+9ppnkYgOda0fDWTD21iqq +l22MKqEuGfq84D3HaK/TlLP0vywao4Ug/K7jE/j/GWMkTmdxIjTSQ7VmRyzdXqsE +HsjpWAgRrY6JdoW2V0F90qk6Op1hVcGRdXznhCx0/TWG272d0dzetIqcHfgn5n7z +0DYSCS/4WaA25x4johdic58e6dCIDat88nbbZCwZaHDER6PBZprgm1J/6ek7jQaR +arWksZX/+PBg1IGAHSkRiVpx8kq2fFEUbbSDONxJmE8FEWDp6frq3a4pbleqJenK +1IOLVJg9D3RJAvBa14kOeocyb0upZ8Zc/oSm+ojyVt56PoBPQC28SJ+T9mAS1/uL +bWFMtkTU0oVuytOHTvekvBJbloX9HqTDtkjV/A/PSLrg7dXW09v3RhPjLGKj5Gf1 +9HMKL6MV2is= +-----END CERTIFICATE----- \ No newline at end of file diff --git a/machines/fujin/main/default.nix b/machines/fujin/main/default.nix index c1844dd..4b9ef4b 100644 --- a/machines/fujin/main/default.nix +++ b/machines/fujin/main/default.nix @@ -13,7 +13,10 @@ (import ./overlays/zulu22.nix) ]; - security.pki.certificateFiles = [ ./certs/homelab-com.pem ]; + security.pki.certificateFiles = [ + ./certs/homelab-com.pem + ./certs/homelab-lan-chain.crt + ]; users.users.${username} = { description = "NixOS Omen Laptop"; diff --git a/machines/fujin/main/dotfiles/.config/doom/config.el b/machines/fujin/main/dotfiles/.config/doom/config.el index fe2fe16..3df8d4f 100644 --- a/machines/fujin/main/dotfiles/.config/doom/config.el +++ b/machines/fujin/main/dotfiles/.config/doom/config.el @@ -317,6 +317,13 @@ Must be called BEFORE jdtls starts. Sets global lsp-java-vmargs." ;; Prevent Semgrep from receiving Java-specific commands it can't handle (lsp-disable-method-for-server "workspace/executeCommand" 'semgrep-ls) + ;; Fix: boot-ls (Spring Boot LS) doesn't implement willSaveWaitUntil but lsp-mode + ;; sends it anyway when multiple servers are connected (jdtls + boot-ls for Java). + ;; boot-ls uses lsp4j's default which throws UnsupportedOperationException, causing hang. + ;; See: https://github.com/spring-projects/spring-tools (SimpleLanguageServer.java:455) + ;; Bug is in lsp-mode's multi-server capability checking, not boot-ls. + (lsp-disable-method-for-server "textDocument/willSaveWaitUntil" 'boot-ls) + ;; Register nixd LSP client for Nix files (lsp-register-client (make-lsp-client :new-connection (lsp-stdio-connection "nixd") @@ -325,18 +332,41 @@ Must be called BEFORE jdtls starts. Sets global lsp-java-vmargs." :server-id 'nixd)) ;; Nix LSP configuration - (setq lsp-nix-nil-formatter ["nixpkgs-fmt"])) + (setq lsp-nix-nil-formatter ["nixpkgs-fmt"]) + + ;; Fix: Handle textEdit with only :newText and no range (jdtls lazy textEdit bug) + ;; When jdtls returns textEdit with only :newText and no :range/:insert/:replace, + ;; lsp-mode silently fails to insert. This uses markers as fallback. + (advice-add 'lsp-completion--exit-fn :around + (lambda (orig-fn candidate status &optional candidates) + (let* ((item (plist-get (text-properties-at 0 candidate) 'lsp-completion-item)) + (text-edit (when item (lsp:completion-item-text-edit? item))) + (markers (plist-get (text-properties-at 0 candidate) 'lsp-completion-markers))) + ;; If textEdit exists but has no range, fix it using markers + (if (and text-edit + (plist-get text-edit :newText) + (not (plist-get text-edit :range)) + (not (plist-get text-edit :insert)) + markers) + (let ((start (car markers)) + (end (cadr markers))) + (when (and start end (markerp end)) + (setq end (marker-position end))) + (when (and start end) + ;; Delete the prefix and insert the new text manually + (delete-region start end) + (goto-char start) + (insert (plist-get text-edit :newText)))) + ;; Otherwise call original + (funcall orig-fn candidate status candidates)))) + '((name . lsp-completion--exit-fn-advice))) + + ;; Use company-capf with yasnippet for completions + (setq +lsp-company-backends '(company-capf :with company-yasnippet))) ;; Enable LSP for nix-mode (add-hook! 'nix-mode-hook #'lsp-deferred) -(after! claude-code-ide - (use-package claude-code-ide - :bind ("C-c C-'" . claude-code-ide-menu) ; Set your favorite keybinding - :config - (claude-code-ide-emacs-tools-setup))) ; Optionally enable Emacs MCP tools - - (after! treemacs (setq treemacs-collapse-dirs 3) ) diff --git a/machines/fujin/main/dotfiles/.config/doom/init.el b/machines/fujin/main/dotfiles/.config/doom/init.el index cb16ee3..4e5c1b2 100644 --- a/machines/fujin/main/dotfiles/.config/doom/init.el +++ b/machines/fujin/main/dotfiles/.config/doom/init.el @@ -166,7 +166,7 @@ ;;rest ; Emacs as a REST client ;;rst ; ReST in peace (ruby +lsp) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - ;;(rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + (rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() ;;scala ; java, but good ;;(scheme +guile) ; a fully conniving family of lisps sh ; she sells {ba,z,fi}sh shells on the C xor diff --git a/machines/fujin/main/home.nix b/machines/fujin/main/home.nix index eed79d9..9e48892 100644 --- a/machines/fujin/main/home.nix +++ b/machines/fujin/main/home.nix @@ -114,7 +114,7 @@ semgrep devpod tmux - bottles + #bottles terraform kubectl kubectx diff --git a/modules/window-manager/hypr/default.nix b/modules/window-manager/hypr/default.nix index 500174d..dc37c1b 100644 --- a/modules/window-manager/hypr/default.nix +++ b/modules/window-manager/hypr/default.nix @@ -226,7 +226,6 @@ in { }; dwindle = { - pseudotile = "yes"; preserve_split = "yes"; };