framework: fixes and tweaks

This commit is contained in:
tristan 2025-04-29 01:56:09 +01:00
parent 08ec72daba
commit e97a74b983
15 changed files with 33 additions and 42 deletions

View file

@ -1,6 +1,5 @@
{pkgs, ...}: {
imports = [
./pcmanfm.nix
./mpv.nix
./vscode.nix
];
@ -11,6 +10,7 @@
easyeffects
pwvucontrol
helvum
cosmic-files
# tools
inkscape

View file

@ -13,7 +13,7 @@ image () {
[ ! -f "$CACHE" ] && \
chafa -f sixel -s "$2x$3" --animate off --polite on "$1" > "$CACHE"
cat "$CACHE"
exit 1
exit 0
}
case "$(file -Lb --mime-type -- "$file")" in

View file

@ -11,8 +11,8 @@
// (import ../../../lib/nixvim.nix input);
programs.vscode = {
extensions = [pkgs.vscode-extensions.asvetliakov.vscode-neovim];
userSettings = {
profiles.default.extensions = [pkgs.vscode-extensions.asvetliakov.vscode-neovim];
profiles.default.userSettings = {
"vscode-neovim.neovimExecutablePaths.linux" =
lib.getExe config.programs.nixvim.package;
"extensions.experimental.affinity" = {

View file

@ -22,7 +22,7 @@
xargs = "${pkgs.findutils}/bin/xargs";
menu = config.programs.menu.dmenuCommand;
runmenu = config.programs.menu.drunCommand;
fileman = "${pkgs.pcmanfm}/bin/pcmanfm";
fileman = lib.getExe pkgs.cosmic-files;
gawk = "${pkgs.gawk}/bin/awk";
hyprpicker = "${pkgs.hyprpicker}/bin/hyprpicker";
sed = "${pkgs.gnused}/bin/sed";

View file

@ -10,7 +10,8 @@
extraConfig = ''
bind -n M-s split-window -v
bind -n M-v split-window -h
bind -n M-Enter split-window -h
bind -n M-S-s split-window -h -c "#{pane_current_path}"
bind -n M-S-v split-window -h -c "#{pane_current_path}"
bind -n M-h select-pane -L
bind -n M-j select-pane -D
bind -n M-k select-pane -U
@ -22,22 +23,10 @@
bind -n M-+ resize-pane -U 10
bind -n M-z resize-pane -Z
bind -n M-u copy-mode
bind -n M-p paste-buffer
bind -n M-p previous-window
bind -n M-n next-window
set-option -g renumber-windows on
'';
};
# programs.kitty = {
# enable = true;
# keybindings = {
# "alt+h" = "neighboring_window left";
# "alt+l" = "neighboring_window right";
# "alt+j" = "neighboring_window down";
# "alt+k" = "neighboring_window up";
# "alt+enter" = "new_window";
# };
# shellIntegration.enableZshIntegration = true;
# };
}

View file

@ -4,15 +4,13 @@
config,
...
}: let
pkg = config.programs.vscode.package;
code = lib.getExe config.programs.vscode.package;
menu = config.programs.menu.dmenuCommand;
editorCmd = "NIXOS_OZONE_WL= ${pkg}/bin/${pkg.executableName}";
in {
programs.vscode = {
enable = true;
package = lib.mkDefault pkgs.vscodium;
extensions = [];
userSettings = {
profiles.default.userSettings = {
"keyboard.dispatch" = "keyCode";
"terminal.integrated.sendKeybindingsToShell" = true;
"aws.telemetry" = false;
@ -32,7 +30,7 @@ in {
code_dir=~/Documents/code
cd $code_dir
repo=$(ls | ${menu})
[ -e "$repo" ] && ${editorCmd} $repo
[ -e "$repo" ] && ${code} $repo
'';
install = false;
hotkeys = [{key = "C";}];

View file

@ -49,14 +49,9 @@ in {
programs.vscode = {
package = pkgs.vscode;
extensions = with pkgs; [
profiles.default.extensions = with pkgs; [
vscode-extensions.ms-azuretools.vscode-docker
];
userSettings = {
"aws.telemetry" = false;
"gitlens.telemetry.enabled" = false;
"redhat.telemetry.enabled" = false;
};
};
wayland.windowManager.hyprland.settings = {