Compare commits
10 Commits
7360e32a08
...
ca1311d92a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ca1311d92a | ||
|
|
af57f9cf4c | ||
|
|
781b1c026f | ||
|
|
0f17f017eb | ||
|
|
53b3d7c419 | ||
|
|
7f35d0baed | ||
| 4360067486 | |||
| bc00f7a310 | |||
| 16545b322f | |||
| dafc207f96 |
@ -1,7 +1,5 @@
|
||||
#{- ~/.aliases -}#
|
||||
|
||||
alias vim="nvim "
|
||||
|
||||
#{- FILE OPERATIONS -}#
|
||||
|
||||
# Allow alias expansion for commands executed with sudo
|
||||
@ -40,6 +38,7 @@ alias df="df -h"
|
||||
alias du="du -sh"
|
||||
|
||||
# History searches
|
||||
alias phistory='cat ${PERSISTENT_HISTFILE}'
|
||||
alias hgrep='history | grep --color'
|
||||
alias phgrep="cat ${PERSISTENT_HISTFILE} | grep --color"
|
||||
|
||||
|
||||
34
bash/.bashrc
34
bash/.bashrc
@ -2,31 +2,43 @@
|
||||
|
||||
#{- PROMPT -}#
|
||||
|
||||
red="\001$(tput bold)$(tput setaf 1)\002"
|
||||
green="\001$(tput bold)$(tput setaf 2)\002"
|
||||
yellow="\001$(tput bold)$(tput setaf 3)\002"
|
||||
blue="\001$(tput bold)$(tput setaf 4)\002"
|
||||
magenta="\001$(tput bold)$(tput setaf 5)\002"
|
||||
cyan="\001$(tput bold)$(tput setaf 6)\002"
|
||||
no_color="\001$(tput sgr0)\002"
|
||||
if which tput &> /dev/null && tput bold &> /dev/null; then
|
||||
red="\001$(tput bold)$(tput setaf 1)\002"
|
||||
green="\001$(tput bold)$(tput setaf 2)\002"
|
||||
yellow="\001$(tput bold)$(tput setaf 3)\002"
|
||||
blue="\001$(tput bold)$(tput setaf 4)\002"
|
||||
magenta="\001$(tput bold)$(tput setaf 5)\002"
|
||||
cyan="\001$(tput bold)$(tput setaf 6)\002"
|
||||
no_color="\001$(tput sgr0)\002"
|
||||
else
|
||||
red="\[\033[1;31m\]"
|
||||
green="\[\033[1;32m\]"
|
||||
yellow="\[\033[1;33m\]"
|
||||
blue="\[\033[1;34m\]"
|
||||
magenta="\[\033[1;35m\]"
|
||||
cyan="\[\033[1;36m\]"
|
||||
no_color="\[\033[0m\]"
|
||||
fi
|
||||
|
||||
|
||||
export PS1="${green}\$${no_color} "
|
||||
export DIRENV_PS1="${red}\$${no_color} "
|
||||
if [ "${HOSTNAME}" != "crypt" ] && [ "${HOSTNAME}" != "tomb" ] || [ "${SSH_TTY}" != "" ]; then
|
||||
DIRENV_PS1="${DIRENV_PS1}${blue}${HOSTNAME} ${DIRENV_PS1}"
|
||||
PS1="${PS1}${blue}${HOSTNAME} ${PS1}"
|
||||
DIRENV_PS1="${PS1}${blue}${HOSTNAME} ${PS1}"
|
||||
fi
|
||||
export ORIG_PS1=${PS1}
|
||||
|
||||
update_prompt() {
|
||||
if which direnv &> /dev/null; then
|
||||
update_prompt() {
|
||||
if direnv status | grep -iq 'RC allowed true'; then
|
||||
PS1=${DIRENV_PS1}
|
||||
else
|
||||
PS1=${ORIG_PS1}
|
||||
fi
|
||||
}
|
||||
PROMPT_COMMAND="update_prompt; $PROMPT_COMMAND"
|
||||
}
|
||||
PROMPT_COMMAND="update_prompt; $PROMPT_COMMAND"
|
||||
fi
|
||||
|
||||
# Continuation Prompt: "> " in cyan
|
||||
export PS2="${cyan}>${no_color} "
|
||||
|
||||
@ -21,3 +21,13 @@ cat_with_newline()
|
||||
cat "$@" && echo
|
||||
}
|
||||
alias cat="cat_with_newline"
|
||||
|
||||
vim_option_select()
|
||||
{
|
||||
if which nvim &> /dev/null; then
|
||||
nvim "$@"
|
||||
else
|
||||
vim "$@"
|
||||
fi
|
||||
}
|
||||
alias vim="vim_option_select "
|
||||
|
||||
27
install.sh
27
install.sh
@ -1,14 +1,23 @@
|
||||
#!/usr/bin/env bash
|
||||
# Install my dotfiles on a variety of systems
|
||||
|
||||
echo "CURRENT LOCATION: $PWD"
|
||||
set -ex
|
||||
|
||||
echo "PWD: $PWD"
|
||||
# Coder dotfiles (and most other ways of doing this) will not do a recursive clone, so do that in install script.
|
||||
git submodule init && git submodule update
|
||||
|
||||
# Match case insensitively to make things easier for this part
|
||||
shopt -s nocasematch
|
||||
|
||||
echo "Installing dotfiles..."
|
||||
if [ -f /etc/os-release ]; then
|
||||
echo "Idenitfying OS to install GNU stow..."
|
||||
if grep -q -i debian /etc/os-release; then
|
||||
echo "You've got Debian!";
|
||||
sudo apt update;
|
||||
sudo apt install -y stow;
|
||||
if [ "${CODER_OS_FAMILY:-}" == "Ubuntu" ] || grep -q -i debian /etc/os-release; then
|
||||
echo "Detected OS as Ubuntu, using apt";
|
||||
sudo apt-get update;
|
||||
sudo apt-get install -y stow;
|
||||
installers/install-nix.sh
|
||||
elif grep -q -i rhel /etc/os-release || grep -q -i fedora /etc/os-release; then
|
||||
echo "You've got RedHat (or maybe Fedora)! Which is unsupported right now sorry!";
|
||||
# sudo yum install -y stow;
|
||||
@ -23,11 +32,15 @@ if [ -f /etc/os-release ]; then
|
||||
exit 1;
|
||||
fi;
|
||||
else
|
||||
if [ "${CODER_TEMPLATE_TYPE}" == "Devcontainer" ]; then
|
||||
installers/install-nix.sh
|
||||
fi
|
||||
echo "ERROR: Unable to find '/etc/os-release' information!" 1>&2;
|
||||
exit 1;
|
||||
fi
|
||||
shopt -u nocasematch
|
||||
|
||||
# Apply the dotfiles with stow
|
||||
echo "RUNNING APPLY DOTFILES"
|
||||
echo "Running apply dotfiles"
|
||||
./apply-dotfiles
|
||||
echo "RAN APPLY DOTFILES"
|
||||
echo "Dotfiles applied successfully"
|
||||
|
||||
109
installers/install-nix-packages-flake.sh
Executable file
109
installers/install-nix-packages-flake.sh
Executable file
@ -0,0 +1,109 @@
|
||||
#!/usr/bin/env bash
|
||||
# Installs packages to the nix profile using nix profile
|
||||
# Reference: https://nixos.org/manual/nixpkgs/stable/#sec-declarative-package-management
|
||||
|
||||
set -ex
|
||||
|
||||
nix_packages=(
|
||||
# Personal tools
|
||||
"vimHugeX"
|
||||
"ranger"
|
||||
"jq"
|
||||
"yq"
|
||||
|
||||
# Neovim + Plugin dependencies
|
||||
"neovim"
|
||||
"ripgrep"
|
||||
"fzf"
|
||||
|
||||
# Language servers
|
||||
"helm-ls"
|
||||
"yaml-language-server"
|
||||
"lua-language-server"
|
||||
|
||||
# ProgrammingLanguages
|
||||
"lua52Packages.lua"
|
||||
|
||||
"pass"
|
||||
"gnupg"
|
||||
|
||||
# Professional tools
|
||||
"skopeo"
|
||||
"awscli2"
|
||||
|
||||
"kubectl"
|
||||
"kubernetes-helm"
|
||||
"rancher"
|
||||
|
||||
#"terraform"
|
||||
"opentofu"
|
||||
"terragrunt"
|
||||
)
|
||||
unstable_packages=(
|
||||
# CVE in NixOS stable version of vault
|
||||
"vault"
|
||||
)
|
||||
|
||||
|
||||
mkdir -p ~/.config/nixpkgs/
|
||||
templated_insert=$(for nix_package in ${nix_packages[@]}; do echo " $nix_package"; done)
|
||||
|
||||
|
||||
# Reference: https://discourse.nixos.org/t/nix-profile-in-combination-with-declarative-package-management/21228/9
|
||||
cat << EOF > ~/.config/nixpkgs/flake.nix
|
||||
{
|
||||
description = "A declarative system installation";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; # also possible: nixos-unstable
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs }:
|
||||
let
|
||||
supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
|
||||
|
||||
# Generate a user-friendly version number.
|
||||
version = builtins.substring 0 8 self.lastModifiedDate;
|
||||
|
||||
# Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
|
||||
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
|
||||
|
||||
# Nixpkgs instantiated for supported system types.
|
||||
nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
|
||||
in {
|
||||
packages = forAllSystems (system:
|
||||
let
|
||||
pkgs = nixpkgsFor.\${system};
|
||||
in {
|
||||
default = self.packages.\${system}.myPackageCollection;
|
||||
myPackageCollection = # libs and clis
|
||||
let
|
||||
pkgs = nixpkgs.legacyPackages.\${system}; # here we need just legacy packages
|
||||
in pkgs.buildEnv {
|
||||
name = "myPackages";
|
||||
paths = with pkgs; [
|
||||
${templated_insert}
|
||||
];
|
||||
|
||||
extraOutputsToInstall = [ "man" "doc" ];
|
||||
};
|
||||
}); # packages
|
||||
}; # outputs
|
||||
}
|
||||
EOF
|
||||
|
||||
install_nix_packages()
|
||||
{
|
||||
# The name of the package we are going to install, needed to check for presence/uninstall
|
||||
package_name=packages.x86_64-linux.myPackageCollection
|
||||
if [ "${nix_packages[*]}" ]; then
|
||||
if nix profile list | cut -d' ' -f 2 | grep -q "${package_name}"; then
|
||||
echo "Removing previous version of profile"
|
||||
nix profile remove "${package_name}"
|
||||
fi
|
||||
echo "Installing profile"
|
||||
nix profile install "${HOME}/.config/nixpkgs/flake.nix#myPackageCollection"
|
||||
fi
|
||||
}
|
||||
|
||||
install_nix_packages
|
||||
35
installers/install-nix.sh
Executable file
35
installers/install-nix.sh
Executable file
@ -0,0 +1,35 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Install the Nix package manager as a secondary package manager.
|
||||
# This can sometimes be useful for getting more recent packages.
|
||||
|
||||
set -e
|
||||
set -x
|
||||
|
||||
# Abort installation if Nix is already installed
|
||||
if [ -d /nix ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Download the Nix installer and it's signature from NixOS.org
|
||||
curl -so install-nix https://releases.nixos.org/nix/nix-2.18.1/install
|
||||
|
||||
# Run the installer
|
||||
sh ./install-nix
|
||||
|
||||
# Source the nix profile
|
||||
cat << EOF > ~/.bashrc
|
||||
# Source nix if it's installed
|
||||
if [ -r ~/.nix-profile/etc/profile.d/nix.sh ]; then
|
||||
. ~/.nix-profile/etc/profile.d/nix.sh
|
||||
fi
|
||||
EOF
|
||||
|
||||
# Remove the installer and signature
|
||||
rm -f ./install-nix
|
||||
|
||||
# Enable flakes and the nix command
|
||||
mkdir -p ~/.config/nix
|
||||
cat <<EOF > ~/.config/nix/nix.conf
|
||||
experimental-features = flakes nix-command
|
||||
EOF
|
||||
@ -34,7 +34,8 @@ ls.config.set_config {
|
||||
|
||||
-- Expand if expandable, or jump forward if jumpable
|
||||
-- If neither, do nothing queitly
|
||||
vim.keymap.set({ "i", "s" }, "<C-K>", function()
|
||||
-- vim.keymap.set({ "i", "s" }, "<C-K>", function()
|
||||
vim.keymap.set({ "i", "s" }, "<Tab>", function()
|
||||
if ls.expand_or_jumpable() then
|
||||
ls.expand_or_jump()
|
||||
end
|
||||
@ -42,23 +43,37 @@ end, { silent = true })
|
||||
-- end, { silent = true })
|
||||
|
||||
-- Jump backwards to the previous jumpable point
|
||||
vim.keymap.set({ "i", "s" }, "<C-J>", function()
|
||||
-- vim.keymap.set({ "i", "s" }, "<C-J>", function()
|
||||
vim.keymap.set({ "i", "s" }, "<S-Tab>", function()
|
||||
if ls.jumpable(-1) then
|
||||
ls.jump(-1)
|
||||
end
|
||||
end, { silent = true })
|
||||
|
||||
-- Selecting from a list of options in a choice node
|
||||
vim.keymap.set({ "i" }, "<C-L>", function()
|
||||
-- vim.keymap.set({ "i" }, "<C-L>", function()
|
||||
vim.keymap.set({ "i" }, "<A-Tab>", function()
|
||||
if ls.choice_active() then
|
||||
ls.change_choice(1)
|
||||
end
|
||||
end)
|
||||
|
||||
-- Allow us to hot reload snippets
|
||||
vim.keymap.set("n", "<leader><leader>s", "<cmd>source ~/.config/nvim/lua/user/luasnip.lua<CR>")
|
||||
-- Allow us to hot reload snippets by unloading snippets then resourcing file
|
||||
local ls_cleanup = function()
|
||||
ls.cleanup()
|
||||
vim.cmd("source ~/.config/nvim/lua/user/luasnip.lua")
|
||||
end
|
||||
vim.keymap.set("n", "<leader><leader>s", ls_cleanup)
|
||||
|
||||
ls.add_snippets('lua', {
|
||||
ls.add_snippets(nil, {
|
||||
terraform = {
|
||||
ls.parser.parse_snippet("res", "resource \"$1\" \"$2\" {\n $3\n}"),
|
||||
ls.parser.parse_snippet("dat", "data \"$1\" \"$2\" {\n $3\n}"),
|
||||
ls.parser.parse_snippet("var", "variable \"$1\" {\n type = $2\n description = $3\n}"),
|
||||
ls.parser.parse_snippet("loc", "locals {\n $1\n}"),
|
||||
ls.parser.parse_snippet("mod", "module {\n source = $1\n}"),
|
||||
},
|
||||
lua = {
|
||||
ls.parser.parse_snippet("expand", "-- this is what was expanded!"),
|
||||
ls.parser.parse_snippet("lf", "local $1 = function($2)\n $0\nend"),
|
||||
ls.parser.parse_snippet("mf", "$1.$2 = function($3)\n $0\nend"),
|
||||
@ -79,4 +94,5 @@ ls.add_snippets('lua', {
|
||||
rep(1)
|
||||
})
|
||||
),
|
||||
}
|
||||
})
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user