Compare commits
3 commits
2c32facb60
...
b927205c9d
Author | SHA1 | Date | |
---|---|---|---|
b927205c9d | |||
4f01412843 | |||
65039f4f17 |
6 changed files with 129 additions and 58 deletions
|
@ -7,5 +7,6 @@
|
|||
./firewall.nix
|
||||
./git.nix
|
||||
./kmscon.nix
|
||||
./mprocs.nix
|
||||
];
|
||||
}
|
||||
|
|
|
@ -183,6 +183,9 @@ in
|
|||
oneko
|
||||
|
||||
plover.dev
|
||||
|
||||
mupdf
|
||||
inotify-tools
|
||||
];
|
||||
xsession = {
|
||||
enable = true;
|
||||
|
|
|
@ -44,35 +44,15 @@
|
|||
enable = true;
|
||||
keyConfig = ''
|
||||
(
|
||||
open_help: Some(( code: F(1), modifiers: ( bits: 0,),)),
|
||||
move_left: Some(( code: Char('h'), modifiers: "")),
|
||||
move_right: Some(( code: Char('l'), modifiers: "")),
|
||||
move_up: Some(( code: Char('k'), modifiers: "")),
|
||||
move_down: Some(( code: Char('j'), modifiers: "")),
|
||||
|
||||
move_left: Some(( code: Char('h'), modifiers: ( bits: 0,),)),
|
||||
move_right: Some(( code: Char('l'), modifiers: ( bits: 0,),)),
|
||||
move_up: Some(( code: Char('k'), modifiers: ( bits: 0,),)),
|
||||
move_down: Some(( code: Char('j'), modifiers: ( bits: 0,),)),
|
||||
stash_open: Some(( code: Char('l'), modifiers: "")),
|
||||
open_help: Some(( code: F(1), modifiers: "")),
|
||||
|
||||
popup_up: Some(( code: Char('p'), modifiers: ( bits: 2,),)),
|
||||
popup_down: Some(( code: Char('n'), modifiers: ( bits: 2,),)),
|
||||
page_up: Some(( code: Char('b'), modifiers: ( bits: 2,),)),
|
||||
page_down: Some(( code: Char('f'), modifiers: ( bits: 2,),)),
|
||||
home: Some(( code: Char('g'), modifiers: ( bits: 0,),)),
|
||||
end: Some(( code: Char('G'), modifiers: ( bits: 1,),)),
|
||||
shift_up: Some(( code: Char('K'), modifiers: ( bits: 1,),)),
|
||||
shift_down: Some(( code: Char('J'), modifiers: ( bits: 1,),)),
|
||||
|
||||
edit_file: Some(( code: Char('I'), modifiers: ( bits: 1,),)),
|
||||
|
||||
status_reset_item: Some(( code: Char('U'), modifiers: ( bits: 1,),)),
|
||||
|
||||
diff_reset_lines: Some(( code: Char('u'), modifiers: ( bits: 0,),)),
|
||||
diff_stage_lines: Some(( code: Char('s'), modifiers: ( bits: 0,),)),
|
||||
|
||||
stashing_save: Some(( code: Char('w'), modifiers: ( bits: 0,),)),
|
||||
stashing_toggle_index: Some(( code: Char('m'), modifiers: ( bits: 0,),)),
|
||||
|
||||
stash_open: Some(( code: Char('l'), modifiers: ( bits: 0,),)),
|
||||
|
||||
abort_merge: Some(( code: Char('M'), modifiers: ( bits: 1,),)),
|
||||
status_reset_item: Some(( code: Char('U'), modifiers: "SHIFT")),
|
||||
)
|
||||
'';
|
||||
};
|
||||
|
|
16
modules/mprocs.nix
Normal file
16
modules/mprocs.nix
Normal file
|
@ -0,0 +1,16 @@
|
|||
{...}: {
|
||||
home-manager.users.jade = {
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
home = {
|
||||
packages = [pkgs.mprocs];
|
||||
};
|
||||
xdg.configFile."mprocs/mprocs.yaml" = {
|
||||
text = builtins.toJSON {
|
||||
proc_list_width = 15;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,5 +1,12 @@
|
|||
{config, ...}: {
|
||||
home-manager.users.jade = {pkgs, ...}: {
|
||||
home-manager.users.jade = {pkgs, ...}: let
|
||||
typstGrammar = pkgs.fetchFromGitHub {
|
||||
owner = "uben0";
|
||||
repo = "tree-sitter-typst";
|
||||
rev = "baddc325e858afff90501dbefa00ecfa28528931";
|
||||
sha256 = "sha256-XZAgnpb1B8EZ2WXPj/JYSZGsmpKsnDiBFCDF0XjunOM";
|
||||
};
|
||||
in {
|
||||
home = {
|
||||
sessionVariables.EDITOR = "hx";
|
||||
packages = [
|
||||
|
@ -7,15 +14,28 @@
|
|||
pkgs.vscode-langservers-extracted
|
||||
pkgs.nodePackages.typescript-language-server
|
||||
pkgs.emmet-language-server
|
||||
pkgs.typst-lsp
|
||||
];
|
||||
};
|
||||
home.file = {
|
||||
".config/helix/runtime/queries" = {
|
||||
source = "${typstGrammar}/queries";
|
||||
};
|
||||
};
|
||||
programs.helix = {
|
||||
enable = true;
|
||||
settings = {
|
||||
theme = "gruvbox";
|
||||
editor = {
|
||||
line-number = "relative";
|
||||
lsp.display-messages = true;
|
||||
bufferline = "multiple";
|
||||
color-modes = true;
|
||||
lsp = {
|
||||
display-messages = true;
|
||||
display-inlay-hints = true;
|
||||
};
|
||||
shell = ["nu" "-c"];
|
||||
idle-timeout = 0;
|
||||
indent-guides = {
|
||||
render = true;
|
||||
character = "│";
|
||||
|
@ -38,16 +58,29 @@
|
|||
};
|
||||
};
|
||||
languages = {
|
||||
language-server."nu-builtin-lsp" = {
|
||||
language-server = {
|
||||
"nu-builtin-lsp" = {
|
||||
command = "${config.users.defaultUserShell}/bin/nu";
|
||||
args = ["--lsp"];
|
||||
};
|
||||
language-server."rust-analyzer" = {
|
||||
"rust-analyzer" = {
|
||||
config = {
|
||||
check.command = "clippy";
|
||||
completion.snippets.custom = {
|
||||
"pub fn" = {
|
||||
prefix = ["pfn" "pubfn"];
|
||||
postfix = ["pfn"];
|
||||
body = [
|
||||
"pub fn $\{receiver\}() {"
|
||||
"\\t$1"
|
||||
"}"
|
||||
];
|
||||
scope = "type";
|
||||
};
|
||||
};
|
||||
language-server."emmet-language-server" = {
|
||||
};
|
||||
};
|
||||
"emmet-language-server" = {
|
||||
command = "emmet-language-server";
|
||||
args = ["--stdio"];
|
||||
};
|
||||
|
@ -59,11 +92,52 @@
|
|||
# args = ["--language-server"];
|
||||
# };
|
||||
# };
|
||||
"typst-lsp" = {
|
||||
command = "typst-lsp";
|
||||
config = {
|
||||
exportPdf = "onType";
|
||||
};
|
||||
};
|
||||
};
|
||||
grammar = [
|
||||
{
|
||||
name = "typst";
|
||||
source = {
|
||||
git = "https://github.com/uben0/tree-sitter-typst";
|
||||
rev = "baddc325e858afff90501dbefa00ecfa28528931";
|
||||
# path = "${typstGrammar}";
|
||||
};
|
||||
}
|
||||
];
|
||||
language = [
|
||||
{
|
||||
name = "nu";
|
||||
language-servers = ["nu-builtin-lsp"];
|
||||
}
|
||||
{
|
||||
name = "typst";
|
||||
scope = "source.typst";
|
||||
file-types = ["typ" "typst"];
|
||||
injection-regex = "typ(st)?";
|
||||
comment-token = "//";
|
||||
indent = {
|
||||
tab-width = 2;
|
||||
unit = " ";
|
||||
};
|
||||
roots = ["typst.toml"];
|
||||
formatter = {
|
||||
command = "${pkgs.typstfmt}/bin/typstfmt";
|
||||
};
|
||||
auto-format = true;
|
||||
language-servers = ["typst-lsp"];
|
||||
auto-pairs = {
|
||||
"(" = ")";
|
||||
"{" = "}";
|
||||
"[" = "]";
|
||||
"$" = "$";
|
||||
"\"" = "\"";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "nix";
|
||||
formatter = {
|
||||
|
|
|
@ -803,18 +803,15 @@ def glog [
|
|||
] {
|
||||
git log --pretty=%h»¦«%s»¦«%aN»¦«%aE»¦«%aD -n $amount
|
||||
| lines
|
||||
| split column "»¦«" commit subject name email date
|
||||
| split column "»¦«u commit subject name email date"
|
||||
}
|
||||
|
||||
def ed [
|
||||
file: path
|
||||
...cmdargs: string
|
||||
def typed [
|
||||
name: string
|
||||
] {
|
||||
let ext = $file | path parse | get extension;
|
||||
match $ext {
|
||||
"typ" => {|| zellij run --direction down -- typst watch $file ($cmdargs | prepend '--open' | str join ' ') }
|
||||
};
|
||||
hx $file
|
||||
touch $"($name).typ"
|
||||
typst compile $"($name).typ"
|
||||
mprocs --names Editor,Viewer,Notify $"hx '($name).typ'" $"mupdf-x11 '($name).pdf'" $"while inotifywait -e modify '($name).pdf' ; do pkill -HUP mupdf; done"
|
||||
}
|
||||
|
||||
alias gnix = cd ~/nix-configs;
|
||||
|
|
Loading…
Reference in a new issue