Compare commits

..

3 Commits

3 changed files with 60 additions and 6 deletions

View File

@ -16,5 +16,33 @@ in {
capSysAdmin = true; capSysAdmin = true;
openFirewall = true; openFirewall = true;
settings.sunshine_name = config.mySystem.networking.hostname; settings.sunshine_name = config.mySystem.networking.hostname;
applications.apps = [
{
name = "Desktop";
image-path = "desktop.png";
}
{
name = "Low Res Desktop";
image-path = "desktop.png";
}
{
name = "Steam Big Picture";
detached = ["setsid steam steam://open/bigpicture"];
prep-cmd = {
do = "";
undo = "setsid steam steam://close/bigpicture";
};
image-path = "steam.png";
}
{
name = "OpenTTD";
cmd = "openttd";
image-path = "/home/phundrak/.config/sunshine/covers/igdb_18074.png";
}
{
name = "OpenMW";
cmd = "openmw";
}
];
}; };
} }

View File

@ -55,12 +55,41 @@ in {
backends."ssh.program" = "${pkgs.openssh}/bin/ssh-keygen"; backends."ssh.program" = "${pkgs.openssh}/bin/ssh-keygen";
}; };
aliases = { aliases = {
blame = ["file" "annotate"];
consume = ["squash" "--into" "@" "--from"];
eject = ["squash" "--from" "@" "--into"];
d = ["diff"];
dm = ["desc" "-m"];
l = ["log"]; l = ["log"];
lc = ["log" "-r" "(remote_bookmarks()..@)::"]; lc = ["log" "-r" "(remote_bookmarks()..@)::"];
ll = ["log" "-T" "builtin_log_detailed"];
open = ["log" "-r" "open()"];
n = ["new"]; n = ["new"];
dm = ["desc" "-m"]; nd = ["new" "dev()"];
nt = ["new" "trunk()"];
s = ["show"];
tug = ["bookmark" "move" "--from" "heads(::@- & bookmarks())" "--to" "@-"]; tug = ["bookmark" "move" "--from" "heads(::@- & bookmarks())" "--to" "@-"];
}; };
revset-aliases = {
"user(x)" = "author(x) | committer(x)";
"gh_pages()" = "ancestors(remote_bookmarks(exact:\"gh-pages\"))";
"trunk()" = "latest((present(main) | present(master)) & remote_bookmarks())";
"dev()" = "latest((present(dev) | present(develop)) & remote_bookmarks())";
"wip()" = "description(glob:\"wip:*\")";
"private()" = "description(glob:\"private:*\")";
"blacklist()" = "wip() | private()";
# stack(x, n) is the set of mutable commits reachable from
# 'x', with 'n' parents. 'n' is often useful to customize the
# display and return set for certain operations. 'x' can be
# used to target the set of 'roots' to traverse, e.g. @ is the
# current stack.
"stack()" = "ancestors(reachable(@, mutable()), 2)";
"stack(x)" = "ancestors(reachable(x, mutable()), 2)";
"stack(x, n)" = "ancestors(reachable(x, mutable()), n)";
"open()" = "stack(dev().. & mine(), 1)";
"ready()" = "open() ~ blacklist()::";
};
}; };
}; };
} }

View File

@ -1,10 +1,7 @@
{config, ...}: { {
imports = [../light-home.nix]; imports = [../light-home.nix];
home = { home = {
cli.nh.flake = "/tank/phundrak/nixos"; cli.nh.flake = "/tank/phundrak/nixos";
phundrak.sshKey = { phundrak.sshKey.content = builtins.readFile ../../../keys/id_tilo.pub;
content = builtins.readFile ../../../keys/id_tilo.pub;
# file = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
};
}; };
} }