Compare commits

..

No commits in common. "f5728a1c1dafcd35bc586a15e71984003d7f2968" and "f31e941d6c7a89a8f959e37ed6d11a6ac0955bd5" have entirely different histories.

7 changed files with 12 additions and 100 deletions

View file

@ -4,7 +4,6 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-master.url = "github:nixos/nixpkgs";
sops-nix = {
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";

View file

@ -17,109 +17,28 @@
rust-lang.rust-analyzer
shd101wyy.markdown-preview-enhanced
fwcd.kotlin
alefragnani.bookmarks
tomrijndorp.find-it-faster
];
userSettings = {
"workbench.colorTheme" = "GitHub Dark Default";
"files.autoSave" = "onFocusChange";
"files.autoSave" = "afterDelay";
"nix.enableLanguageServer" = true;
"nix.serverPath" = "nil";
"editor.fontFamily" = "IBM Plex Mono";
"editor.fontSize" = 15;
"window.zoomLevel" = 0.5;
"editor.fontSize" = 16;
"editor.wordWrap" = "on";
# vim stuff
"vim.leader" = ",";
# vim mode settings
"vim.handleKeys" = {
"<C-b>" = false; # file tree toggle
};
"vim.normalModeKeyBindings" = [
{
"before" = [ ";" ];
"after" = [ ":" ];
"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";
"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;
};
};
};

View file

@ -66,7 +66,6 @@
};
};
programs.ripgrep.enable = true;
# programs.man.generateCaches = true; # slows down eval
programs.man.generateCaches = true;
programs.fd.enable = true;
news.display = "silent";
}

View file

@ -54,9 +54,7 @@
yarn
rclone
go
(rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override {
extensions = [ "rust-src" ];
}))
rustup
pwgen
lua-language-server
gnumake

View file

@ -51,7 +51,6 @@
bindkey -M viins "^E" end-of-line
bindkey -M viins "^A" beginning-of-line
bindkey -M viins "^B" backward-char
bindkey -M viins "^F" forward-char
# accept one word completion
bindkey -M viins "^S" forward-word
@ -112,7 +111,6 @@
"grv" = "git remote --verbose";
"gs" = "git status --short";
"gss" = "git status";
"code" = "codium";
};
};

View file

@ -232,9 +232,9 @@
snapshotOnly = true;
settings = {
snapshot_preserve_min = "latest";
target_preserve = "30d";
target_preserve_min = "2d";
target = "/mnt/target/btr_backup/ytnix";
target_preserve = "*d";
target_preserve_min = "no";
target = "/mnt/external/btr_backup/ytnix";
stream_compress = "zstd";
stream_compress_level = "8";
snapshot_dir = "/snapshots";

View file

@ -17,7 +17,6 @@ importedOverlays
{
conduwuit =
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";
}
)
]