diff --git a/bootstrap.sh b/bootstrap.sh index db1662e..b1c418e 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,6 +1,5 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p bitwarden-cli git gnupg jq nix -# shellcheck shell=bash # Command failure is script failure set -e @@ -11,6 +10,7 @@ BOLD_GREEN="\e[0;1;32m" RESET="\e[0m" +DEST="$HOME/.config/nixpkgs" BW_SESSION="" warn() { diff --git a/home/zsh/completion-styles.zsh b/home/zsh/completion-styles.zsh index c3d664d..156bc2c 100644 --- a/home/zsh/completion-styles.zsh +++ b/home/zsh/completion-styles.zsh @@ -1,7 +1,4 @@ -# shellcheck shell=bash - # Style the completion a bit -# shellcheck disable=2086,2296 zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS} # Show a prompt on selection zstyle ':completion:*' select-prompt '%SScrolling active: current selection at %p%s' @@ -24,7 +21,6 @@ zstyle ':completion:*:*:(^rm):*:*files' ignored-patterns '*?.o' '*?.c~' '*?.old' # command for process lists, the local web server details and host completion # on processes completion complete all user processes -# shellcheck disable=2016 zstyle ':completion:*:processes' command 'ps -au$USER' # Completion formatting and messages diff --git a/home/zsh/extra-mappings.zsh b/home/zsh/extra-mappings.zsh index 25c230d..3456e13 100644 --- a/home/zsh/extra-mappings.zsh +++ b/home/zsh/extra-mappings.zsh @@ -1,4 +1,4 @@ -# shellcheck shell=bash +# shellcheck disable=2154 # Fix Ctrl+u killing from the cursor instead of the whole line bindkey '^u' backward-kill-line diff --git a/home/zsh/options.zsh b/home/zsh/options.zsh index 32da8d8..82047ff 100644 --- a/home/zsh/options.zsh +++ b/home/zsh/options.zsh @@ -1,5 +1,3 @@ -# shellcheck shell=bash - # Show an error when a globbing expansion doesn't find any match setopt nomatch # List on ambiguous completion and Insert first match immediately diff --git a/hosts/nixos/porthos/install.sh b/hosts/nixos/porthos/install.sh index 8edc175..de87aa7 100644 --- a/hosts/nixos/porthos/install.sh +++ b/hosts/nixos/porthos/install.sh @@ -30,7 +30,6 @@ swapon /dev/sda2 apt install sudo useradd -m -G sudo setupuser -# shellcheck disable=2117 su setupuser cat << EOF @@ -38,7 +37,7 @@ cat << EOF curl -L https://nixos.org/nix/install | sh . $HOME/.nix-profile/etc/profile.d/nix.sh nix-channel --add https://nixos.org/channels/nixos-20.09 nixpkgs -sudo "$(which nixos-generate-config)" --root /mnt +sudo `which nixos-generate-config` --root /mnt # Change uuids to labels vim /mnt/etc/nixos/hardware-configuration.nix