diff --git a/users/pbsds/default.nix b/users/pbsds/default.nix index 6e08c0c..b7659b1 100644 --- a/users/pbsds/default.nix +++ b/users/pbsds/default.nix @@ -7,7 +7,7 @@ edir xclip fzf - rmate-sh + rmate-sh # TODO: add to ssh config vimix-gtk-themes flat-remix-icon-theme diff --git a/users/pbsds/home/default.nix b/users/pbsds/home/default.nix index fdf5f44..6cc29f6 100644 --- a/users/pbsds/home/default.nix +++ b/users/pbsds/home/default.nix @@ -4,23 +4,13 @@ imports = [ ./minimal.nix ./profiles/gtk.nix + # ./profiles/beets.nix ./profiles/ast-grep.nix ./profiles/desktop/zed/remote.nix # lsps for remote zed development ]; - # TODO: add remote-exec once packaged - programs.bash.initExtra = '' - # remote-exec - if command -v remote >/dev/null && command -v remote-quick >/dev/null; then - complete -F _command remote - complete -F _command remote-quick - fi - ''; - home.packages = with pkgs; [ xclip - #rmate-sh # TODO: add to ssh config - #remote-exec # TODO shpool @@ -84,45 +74,13 @@ ])) ]; + xdg.enable = true; + #TODO: xdg.desktopEntries + xdg.configFile."ptpython/config.py" = { source = ./files/ptpython-config.py; force = true; }; - home.shellAliases = { - flexget = "ssh -t noximilien sudo --user=flexget flexget -c /var/lib/flexget/flexget.yml"; # TODO: only applies to nox... - # hman = "man -H "; # HTML opened in a browser - tmux = "systemd-run --scope --user tmux"; # detach from ssh scope, surviving logout - /* shpool = "systemd-run --scope --user shpool"; # detach from ssh scope, surviving logout */ - - #TODO: vpn - - # TODO: ps1? - pwd-fqdn = ''echo "$(whoami)@$(hostname -f):$(printf "%q" "$(realpath .)/")"''; - - killall = "killall -v"; - - # bin = "python -c 'import sys; sys.stdout.write(sys.stdin.read().strip())' | curl -is -X POST https://i.kuklef.se/upload -F content=@- -F expiration=10d | grep '^location:' | cut -d' ' -f2-"; - bin = "${lib.getExe pkgs.netcat} termbin.com 9999"; - - }; - - xdg.enable = true; - #TODO: xdg.desktopEntries - - /** / - programs.beets = { - enable = true; - settings = { - directory = "/mnt/meconium/beets_preprocessed/data"; - #library = "/mnt/meconium/beets_preprocessed/library.db"; - library = "${config.xdg.configHome}/beets/library_preprocessed.db"; - - #directory = "/mnt/meconium/beets_music/library"; - #library = "${config.xdg.configHome}/beets/library_meconium.db"; - ##library = "/mnt/meconium/beets_music/data.db"; - }; - }; - /**/ } diff --git a/users/pbsds/home/profiles/beets.nix b/users/pbsds/home/profiles/beets.nix new file mode 100644 index 0000000..8cec58b --- /dev/null +++ b/users/pbsds/home/profiles/beets.nix @@ -0,0 +1,17 @@ +{ config, ... }: +{ + /** / + programs.beets = { + enable = true; + settings = { + directory = "/mnt/meconium/beets_preprocessed/data"; + #library = "/mnt/meconium/beets_preprocessed/library.db"; + library = "${config.xdg.configHome}/beets/library_preprocessed.db"; + + #directory = "/mnt/meconium/beets_music/library"; + #library = "${config.xdg.configHome}/beets/library_meconium.db"; + ##library = "/mnt/meconium/beets_music/data.db"; + }; + }; + /**/ +} diff --git a/users/pbsds/home/profiles/desktop/default.nix b/users/pbsds/home/profiles/desktop/default.nix index 34c79c1..8db87b8 100644 --- a/users/pbsds/home/profiles/desktop/default.nix +++ b/users/pbsds/home/profiles/desktop/default.nix @@ -25,6 +25,15 @@ pkgs.zotero.name ]; + # TODO: add remote-exec once packaged + programs.bash.initExtra = '' + # remote-exec + if command -v remote >/dev/null && command -v remote-quick >/dev/null; then + complete -F _command remote + complete -F _command remote-quick + fi + ''; + home.packages = with pkgs; [ wl-clipboard-timeout diff --git a/users/pbsds/home/profiles/shell.nix b/users/pbsds/home/profiles/shell.nix index f523f2e..48ab027 100644 --- a/users/pbsds/home/profiles/shell.nix +++ b/users/pbsds/home/profiles/shell.nix @@ -122,6 +122,22 @@ in programs.tealdeer.enable = true; programs.tealdeer.settings.updates.auto_update = true; + + home.shellAliases.flexget = "ssh -t noximilien sudo --user=flexget flexget -c /var/lib/flexget/flexget.yml"; # TODO: only applies to nox... + # home.shellAliases.hman = "man -H "; # HTML opened in a browser + home.shellAliases.tmux = "systemd-run --scope --user tmux"; # detach from ssh scope, surviving logout + /* home.shellAliases.shpool = "systemd-run --scope --user shpool"; # detach from ssh scope, surviving logout */ + + #TODO: vpn + + # TODO: ps1? + home.shellAliases.pwd-fqdn = ''echo "$(whoami)@$(hostname -f):$(printf "%q" "$(realpath .)/")"''; + + home.shellAliases.killall = "killall -v"; + + # bin = "python -c 'import sys; sys.stdout.write(sys.stdin.read().strip())' | curl -is -X POST https://i.kuklef.se/upload -F content=@- -F expiration=10d | grep '^location:' | cut -d' ' -f2-"; + home.shellAliases.bin = "${lib.getExe pkgs.netcat} termbin.com 9999"; + # old alias, just learn to use ncdu lol home.shellAliases.dush = "du -shc * | sort -h"; home.shellAliases.dushd = "du -shc * .[!.]?* | sort -h";