maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Less shooting myself in the foot

Browse source
This commit is contained in:
Malte 2022-12-12 13:07:25 +01:00
parent 1eb3b90be3
commit 6572200ad1
5 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
home-manager/roles/gnome.nix
View file

@ -167,12 +167,12 @@ in {
};
"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/terminal" = {
binding = "<Super>Return";
command = "footclient";
command = "foot";
name = "Terminal";
};
"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/hotkeys" = {
binding = "<Super>space";
command = "footclient ${pkgs.wizards-dialog}/bin/hotkeys ${pkgs.writeText "hotkeys.yaml" (builtins.toJSON hotkeys)}";
command = "foot ${pkgs.wizards-dialog}/bin/hotkeys ${pkgs.writeText "hotkeys.yaml" (builtins.toJSON hotkeys)}";
name = "Hotkeys";
};
"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/standby" = {

2
home-manager/roles/home-options.nix
View file

@ -3,7 +3,7 @@
m-0 = {
hostName = lib.mkOption {type = lib.types.str;};
terminal = lib.mkOption {
default = "footclient";
default = "foot";
type = lib.types.str;
};
colors = lib.mkOption {

6
home-manager/roles/hotkeys.nix
View file

@ -1,7 +1,7 @@
{pkgs, ...}: let
fork = cmd: "fork ${cmd}";
edit_dir = dir: "sh -c 'cd ${dir}; hx ${dir}'";
with-mic-check = cmd: fork "sh -c 'footclient mic-check; ${cmd}'";
with-mic-check = cmd: fork "sh -c 'foot mic-check; ${cmd}'";
in [
{
Orga = [
@ -19,7 +19,7 @@ in [
Zotero = fork "zotero";
Open = fork "evince ~/git/promotion/out/print.pdf";
Build = "sh -c 'cd ~/git/promotion; nix develop -c nix run'";
Directory = fork "footclient -d ~/git/promotion";
Directory = fork "foot -d ~/git/promotion";
Edit = edit_dir "~/git/promotion";
};
}
@ -71,7 +71,7 @@ in [
Editor = fork "kitty";
Config = edit_dir "~/git/config";
Files = fork "nautilus";
DarkTerminal = fork "footclient -o 'color.background=000000' -o 'foreground=ffffff'";
DarkTerminal = fork "foot -o 'colors.background=000000' -o 'colors.foreground=ffffff'";
Accounting = {
Update = "nix run ./git/buchhaltung#update";
Display = "hledger -f ~/git/buchhaltung/buchhaltung.journal ui -- --watch --theme=terminal -X€ -t -E";

2
home-manager/roles/hourly-maintenance.nix
View file

@ -12,7 +12,7 @@
echo "Git repo up-to-date, not doing anything."
exit 0;
else
${pkgs.foot}/bin/footclient --hold ${config.home.profileDirectory}/bin/maintenance
${pkgs.foot}/bin/foot --hold ${config.home.profileDirectory}/bin/maintenance
fi
'';
in {

10
home-manager/roles/terminal.nix
View file

@ -1,17 +1,13 @@
{pkgs, ...}: let
my-lib = import ../../lib;
theme = my-lib.themes.default;
in {
home.sessionVariables.TERMINAL = "${pkgs.foot}/bin/footclient";
{pkgs, ...}: {
home.sessionVariables.TERMINAL = "${pkgs.foot}/bin/foot";
home.packages = [
(pkgs.runCommandLocal "fake-gnome-terminal" {} ''
mkdir -p $out/bin
ln -s ${pkgs.foot}/bin/footclient $out/bin/gnome-terminal
ln -s ${pkgs.foot}/bin/foot $out/bin/gnome-terminal
'')
];
programs.foot = {
enable = true;
server.enable = true;
settings = {
csd = {
preferred = "client";