From 88b2cf0e21794207d68386ae5c2504abad6b0a67 Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Tue, 23 May 2017 12:39:46 +0200 Subject: update guixsd setup guixsd specific environment variables are set with bash. After setting up the environment fish is executed. --- config/fish/config.fish | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'config/fish') diff --git a/config/fish/config.fish b/config/fish/config.fish index d89c8b5..41c71fa 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -1,10 +1,7 @@ # PATH Stuff -# include guix paths -for p in /home/fischerling/.guix-profile/bin /run/setuid-programs /run/current-system/profile/bin /run/current-system/profile/sbin - if test -d $p; and not contains $p $PATH - set PATH $PATH $p - end +if not contains ~/.local/bin $PATH + set PATH ~/.local/bin $PATH end # export the path to our dotfiles @@ -42,12 +39,6 @@ else end end -if not contains ~/.local/bin $PATH - set PATH ~/.local/bin $PATH -end - - - # autoload functions and completions in .dotfiles set fish_function_path $DOTFILES_LOCATION/config/fish/functions $fish_function_path set fish_complete_path $DOTFILES_LOCATION/config/fish/completions $fish_complete_path -- cgit v1.2.3 From f1b85b9997a2235e5e3070268da887e70df7b2ff Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Wed, 24 May 2017 11:48:47 +0200 Subject: export GUIX_PACKAGE_PATH and add current-system to the paths --- config/fish/config.fish | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'config/fish') diff --git a/config/fish/config.fish b/config/fish/config.fish index 41c71fa..10ab766 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -28,7 +28,10 @@ end # guixsd has nether /bin nor /usr # TODO find a better way to check if we are on guixsd if type -q guix - set GUIX_PACKAGE_PATH $DOTFILES_LOCATION/guix/packages + set -x GUIX_PACKAGE_PATH $DOTFILES_LOCATION/guix/packages + # source the system paths + set fish_function_path $fish_function_path /run/current-system/profile/share/fish/functions + set fish_complete_path $fish_complete_path /run/current-system/profile/share/fish/completions else if not contains /bin/core_perl $PATH set PATH /bin/core_perl $PATH -- cgit v1.2.3 From ffcc69d8ba57497efa4461dfccde8e35af4aa3d3 Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Sat, 15 Jul 2017 17:00:38 +0200 Subject: add functions to copy primary to clipboard and vice versa --- config/fish/functions/c2p.fish | 3 +++ config/fish/functions/p2c.fish | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 config/fish/functions/c2p.fish create mode 100644 config/fish/functions/p2c.fish (limited to 'config/fish') diff --git a/config/fish/functions/c2p.fish b/config/fish/functions/c2p.fish new file mode 100644 index 0000000..e84b5e4 --- /dev/null +++ b/config/fish/functions/c2p.fish @@ -0,0 +1,3 @@ +function c2p --description 'Copy clipboard to primary selection' + xclip -o -selection clipboard | xclip -i -selection primary +end diff --git a/config/fish/functions/p2c.fish b/config/fish/functions/p2c.fish new file mode 100644 index 0000000..02072da --- /dev/null +++ b/config/fish/functions/p2c.fish @@ -0,0 +1,3 @@ +function p2c --description 'Copy primary selection to clipboard' + xclip -o -selection primary | xclip -i -selection clipboard +end -- cgit v1.2.3