Compare commits
4 commits
f31e941d6c
...
f5728a1c1d
Author | SHA1 | Date | |
---|---|---|---|
f5728a1c1d | |||
bba29fa1ea | |||
6519ab7f06 | |||
8a75f0e7de |
7 changed files with 100 additions and 12 deletions
|
@ -4,6 +4,7 @@
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
|
||||||
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
|
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
|
||||||
|
nixpkgs-master.url = "github:nixos/nixpkgs";
|
||||||
sops-nix = {
|
sops-nix = {
|
||||||
url = "github:Mic92/sops-nix";
|
url = "github:Mic92/sops-nix";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
|
@ -17,28 +17,109 @@
|
||||||
rust-lang.rust-analyzer
|
rust-lang.rust-analyzer
|
||||||
shd101wyy.markdown-preview-enhanced
|
shd101wyy.markdown-preview-enhanced
|
||||||
fwcd.kotlin
|
fwcd.kotlin
|
||||||
|
alefragnani.bookmarks
|
||||||
|
tomrijndorp.find-it-faster
|
||||||
];
|
];
|
||||||
userSettings = {
|
userSettings = {
|
||||||
"workbench.colorTheme" = "GitHub Dark Default";
|
"workbench.colorTheme" = "GitHub Dark Default";
|
||||||
"files.autoSave" = "afterDelay";
|
"files.autoSave" = "onFocusChange";
|
||||||
"nix.enableLanguageServer" = true;
|
"nix.enableLanguageServer" = true;
|
||||||
"nix.serverPath" = "nil";
|
"nix.serverPath" = "nil";
|
||||||
"editor.fontFamily" = "IBM Plex Mono";
|
"editor.fontFamily" = "IBM Plex Mono";
|
||||||
"editor.fontSize" = 16;
|
"editor.fontSize" = 15;
|
||||||
"editor.wordWrap" = "on";
|
"window.zoomLevel" = 0.5;
|
||||||
|
|
||||||
# vim mode settings
|
# vim stuff
|
||||||
"vim.handleKeys" = {
|
"vim.leader" = ",";
|
||||||
"<C-b>" = false; # file tree toggle
|
|
||||||
};
|
|
||||||
"vim.normalModeKeyBindings" = [
|
"vim.normalModeKeyBindings" = [
|
||||||
{
|
{
|
||||||
"before" = [ ";" ];
|
"before" = [ ";" ];
|
||||||
"after" = [ ":" ];
|
"after" = [ ":" ];
|
||||||
"silent" = true;
|
"silent" = true;
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
"before" = [ "<leader>" "m" ];
|
||||||
|
"commands" = [ "bookmarks.toggle" ];
|
||||||
|
}
|
||||||
|
{
|
||||||
|
"before" = [ "<leader>" "l" ];
|
||||||
|
"commands" = [ "bookmarks.toggleLabeled" ];
|
||||||
|
}
|
||||||
|
{
|
||||||
|
"before" = [ "<leader>" "b" ];
|
||||||
|
"commands" = [ "bookmarks.list" ];
|
||||||
|
}
|
||||||
|
{
|
||||||
|
"before" = [ "<leader>" "s" ];
|
||||||
|
"commands" = [ "workbench.action.toggleSidebarVisibility" ];
|
||||||
|
}
|
||||||
|
{
|
||||||
|
"before" = [ "<leader>" "f" "f" ];
|
||||||
|
"commands" = [ "find-it-faster.findFiles" ];
|
||||||
|
}
|
||||||
|
{
|
||||||
|
"before" = [ "<leader>" "f" "g"];
|
||||||
|
"commands" = [ "find-it-faster.findWithinFiles"];
|
||||||
|
}
|
||||||
|
{
|
||||||
|
"before" = [ "<leader>" "f" "t"];
|
||||||
|
"commands" = [ "find-it-faster.findWithinFilesWithType"];
|
||||||
|
}
|
||||||
|
# "gd" for definitions is by default
|
||||||
|
{
|
||||||
|
"before" = [ "g" "r" ];
|
||||||
|
"commands" = [ "editor.action.goToReferences" ];
|
||||||
|
}
|
||||||
|
# the default is weird when you need to go back within a file
|
||||||
|
{
|
||||||
|
"before" = [ "C-o" ];
|
||||||
|
"commands" = [ "workbench.action.navigateBack" ];
|
||||||
|
}
|
||||||
|
{
|
||||||
|
"before" = [ "C-i" ];
|
||||||
|
"commands" = [ "workbench.action.navigateForward" ];
|
||||||
|
}
|
||||||
];
|
];
|
||||||
|
"vim.insertModeKeyBindings" = [
|
||||||
|
{
|
||||||
|
"before" = [ "C-a" ];
|
||||||
|
"commands" = [ "cursorHome" ];
|
||||||
|
}
|
||||||
|
{
|
||||||
|
"before" = [ "C-e" ];
|
||||||
|
"commands" = [ "cursorEnd" ];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
"vim.visualModeKeyBindings" = [
|
||||||
|
{
|
||||||
|
"before" = [ ">" ];
|
||||||
|
"commands" = [ "editor.action.indentLines" ];
|
||||||
|
}
|
||||||
|
{
|
||||||
|
"before" = [ "<" ];
|
||||||
|
"commands" = [ "editor.action.outdentLines" ];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
"extensions.experimental.affinity" = {
|
||||||
|
"vscodevim.vim" = 1;
|
||||||
|
};
|
||||||
"workbench.startupEditor" = "none";
|
"workbench.startupEditor" = "none";
|
||||||
|
"git.openRepositoryInParentFolders" = "never";
|
||||||
|
|
||||||
|
# terminal stuff
|
||||||
|
"terminal.integrated.cursorBlinking" = true;
|
||||||
|
"terminal.integrated.cursorStyle" = "line";
|
||||||
|
"terminal.integrated.customGlyphs" = false;
|
||||||
|
"terminal.integrated.env.linux" = {
|
||||||
|
# https://github.com/tomrijndorp/vscode-finditfaster/issues/112#issuecomment-2475227546
|
||||||
|
FZF_DEFAULT_OPTS = "--bind ctrl-n:down,ctrl-p:up";
|
||||||
|
};
|
||||||
|
# don't let the workbench handle terminal keys like ctrl+n and friends
|
||||||
|
"terminal.integrated.sendKeybindingsToShell" = true;
|
||||||
|
"terminal.integrated.allowChords" = false;
|
||||||
|
|
||||||
|
"security.promptForLocalFileProtocolHandling" = false;
|
||||||
|
"security.promptForRemoteFileProtocolHandling" = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -66,6 +66,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
programs.ripgrep.enable = true;
|
programs.ripgrep.enable = true;
|
||||||
programs.man.generateCaches = true;
|
# programs.man.generateCaches = true; # slows down eval
|
||||||
programs.fd.enable = true;
|
programs.fd.enable = true;
|
||||||
|
news.display = "silent";
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,7 +54,9 @@
|
||||||
yarn
|
yarn
|
||||||
rclone
|
rclone
|
||||||
go
|
go
|
||||||
rustup
|
(rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override {
|
||||||
|
extensions = [ "rust-src" ];
|
||||||
|
}))
|
||||||
pwgen
|
pwgen
|
||||||
lua-language-server
|
lua-language-server
|
||||||
gnumake
|
gnumake
|
||||||
|
|
|
@ -51,6 +51,7 @@
|
||||||
bindkey -M viins "^E" end-of-line
|
bindkey -M viins "^E" end-of-line
|
||||||
bindkey -M viins "^A" beginning-of-line
|
bindkey -M viins "^A" beginning-of-line
|
||||||
bindkey -M viins "^B" backward-char
|
bindkey -M viins "^B" backward-char
|
||||||
|
bindkey -M viins "^F" forward-char
|
||||||
|
|
||||||
# accept one word completion
|
# accept one word completion
|
||||||
bindkey -M viins "^S" forward-word
|
bindkey -M viins "^S" forward-word
|
||||||
|
@ -111,6 +112,7 @@
|
||||||
"grv" = "git remote --verbose";
|
"grv" = "git remote --verbose";
|
||||||
"gs" = "git status --short";
|
"gs" = "git status --short";
|
||||||
"gss" = "git status";
|
"gss" = "git status";
|
||||||
|
"code" = "codium";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -232,9 +232,9 @@
|
||||||
snapshotOnly = true;
|
snapshotOnly = true;
|
||||||
settings = {
|
settings = {
|
||||||
snapshot_preserve_min = "latest";
|
snapshot_preserve_min = "latest";
|
||||||
target_preserve = "*d";
|
target_preserve = "30d";
|
||||||
target_preserve_min = "no";
|
target_preserve_min = "2d";
|
||||||
target = "/mnt/external/btr_backup/ytnix";
|
target = "/mnt/target/btr_backup/ytnix";
|
||||||
stream_compress = "zstd";
|
stream_compress = "zstd";
|
||||||
stream_compress_level = "8";
|
stream_compress_level = "8";
|
||||||
snapshot_dir = "/snapshots";
|
snapshot_dir = "/snapshots";
|
||||||
|
|
|
@ -17,6 +17,7 @@ importedOverlays
|
||||||
{
|
{
|
||||||
conduwuit =
|
conduwuit =
|
||||||
inputs.conduwuit.packages.x86_64-linux.static-x86_64-linux-musl-all-features-x86_64-haswell-optimised;
|
inputs.conduwuit.packages.x86_64-linux.static-x86_64-linux-musl-all-features-x86_64-haswell-optimised;
|
||||||
|
ungoogled-chromium = pkgFrom inputs.nixpkgs-master "ungoogled-chromium";
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue