aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Herklotz <git@yannherklotz.com>2023-03-18 20:36:38 +0000
committerYann Herklotz <git@yannherklotz.com>2023-03-18 20:36:38 +0000
commit8117dd4d63cc064d1c33673442adff0c4b7f5610 (patch)
tree749cc02893775c9b341032f572d1910efdcec5d8
parent18e726ad50063a8f6e9efeafad987ee447bef4d1 (diff)
downloaddotfiles-8117dd4d63cc064d1c33673442adff0c4b7f5610.tar.gz
dotfiles-8117dd4d63cc064d1c33673442adff0c4b7f5610.zip
Add changes to kitty and fish
-rw-r--r--fish/.config/fish/config.fish14
-rw-r--r--kitty/.config/kitty/kitty.conf6
2 files changed, 10 insertions, 10 deletions
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index ad61213..7677763 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -6,7 +6,6 @@ set -x CLICOLOR 1
set -x LEDGER_FILE "$HOME/Dropbox/ledger/main.ledger"
set -x VAGRANT_HOME /mnt/orca/vagrant
set -x QMK_HOME "$HOME/projects/qmk_firmware"
-set -x NIX_IGNORE_SYMLINK_STORE 1
set -x CDS_LIC_FILE 5280@ee-llic01.ee.ic.ac.uk
set -x SNPS_LICENSE_FILE 7182@ee-llic01.ee.ic.ac.uk
@@ -14,17 +13,15 @@ set -x MGLS_LICENSE_FILE 1717@ee-llic01.ee.ic.ac.uk
set -x LM_LICENSE_FILE 2100@ee-llic01.ee.ic.ac.uk:7193@ee-llic01.ee.ic.ac.uk:5280@ee-llic01.ee.ic.ac.uk:7182@ee-llic01.ee.ic.ac.uk:1717@ee-llic01.ee.ic.ac.uk
# nix section
-set -x NIX_LINK $HOME/.nix-profile
-set -x NIX_SSL_CERT_FILE /etc/ssl/certs/ca-certificates.crt
-set -x MANPATH "$NIX_LINK/share/man:$MANPATH"
-set -x PATH "$NIX_LINK/bin:$PATH"
-set -e NIX_LINK
+source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish
+
+fish_add_path $HOME/.nix-profile/bin
+fish_add_path /usr/local/bin
function latestqr -d "Return the string corresponding to the latest QR code."
ls -aS $HOME/Desktop | tail -n1 | tr \\n \\0 | xargs -0 -I% zbarimg --raw -q $HOME/Desktop/%
end
-function open; xdg-open $argv; end
function ll; ls -lah $argv; end
function vim; nvim $argv; end
@@ -33,3 +30,6 @@ if status is-interactive
end
direnv hook fish | source
+
+# opam configuration
+source /Users/ymherklotz/.opam/opam-init/init.fish > /dev/null 2> /dev/null; or true
diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
index 41e84ee..0edc08d 100644
--- a/kitty/.config/kitty/kitty.conf
+++ b/kitty/.config/kitty/kitty.conf
@@ -721,7 +721,7 @@ window_border_width 0.5pt
#: that setting a non-zero window_margin_width overrides this and
#: causes all borders to be drawn.
-window_margin_width 10
+# window_margin_width 10
#: The window margin (in pts) (blank area outside the border). A
#: single value sets all four sides. Two values set the vertical and
@@ -736,7 +736,7 @@ window_margin_width 10
#: set the vertical and horizontal sides. Three values set top,
#: horizontal and bottom. Four values set top, right, bottom and left.
-# window_padding_width 0
+window_padding_width 10
#: The window padding (in pts) (blank area between the text and the
#: window border). A single value sets all four sides. Two values set
@@ -1165,7 +1165,7 @@ tab_bar_style separator
#: Advanced {{{
-# shell .
+shell /usr/local/bin/fish
#: The shell program to execute. The default value of . means to use
#: whatever shell is set as the default shell for the current user.