diff --git a/home/home.nix b/home/home.nix index e8e6faf..dcce5af 100644 --- a/home/home.nix +++ b/home/home.nix @@ -127,6 +127,7 @@ let #myNur.lolcommits # from NUR jq age + _1password ]; nixHelpers = [ @@ -284,6 +285,10 @@ in #++ games ++ macosTools ; + + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "1password-cli" + ]; programs.home-manager.enable = true; #programs.home-manager.path = "$HOME/.nix-defexpr/channels/home-manager"; @@ -304,7 +309,64 @@ in # { enable = true; # }; - programs.bat = { + programs.vscode = { + enable = true; + package = pkgs.vscodium; + extensions = with pkgs.vscode-extensions; [ + ms-python.python + vscodevim.vim + yzhang.markdown-all-in-one + bungcip.better-toml + eamodio.gitlens + jnoortheen.nix-ide + mkhl.direnv + # kamadorueda.alejandra + ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + { + name = "Sync-Rsync"; + publisher = "vscode-ext"; + version = "0.36.0"; + sha256 = "sha256-0b/OHLZfXo0NAVAVkzZSqMGDzF0uvPRoiqsZtW1iOdA"; + } + ]; + userSettings = { + "editor.fontLigatures" = true; + "window.autoDetectColorScheme" = true; + "[nix]" = { + "editor.insertSpaces" = true; + "editor.tabSize" = 2; + }; + "editor.fontSize" = 13; + "editor.fontWeight" = "normal"; + "git.detectSubmodulesLimit" = 30; + "[python]" = { + "breadcrumbs.showClasses" = true; + "breadcrumbs.showFunctions" = true; + "gitlens.codeLens.symbolScopes" = [ + "!Module" + ]; + }; + "vim.highlightedyank.enable" = true; + "vim.history" = 500; + "vim.neovimUseConfigFile" = true; + "vim.enableNeovim" = true; + "python.formatting.blackPath" = "/Users/os/.nix-profile/bin/black"; + "git.suggestSmartCommit" = false; + "editor.rulers" = [ 88 ]; + "vim.useSystemClipboard" = true; + "vim.smartRelativeLine" = true; + "diffEditor.ignoreTrimWhitespace" = false; + "files.associations" = { + "*.py" = "python"; + }; + "editor.renderWhitespace" = "all"; + "editor.fontFamily" = "Iosevka Curly Slab, Menlo, Monaco, 'Courier New', monospace"; + "vim.neovimPath" = "/Users/os/.nix-profile/bin/nvim"; + "sync-rsync.options" = []; + }; + }; + +programs.bat = { enable = true; # pinning theme is necessary until iTerm 3.5, because despite the dark terminal background, bat detects light mode and adapts theme config.theme = "Visual Studio Dark+"; @@ -478,5 +540,6 @@ in }; home.sessionVariables = { EDITOR = "nvim"; + BATOU_AGE_IDENTITY_PASSPHRASE="op://Private/SSH key/password"; }; } diff --git a/home/scripts/reporsync.nix b/home/scripts/reporsync.nix index e52479a..0bbef43 100644 --- a/home/scripts/reporsync.nix +++ b/home/scripts/reporsync.nix @@ -36,7 +36,7 @@ _parse_rsync_args() { done # trim CLI parameters - shift "(($OPTIND -1))" + shift "$(($OPTIND -1))" RR_FROM="$1" RR_TO="$2"