From 119abb0377dd717254add2874ccfa7c7170d87f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kha=C3=AFs=20COLIN?= Date: Wed, 3 Dec 2025 20:12:38 +0100 Subject: [PATCH 1/2] helix: use clippy for rust-analyzer diagnostics --- home.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/home.nix b/home.nix index 14a7371..d21388a 100644 --- a/home.nix +++ b/home.nix @@ -483,9 +483,16 @@ in { }; }; languages = { - language-server.ucm = { - command = "nc"; - args = ["localhost" "5757"]; + language-server = { + ucm = { + command = "nc"; + args = ["localhost" "5757"]; + }; + rust-analyzer = { + config = { + check.command = "clippy"; + }; + }; }; language = [ { From 0875697997b2f8623a3df629bc5075c454eebacc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kha=C3=AFs=20COLIN?= Date: Fri, 5 Dec 2025 22:08:38 +0100 Subject: [PATCH 2/2] setup scanning --- flake.lock | 77 +++++++++++++++++++++++++++++++++++++++++++++++++--- flake.nix | 8 ++++-- home.nix | 4 +++ wm/river.nix | 2 ++ 4 files changed, 85 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 91f770e..800bde9 100644 --- a/flake.lock +++ b/flake.lock @@ -387,6 +387,24 @@ } }, "flake-utils_5": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { "inputs": { "systems": [ "starship-jj", @@ -713,6 +731,22 @@ } }, "nixpkgs_6": { + "locked": { + "lastModified": 1764915887, + "narHash": "sha256-CeBCJ9BMsuzVgn8GVfuSRZ6xeau7szzG0Xn6O/OxP9M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "42e29df35be6ef54091d3a3b4e97056ce0a98ce8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1755186698, "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", @@ -900,6 +934,7 @@ "optnix": "optnix", "other-transcode": "other-transcode", "river-shifttags": "river-shifttags", + "scansnapit": "scansnapit", "starship-jj": "starship-jj", "stylix": "stylix" } @@ -943,12 +978,31 @@ "type": "github" } }, + "scansnapit": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1764969464, + "narHash": "sha256-vG2vlM9FLxtj4rphizrXrC2FuIPfc4HMUsWEYU20yJk=", + "ref": "refs/heads/master", + "rev": "763d2110c84041dc733f3bfb692e91cb8ccff9e9", + "revCount": 1, + "type": "git", + "url": "ssh://forgejo@forgejo.005540.xyz/logistic-bot/scansnapit" + }, + "original": { + "type": "git", + "url": "ssh://forgejo@forgejo.005540.xyz/logistic-bot/scansnapit" + } + }, "starship-jj": { "inputs": { "fenix": "fenix", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_6", - "systems": "systems_5" + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_7", + "systems": "systems_6" }, "locked": { "lastModified": 1757479801, @@ -977,7 +1031,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_6", + "systems": "systems_7", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1089,6 +1143,21 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index c79d162..156f03f 100644 --- a/flake.nix +++ b/flake.nix @@ -47,6 +47,8 @@ optnix.url = "github:water-sucks/optnix"; starship-jj.url = "gitlab:lanastara_foss/starship-jj"; + + scansnapit.url = "git+ssh://forgejo@forgejo.005540.xyz/logistic-bot/scansnapit"; }; outputs = { nixpkgs, @@ -62,6 +64,7 @@ copyparty, optnix, starship-jj, + scansnapit, ... }: let system = "x86_64-linux"; @@ -75,6 +78,7 @@ cassowary = cassowary.packages.${system}.default; pkgs-unstable = nixpkgs-unstable.legacyPackages.${system}; starship-jj = starship-jj.packages.${system}.default; + scansnapit = scansnapit.packages.${system}.default; }; in { nixosConfigurations.void = nixpkgs.lib.nixosSystem { @@ -96,9 +100,9 @@ ./stylix.nix copyparty.nixosModules.default - ({ ... }: { + ({...}: { # add the copyparty overlay to expose the package to the module - nixpkgs.overlays = [ copyparty.overlays.default ]; + nixpkgs.overlays = [copyparty.overlays.default]; }) ]; specialArgs = { diff --git a/home.nix b/home.nix index d21388a..4df90fc 100644 --- a/home.nix +++ b/home.nix @@ -9,6 +9,7 @@ nix-doom-emacs-unstraightened, cassowary, starship-jj, + scansnapit, ... }: let username = "khais"; @@ -124,6 +125,9 @@ in { nil # used for jujutsu watch watchman + # scanning + scansnapit + naps2 ]; file = { diff --git a/wm/river.nix b/wm/river.nix index 5cfcd35..b5281c4 100644 --- a/wm/river.nix +++ b/wm/river.nix @@ -38,6 +38,8 @@ in { "Control+Alt+Shift L" = "spawn '${lock-command} & systemctl suspend'"; # terminal "Super Return" = "spawn kitty"; + # scansnapit! + "Super Space" = "spawn scansnapit"; # frequent programs "Super Q" = "spawn firefox"; "Super A" = "spawn emacs";