about summary refs log tree commit diff
path: root/users/riking/dotfiles/fish
diff options
context:
space:
mode:
Diffstat (limited to 'users/riking/dotfiles/fish')
-rw-r--r--users/riking/dotfiles/fish/conf.d/nix-env.fish141
-rw-r--r--users/riking/dotfiles/fish/config.fish8
-rw-r--r--users/riking/dotfiles/fish/fish_variables32
-rw-r--r--users/riking/dotfiles/fish/functions/ddate.fish3
-rw-r--r--users/riking/dotfiles/fish/functions/gh-clone.fish18
-rw-r--r--users/riking/dotfiles/fish/functions/prodaccess.fish6
-rw-r--r--users/riking/dotfiles/fish/functions/reset-audio.fish4
-rw-r--r--users/riking/dotfiles/fish/functions/tvl-push.fish3
8 files changed, 0 insertions, 215 deletions
diff --git a/users/riking/dotfiles/fish/conf.d/nix-env.fish b/users/riking/dotfiles/fish/conf.d/nix-env.fish
deleted file mode 100644
index 6f79f97528..0000000000
--- a/users/riking/dotfiles/fish/conf.d/nix-env.fish
+++ /dev/null
@@ -1,141 +0,0 @@
-# SPDX-License-Identifier: Unlicense
-# https://raw.githubusercontent.com/lilyball/nix-env.fish/master/conf.d/nix-env.fish
-
-# Setup Nix
-
-# We need to distinguish between single-user and multi-user installs.
-# This is difficult because there's no official way to do this.
-# We could look for the presence of /nix/var/nix/daemon-socket/socket but this will fail if the
-# daemon hasn't started yet. /nix/var/nix/daemon-socket will exist if the daemon has ever run, but
-# I don't think there's any protection against accidentally running `nix-daemon` as a user.
-# We also can't just look for /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh because
-# older single-user installs used the default profile instead of a per-user profile.
-# We can still check for it first, because all multi-user installs should have it, and so if it's
-# not present that's a pretty big indicator that this is a single-user install. If it does exist,
-# we still need to verify the install type. To that end we'll look for a root owner and sticky bit
-# on /nix/store. Multi-user installs set both, single-user installs don't. It's certainly possible
-# someone could do a single-user install as root and then manually set the sticky bit but that
-# would be extremely unusual.
-
-set -l nix_profile_path /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
-set -l single_user_profile_path ~/.nix-profile/etc/profile.d/nix.sh
-if test -e $nix_profile_path
-  # The path exists. Double-check that this is a multi-user install.
-  # We can't just check for ~/.nix-profile/… because this may be a single-user install running as
-  # the wrong user.
-
-  # stat is not portable. Splitting the output of ls -nd is reliable on most platforms.
-  set -l owner (string split -n ' ' (ls -nd /nix/store 2>/dev/null))[3]
-  if not test -k /nix/store -a $owner -eq 0
-    # /nix/store is either not owned by root or not sticky. Assume single-user.
-    set nix_profile_path $single_user_profile_path
-  end
-else
-  # The path doesn't exist. Assume single-user
-  set nix_profile_path $single_user_profile_path
-end
-
-if test -e $nix_profile_path
-  # Source the nix setup script
-  # We're going to run the regular Nix profile under bash and then print out a few variables
-  for line in (env -u BASH_ENV bash -c '. "$0"; for name in PATH "${!NIX_@}"; do printf "%s=%s\0" "$name" "${!name}"; done' $nix_profile_path | string split0)
-    set -xg (string split -m 1 = $line)
-  end
-
-  # Insert Nix's fish share directories into fish's special variables.
-  # nixpkgs-installed fish tries to set these up already if NIX_PROFILES is defined, which won't
-  # be the case when sourcing $__fish_data_dir/share/config.fish normally, but might be for a
-  # recursive invocation. To guard against that, we'll only insert paths that don't already exit.
-  # Furthermore, for the vendor_conf.d sourcing, we'll use the pre-existing presence of a path in
-  # $fish_function_path to determine whether we want to source the relevant vendor_conf.d folder.
-
-  # To start, let's locally define NIX_PROFILES if it doesn't already exist.
-  set -al NIX_PROFILES
-  if test (count $NIX_PROFILES) -eq 0
-    set -a NIX_PROFILES $HOME/.nix-profile
-  end
-  # Replicate the logic from nixpkgs version of $__fish_data_dir/__fish_build_paths.fish.
-  set -l __nix_profile_paths (string split ' ' -- $NIX_PROFILES)[-1..1]
-  set -l __extra_completionsdir \
-    $__nix_profile_paths/etc/fish/completions \
-    $__nix_profile_paths/share/fish/vendor_completions.d
-  set -l __extra_functionsdir \
-    $__nix_profile_paths/etc/fish/functions \
-    $__nix_profile_paths/share/fish/vendor_functions.d
-  set -l __extra_confdir \
-    $__nix_profile_paths/etc/fish/conf.d \
-    $__nix_profile_paths/share/fish/vendor_conf.d \
-
-  ### Configure fish_function_path ###
-  # Remove any of our extra paths that may already exist.
-  # Record the equivalent __extra_confdir path for any function path that exists.
-  set -l existing_conf_paths
-  for path in $__extra_functionsdir
-    if set -l idx (contains --index -- $path $fish_function_path)
-      set -e fish_function_path[$idx]
-      set -a existing_conf_paths $__extra_confdir[(contains --index -- $path $__extra_functionsdir)]
-    end
-  end
-  # Insert the paths before $__fish_data_dir.
-  if set -l idx (contains --index -- $__fish_data_dir/functions $fish_function_path)
-    # Fish has no way to simply insert into the middle of an array.
-    set -l new_path $fish_function_path[1..$idx]
-    set -e new_path[$idx]
-    set -a new_path $__extra_functionsdir
-    set fish_function_path $new_path $fish_function_path[$idx..-1]
-  else
-    set -a fish_function_path $__extra_functionsdir
-  end
-
-  ### Configure fish_complete_path ###
-  # Remove any of our extra paths that may already exist.
-  for path in $__extra_completionsdir
-    if set -l idx (contains --index -- $path $fish_complete_path)
-      set -e fish_complete_path[$idx]
-    end
-  end
-  # Insert the paths before $__fish_data_dir.
-  if set -l idx (contains --index -- $__fish_data_dir/completions $fish_complete_path)
-    set -l new_path $fish_complete_path[1..$idx]
-    set -e new_path[$idx]
-    set -a new_path $__extra_completionsdir
-    set fish_complete_path $new_path $fish_complete_path[$idx..-1]
-  else
-    set -a fish_complete_path $__extra_completionsdir
-  end
-
-  ### Source conf directories ###
-  # The built-in directories were already sourced during shell initialization.
-  # Any __extra_confdir that came from $__fish_data_dir/__fish_build_paths.fish was also sourced.
-  # As explained above, we're using the presence of pre-existing paths in $fish_function_path as a
-  # signal that the corresponding conf dir has also already been sourced.
-  # In order to simulate this, we'll run through the same algorithm as found in
-  # $__fish_data_dir/config.fish except we'll avoid sourcing the file if it comes from an
-  # already-sourced location.
-  # Caveats:
-  # * Files will be sourced in a different order than we'd ideally do (because we're coming in
-  #   after the fact to source them).
-  # * If there are existing extra conf paths, files in them may have been sourced that should have
-  #   been suppressed by paths we're inserting in front.
-  # * Similarly any files in $__fish_data_dir/vendor_conf.d that should have been suppressed won't
-  #   have been.
-  set -l sourcelist
-  for file in $__fish_config_dir/conf.d/*.fish $__fish_sysconf_dir/conf.d/*.fish
-    # We know these paths were sourced already. Just record them.
-    set -l basename (string replace -r '^.*/' '' -- $file)
-    contains -- $basename $sourcelist
-    or set -a sourcelist $basename
-  end
-  for root in $__extra_confdir
-    for file in $root/*.fish
-      set -l basename (string replace -r '^.*/' '' -- $file)
-      contains -- $basename $sourcelist
-      and continue
-      set -a sourcelist $basename
-      contains -- $root $existing_conf_paths
-      and continue # this is a pre-existing path, it will have been sourced already
-      [ -f $file -a -r $file ]
-      and source $file
-    end
-  end
-end
diff --git a/users/riking/dotfiles/fish/config.fish b/users/riking/dotfiles/fish/config.fish
deleted file mode 100644
index c2454762bd..0000000000
--- a/users/riking/dotfiles/fish/config.fish
+++ /dev/null
@@ -1,8 +0,0 @@
-set -gx GOPATH "$HOME/go"
-set -gx GPG_TTY (tty)
-set -gx DEPOT_ROOT "$GOPATH/src/code.tvl.fyi"
-
-set -gx PATH '/usr/local/go/bin' "$HOME/.cargo/bin" "$HOME/.rbenv/bin" $PATH
-status --is-interactive; and rbenv init - | source
-source ~/.opsrc.fish # work
-set -gx PATH "$HOME/go/bin" $PATH
diff --git a/users/riking/dotfiles/fish/fish_variables b/users/riking/dotfiles/fish/fish_variables
deleted file mode 100644
index fa8bff919f..0000000000
--- a/users/riking/dotfiles/fish/fish_variables
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file contains fish universal variable definitions.
-# VERSION: 3.0
-SETUVAR __fish_initialized:3100
-SETUVAR fish_color_autosuggestion:555\x1ebrblack
-SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:005fd7
-SETUVAR fish_color_comment:990000
-SETUVAR fish_color_cwd:green
-SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:009900
-SETUVAR fish_color_error:ff0000
-SETUVAR fish_color_escape:00a6b2
-SETUVAR fish_color_history_current:\x2d\x2dbold
-SETUVAR fish_color_host:normal
-SETUVAR fish_color_host_remote:yellow
-SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
-SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:00a6b2
-SETUVAR fish_color_param:00afff
-SETUVAR fish_color_quote:999900
-SETUVAR fish_color_redirection:00afff
-SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_status:red
-SETUVAR fish_color_user:brgreen
-SETUVAR fish_color_valid_path:\x2d\x2dunderline
-SETUVAR fish_greeting:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell\x0aType\x20\x60help\x60\x20for\x20instructions\x20on\x20how\x20to\x20use\x20fish
-SETUVAR fish_key_bindings:fish_default_key_bindings
-SETUVAR fish_pager_color_completion:\x1d
-SETUVAR fish_pager_color_description:B3A06D\x1eyellow
-SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
-SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
diff --git a/users/riking/dotfiles/fish/functions/ddate.fish b/users/riking/dotfiles/fish/functions/ddate.fish
deleted file mode 100644
index 8152d31680..0000000000
--- a/users/riking/dotfiles/fish/functions/ddate.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function ddate --description 'current date in Discourse format'
-    TZ=UTC date '+[date=%Y-%m-%d time=%H:%M:%S timezone=\"%Z\"]'
-end
diff --git a/users/riking/dotfiles/fish/functions/gh-clone.fish b/users/riking/dotfiles/fish/functions/gh-clone.fish
deleted file mode 100644
index 109ec353f6..0000000000
--- a/users/riking/dotfiles/fish/functions/gh-clone.fish
+++ /dev/null
@@ -1,18 +0,0 @@
-function gh-clone --description 'Clone and CD to a github repository'
-    if test (count $argv) -eq 1
-        set user (string split "/" -- $argv[1])[1]
-        set repo (string split "/" -- $argv[1])[2]
-    else
-        set user $argv[1]
-        set repo $argv[2]
-    end
-
-    if test -d "$HOME/go/src/github.com/$user/$repo"
-        cd "$HOME/go/src/github.com/$user/$repo"
-        return 0
-    end
-    mkdir -p "$HOME/go/src/github.com/$user"
-    cd "$HOME/go/src/github.com/$user"
-    git clone "git@github.com:$user/$repo.git"
-    cd "$HOME/go/src/github.com/$user/$repo"
-end
diff --git a/users/riking/dotfiles/fish/functions/prodaccess.fish b/users/riking/dotfiles/fish/functions/prodaccess.fish
deleted file mode 100644
index 876c14c5e3..0000000000
--- a/users/riking/dotfiles/fish/functions/prodaccess.fish
+++ /dev/null
@@ -1,6 +0,0 @@
-function prodaccess
-    ssh-add "$HOME/.ssh/id_ecdsa_sk"
-    begin; ssh-add -L | grep -q 'ZgEu6S3SLatYN'; end || ssh-add "$HOME"/.ssh/id_ed25519
-    begin; ssh-add -L | grep -q 'Gfh2S3kUwZ8A6'; end || ssh-add "$HOME"/.ssh/id_rsa.discourse
-    echo "signing test" | gpg --clearsign > /dev/null
-end
diff --git a/users/riking/dotfiles/fish/functions/reset-audio.fish b/users/riking/dotfiles/fish/functions/reset-audio.fish
deleted file mode 100644
index eb48578a52..0000000000
--- a/users/riking/dotfiles/fish/functions/reset-audio.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function reset-audio --description "Resets pulse and alsa"
-    pulseaudio -k
-    sudo alsa force-reload
-end
diff --git a/users/riking/dotfiles/fish/functions/tvl-push.fish b/users/riking/dotfiles/fish/functions/tvl-push.fish
deleted file mode 100644
index f04ac830c0..0000000000
--- a/users/riking/dotfiles/fish/functions/tvl-push.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function tvl-push
-    git push origin HEAD:refs/for/canon
-end