ugh, micro is wrapped with broken wl-clipboard, and overlays don't work with home-manager
This commit is contained in:
parent
08a31cba75
commit
0c8ff82772
4
justfile
4
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=`just remote-current && just _a-remote-label`:
|
||||||
remote-set {{remote}}
|
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:
|
@gorgon:
|
||||||
# https://codeberg.org/gorgon/gorgon/src/branch/main/nix-web
|
# 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
|
# https://discourse.nixos.org/t/a-web-ui-for-the-nix-store-early-beta/35762
|
||||||
|
|
|
@ -1,5 +1,23 @@
|
||||||
{ pkgs, lib, ... }:
|
{ 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 = [
|
imports = [
|
||||||
|
@ -20,19 +38,7 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
#wl-clipboard # https://github.com/bugaevc/wl-clipboard/issues/185
|
wl-clipboard'
|
||||||
(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
|
|
||||||
];
|
|
||||||
})
|
|
||||||
|
|
||||||
discord
|
discord
|
||||||
element-desktop
|
element-desktop
|
||||||
|
@ -40,6 +46,8 @@
|
||||||
#nheko
|
#nheko
|
||||||
#fluffychat
|
#fluffychat
|
||||||
|
|
||||||
|
libreoffice
|
||||||
|
|
||||||
(pkgs.zxtune or unstable.zxtune or null)
|
(pkgs.zxtune or unstable.zxtune or null)
|
||||||
|
|
||||||
f3d
|
f3d
|
||||||
|
|
|
@ -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
|
# TODO: upstream this
|
||||||
imports = [ ../modules/micro.nix ];
|
imports = [ ../modules/micro.nix ];
|
||||||
disabledModules = [ "programs/micro.nix" ];
|
disabledModules = [ "programs/micro.nix" ];
|
||||||
|
|
||||||
home.shellAliases.ed = "$EDITOR"; # ed is the standard editor
|
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.sessionVariables.EDITOR = "micro";
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
micro
|
micro'
|
||||||
aspell
|
aspell
|
||||||
aspellDicts.en
|
aspellDicts.en
|
||||||
aspellDicts.nb
|
aspellDicts.nb
|
||||||
|
|
Loading…
Reference in New Issue