diff --git a/justfile b/justfile index 13305b6..fb0823d 100644 --- a/justfile +++ b/justfile @@ -55,6 +55,10 @@ push hostname=`just _a-host` cmd=`gum choose test switch boot --header "Select m @remote-set remote=`just remote-current && just _a-remote-label`: remote-set {{remote}} +# TODO: support multiple labels, run in tmux +remote label=`just _a-remote-label` cmd=`printf "just %s\n" $(just --summary --unsorted) | gum filter --placeholder "Pick a recipie..."`: + remote --label={{label}} {{cmd}} + @gorgon: # https://codeberg.org/gorgon/gorgon/src/branch/main/nix-web # https://discourse.nixos.org/t/a-web-ui-for-the-nix-store-early-beta/35762 diff --git a/users/pbsds/home/profiles/desktop.nix b/users/pbsds/home/profiles/desktop.nix index 6a8b9b8..05cfccb 100644 --- a/users/pbsds/home/profiles/desktop.nix +++ b/users/pbsds/home/profiles/desktop.nix @@ -1,5 +1,23 @@ { pkgs, lib, ... }: +let + + # https://github.com/bugaevc/wl-clipboard/issues/185 + wl-clipboard' = pkgs.symlinkJoin { + inherit (pkgs.wl-clipboard) name; + paths = [ + (pkgs.writeShellScriptBin "wl-copy" '' + timeout 0.25s ${lib.getExe' pkgs.wl-clipboard "wl-copy"} "$@" + '') + (pkgs.writeShellScriptBin "wl-paste" '' + timeout 0.25s ${lib.getExe' pkgs.wl-clipboard "wl-paste"} "$@" + '') + pkgs.wl-clipboard + ]; + }; + +in + { imports = [ @@ -20,19 +38,7 @@ ]; home.packages = with pkgs; [ - #wl-clipboard # https://github.com/bugaevc/wl-clipboard/issues/185 - (symlinkJoin { - inherit (wl-clipboard) name; - paths = [ - (writeShellScriptBin "wl-copy" '' - timeout 0.25s ${lib.getExe' wl-clipboard "wl-copy"} "$@" - '') - (writeShellScriptBin "wl-paste" '' - timeout 0.25s ${lib.getExe' wl-clipboard "wl-paste"} "$@" - '') - wl-clipboard - ]; - }) + wl-clipboard' discord element-desktop @@ -40,6 +46,8 @@ #nheko #fluffychat + libreoffice + (pkgs.zxtune or unstable.zxtune or null) f3d diff --git a/users/pbsds/home/profiles/micro.nix b/users/pbsds/home/profiles/micro.nix index d359eab..48cab29 100644 --- a/users/pbsds/home/profiles/micro.nix +++ b/users/pbsds/home/profiles/micro.nix @@ -1,15 +1,38 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: + +let + + # https://github.com/bugaevc/wl-clipboard/issues/185 + wl-clipboard' = pkgs.symlinkJoin { + inherit (pkgs.wl-clipboard) name; + paths = [ + (pkgs.writeShellScriptBin "wl-copy" '' + timeout 0.25s ${lib.getExe' pkgs.wl-clipboard "wl-copy"} "$@" + '') + (pkgs.writeShellScriptBin "wl-paste" '' + timeout 0.25s ${lib.getExe' pkgs.wl-clipboard "wl-paste"} "$@" + '') + pkgs.wl-clipboard + ]; + }; + + micro' = pkgs.micro.override { + wl-clipboard = wl-clipboard'; + }; + +in + { # TODO: upstream this imports = [ ../modules/micro.nix ]; disabledModules = [ "programs/micro.nix" ]; home.shellAliases.ed = "$EDITOR"; # ed is the standard editor - home.shellAliases.de = "$EDITOR"; + home.shellAliases.de = "$EDITOR"; # de is the standard typo home.sessionVariables.EDITOR = "micro"; home.packages = with pkgs; [ - micro + micro' aspell aspellDicts.en aspellDicts.nb