diff --git a/home/codium.nix b/home/codium.nix index 10aaffb..f6c9a04 100644 --- a/home/codium.nix +++ b/home/codium.nix @@ -3,40 +3,43 @@ programs.vscode = { enable = true; package = pkgs.vscodium; - enableUpdateCheck = false; - enableExtensionUpdateCheck = false; mutableExtensionsDir = false; - extensions = - # if unfree - # with pkgs.vscode-marketplace; - with pkgs.open-vsx; [ - vscodevim.vim - jnoortheen.nix-ide - github.github-vscode-theme - rust-lang.rust-analyzer - shd101wyy.markdown-preview-enhanced - ]; - userSettings = { - "workbench.colorTheme" = "GitHub Dark Default"; - "files.autoSave" = "afterDelay"; - "nix.enableLanguageServer" = true; - "nix.serverPath" = "nil"; - "editor.fontFamily" = "IBM Plex Mono"; - "editor.fontSize" = 16; - "editor.wordWrap" = "on"; + profiles.default = { + enableUpdateCheck = false; + enableExtensionUpdateCheck = false; + extensions = + # if unfree + # with pkgs.vscode-marketplace; + with pkgs.open-vsx; [ + vscodevim.vim + jnoortheen.nix-ide + github.github-vscode-theme + rust-lang.rust-analyzer + shd101wyy.markdown-preview-enhanced + fwcd.kotlin + ]; + userSettings = { + "workbench.colorTheme" = "GitHub Dark Default"; + "files.autoSave" = "afterDelay"; + "nix.enableLanguageServer" = true; + "nix.serverPath" = "nil"; + "editor.fontFamily" = "IBM Plex Mono"; + "editor.fontSize" = 16; + "editor.wordWrap" = "on"; - # vim mode settings - "vim.handleKeys" = { - "" = false; # file tree toggle + # vim mode settings + "vim.handleKeys" = { + "" = false; # file tree toggle + }; + "vim.normalModeKeyBindings" = [ + { + "before" = [ ";" ]; + "after" = [ ":" ]; + "silent" = true; + } + ]; + "workbench.startupEditor" = "none"; }; - "vim.normalModeKeyBindings" = [ - { - "before" = [ ";" ]; - "after" = [ ":" ]; - "silent" = true; - } - ]; - "workbench.startupEditor" = "none"; }; }; } diff --git a/home/yt/common.nix b/home/yt/common.nix index 11d8c7c..b7c586e 100644 --- a/home/yt/common.nix +++ b/home/yt/common.nix @@ -58,6 +58,11 @@ }; help.autocorrect = 1; "mergetool \"vimdiff\"".cmd = "nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'"; + url = { + "ssh://git@github.com/" = { + insteadOf = "https://github.com/"; + }; + }; }; }; programs.ripgrep.enable = true; diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 7221f5c..a7f9e52 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -148,22 +148,6 @@ programs.waybar.enable = true; programs.feh.enable = true; - services.mako = { - enable = false; - backgroundColor = "#1a1a1a"; - defaultTimeout = 5000; - borderSize = 0; - borderRadius = 10; - font = "DejaVu Sans Mono 11"; - padding = "10"; - textColor = "#ffffff"; - extraConfig = '' - [urgency=high] - background-color=#c00000 - border-color=#ff0000 - ''; - }; - xdg.configFile = { rofi.source = ../rofi; waybar.source = ../waybar; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index 30a6015..d6bd53e 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -153,7 +153,7 @@ git python3 wl-clipboard - mako + # mako # sway config uses this tree kitty borgbackup