cnst/cnix
1
0
Fork 0
Code Issues Pull Requests Activity

lock, helix tweaks and minor kanata changes

Browse Source
This commit is contained in:
cnst
2024-12-18 20:27:07 +01:00
parent 2aa5867716
commit efd9e14630
4 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
flake.lock generated
View File

@@ -419,11 +419,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1734533540, "lastModified": 1734542518,
"narHash": "sha256-Ip8nwS/DMyoTnj0A1q5QoPOZ+Dt8ywyKeGC5p+fZ2J0=", "narHash": "sha256-9hBhC7sVQFyK6AyUR615/hCRgZ/KjltR776oXx5UQiY=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "13e5a2ee5a9368f9355700ad1bec744a407612cd", "rev": "9e4da4b95052ecfc759d33d78255eb9956279d15",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -659,11 +659,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1734535477, "lastModified": 1734549344,
"narHash": "sha256-knNjkaPKoeEC3EzlS+W0idgpclIfyKYAVNdE/dDYWuU=", "narHash": "sha256-8UyePAumPdoSQ3lbZtvnQs3owsqPB49xJXwoXGa0qdg=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland", "repo": "hyprland",
"rev": "80a4852266643c622ec68969b39c5abc3c610f30", "rev": "df06cb4d71a291171c02467c384471f90832d23b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -797,11 +797,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734535685, "lastModified": 1734549001,
"narHash": "sha256-dvypPICYuwIiGUvPZG9j6gdeAn26qhoTjzzB9jZyqvg=", "narHash": "sha256-bL55yOCX9SHwzkgApfpcDu8dru2HOSc37xuoVvkiSCY=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlock", "repo": "hyprlock",
"rev": "058830668e92e92b3179319090b5d523ba4d59a4", "rev": "d12b4a7fbaf570fbe9322c09a777c124fbf15306",
"type": "github" "type": "github"
}, },
"original": { "original": {

36
modules/home/programs/helix/lang.nix
View File

@@ -56,16 +56,6 @@
auto-format = true; auto-format = true;
language-servers = ["dprint" "typescript-language-server"]; language-servers = ["dprint" "typescript-language-server"];
} }
{
name = "nix";
auto-format = true;
file-types = ["nix"];
language-servers = ["nixd"];
formatter = {
command = lib.getExe pkgs.alejandra;
args = ["-q"];
};
}
{ {
name = "json"; name = "json";
formatter = deno "json"; formatter = deno "json";
@@ -80,6 +70,15 @@
auto-format = true; auto-format = true;
formatter = deno "md"; formatter = deno "md";
} }
{
name = "nix";
auto-format = true;
language-servers = ["nil"];
formatter = {
command = "${pkgs.alejandra}/bin/alejandra";
args = ["-q"];
};
}
{ {
name = "python"; name = "python";
language-servers = ["pylsp"]; language-servers = ["pylsp"];
@@ -96,6 +95,10 @@
{ {
name = "php"; name = "php";
auto-format = true; auto-format = true;
language-servers = ["phpactor"];
formatter = {
command = lib.getExe pkgs.php84Packages.php-cs-fixer;
};
} }
{ {
name = "css"; name = "css";
@@ -115,6 +118,11 @@
++ prettierLangs langs; ++ prettierLangs langs;
language-server = { language-server = {
phpactor = {
command = lib.getExe pkgs.phpactor;
args = ["language-server"];
};
bash-language-server = { bash-language-server = {
command = lib.getExe pkgs.bash-language-server; command = lib.getExe pkgs.bash-language-server;
args = ["start"]; args = ["start"];
@@ -161,14 +169,6 @@
args = ["lsp"]; args = ["lsp"];
}; };
nil = {
command = lib.getExe pkgs.nil;
};
nixd = {
command = lib.getExe pkgs.nixd;
};
pyright = { pyright = {
command = "${pkgs.pyright}/bin/pyright-langserver"; command = "${pkgs.pyright}/bin/pyright-langserver";
args = ["--stdio"]; args = ["--stdio"];

5
modules/nixos/programs/pkgs/default.nix
View File

@@ -55,6 +55,7 @@ in {
]) ])
(mkIf cfg.dev.enable [ (mkIf cfg.dev.enable [
lldb_19
nfs-utils nfs-utils
gcc gcc
rust-analyzer rust-analyzer
@@ -62,14 +63,13 @@ in {
nixd nixd
nil nil
php php
# php84Packages.php-cs-fixer vscode-langservers-extracted
# phpactor # phpactor
python312Packages.python-lsp-server python312Packages.python-lsp-server
bash-language-server bash-language-server
clang-tools clang-tools
marksman marksman
pyright pyright
# nodePackages_latest.intelephense
# Formatters # Formatters
alejandra alejandra
@@ -77,6 +77,7 @@ in {
nodePackages_latest.fixjson nodePackages_latest.fixjson
nodePackages_latest.sql-formatter nodePackages_latest.sql-formatter
prettierd prettierd
# php84Packages.php-cs-fixer
shfmt shfmt
luaformatter luaformatter
black black

6
modules/nixos/services/kanata/hhkbse.kbd
View File

@@ -35,7 +35,7 @@
tab S-q S-w S-e S-r S-t S-y S-u S-i S-o S-p S-å S-¨ bspc tab S-q S-w S-e S-r S-t S-y S-u S-i S-o S-p S-å S-¨ bspc
lctl S-a S-s S-d S-f S-g S-h S-j S-k S-l S-ö S-ä S-ret lctl S-a S-s S-d S-f S-g S-h S-j S-k S-l S-ö S-ä S-ret
@shift S-z S-x S-c S-v S-b S-n S-m S-, S-. S-- rsft @shift S-z S-x S-c S-v S-b S-n S-m S-, S-. S-- rsft
lalt lmet spc @level3 @ralt lalt lmet spc @level3 @ralt
) )
(deflayer level3 (deflayer level3
@@ -43,12 +43,12 @@
tab q w RA-5 r t y u i o ▲ å RA-¨ bspc tab q w RA-5 r t y u i o ▲ å RA-¨ bspc
lctl a s d f g h j k ◀ ▼ ▶ ret lctl a s d f g h j k ◀ ▼ ▶ ret
@shift RA-S-z RA-S-x c v b n m , . - rsft @shift RA-S-z RA-S-x c v b n m , . - rsft
lalt lmet spc @level3 @ralt lalt lmet spc @level3 @ralt
) )
(deflayer ralt (deflayer ralt
esc 1 2 3 4 5 6 7 8 9 0 + pgdn pgup del esc 1 2 3 4 5 6 7 8 9 0 + pgdn pgup del
tab q w e r t y u i o p å ` bspc tab q w e r t y u i o p å S-´ bspc
lctl a s d f g h j k l ö ä ret lctl a s d f g h j k l ö ä ret
@shift z x c v b n m , . - rsft @shift z x c v b n m , . - rsft
lalt lmet spc @level3 @ralt lalt lmet spc @level3 @ralt