diff --git a/bin/lnpromote b/bin/lnpromote new file mode 100755 index 0000000..b2309cc --- /dev/null +++ b/bin/lnpromote @@ -0,0 +1,19 @@ +#!/bin/sh +set -e +for link; do + test -h "$link" || continue + + dir=$(dirname "$link") + reltarget=$(readlink "$link") + case $reltarget in + /*) abstarget=$reltarget;; + *) abstarget=$dir/$reltarget;; + esac + + rm -fv "$link" + cp -afv "$abstarget" "$link" || { + # on failure, restore the symlink + rm -rfv "$link" + ln -sfv "$reltarget" "$link" + } +done \ No newline at end of file diff --git a/config/xsession/xsession.nix b/config/xsession/xsession.nix index 875af2f..0b2233e 100644 --- a/config/xsession/xsession.nix +++ b/config/xsession/xsession.nix @@ -12,6 +12,8 @@ initExtra = '' +export PATH="$HOME/.config/nixpkgs/nix-dotfiles/bin:$PATH" + export XDG_CURRENT_DESKTOP=kde export DESKTOP_SESSION=kde diff --git a/config/xsession/zsh/zsh.nix b/config/xsession/zsh/zsh.nix index dc160e4..c349866 100644 --- a/config/xsession/zsh/zsh.nix +++ b/config/xsession/zsh/zsh.nix @@ -41,10 +41,11 @@ POWERLEVEL9K_SHORTEN_DELIMITER=".." POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX="↱" POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX="↳ " - export MATRIXDEV_HOMESERVER="https://matrix.dodsorf.as" export ***REMOVED*** +export FV_KUBECONFIG="$HOME/.kube/config-fv" + eval "$(ntfy shell-integration)" AUTO_NTFY_DONE_IGNORE="vim nano screen tmux man mpv nmtui" diff --git a/home.nix b/home.nix index 97f9b39..05a3cea 100644 --- a/home.nix +++ b/home.nix @@ -14,8 +14,6 @@ pkgs.virtmanager pkgs.ansible pkgs.nixops - pkgs.kubectl - pkgs.kubernetes-helm pkgs.ldns pkgs.steam @@ -64,6 +62,7 @@ pkgs.frei0r pkgs.mkvtoolnix + pkgs.youtubeDL pkgs.ffmpeg-full pkgs.geogebra diff --git a/scripts/riot-im-logo-1.png b/scripts/riot-im-logo-1.png deleted file mode 100644 index 768679d..0000000 Binary files a/scripts/riot-im-logo-1.png and /dev/null differ diff --git a/scripts/server b/scripts/server deleted file mode 100644 index 4d98b5b..0000000 --- a/scripts/server +++ /dev/null @@ -1,3 +0,0 @@ -{ - "m.server": "matrix.folkeverkstedet.com:8448" -}