Compare commits
2 commits
bd66f82a7e
...
68aa7a16f8
| Author | SHA1 | Date | |
|---|---|---|---|
| 68aa7a16f8 | |||
| 70e4a4d452 |
3 changed files with 17 additions and 5 deletions
|
|
@ -24,6 +24,14 @@ let
|
||||||
emoji_picker = "${pkgs.bemoji}/bin/bemoji -t";
|
emoji_picker = "${pkgs.bemoji}/bin/bemoji -t";
|
||||||
terminal = "${pkgs.kitty}/bin/kitty";
|
terminal = "${pkgs.kitty}/bin/kitty";
|
||||||
|
|
||||||
|
layout_toggle_script = pkgs.writeShellScriptBin "layout-toggle" ''
|
||||||
|
current_layout="$(${pkgs.hyprland}/bin/hyprctl getoption general:layout -j | ${pkgs.jq}/bin/jq -r .str)"
|
||||||
|
case "$current_layout" in
|
||||||
|
master) ${pkgs.hyprland}/bin/hyprctl -q keyword general:layout dwindle ;;
|
||||||
|
dwindle) ${pkgs.hyprland}/bin/hyprctl -q keyword general:layout master ;;
|
||||||
|
esac
|
||||||
|
'';
|
||||||
|
|
||||||
generate_grim_command = target: ''
|
generate_grim_command = target: ''
|
||||||
exec mkdir -p ~/screenshots \
|
exec mkdir -p ~/screenshots \
|
||||||
&& ${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)" \
|
&& ${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)" \
|
||||||
|
|
@ -147,6 +155,11 @@ in
|
||||||
preserve_split = true;
|
preserve_split = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Master layout
|
||||||
|
master = {
|
||||||
|
orientation = "center";
|
||||||
|
};
|
||||||
|
|
||||||
# Window rules
|
# Window rules
|
||||||
windowrule = [
|
windowrule = [
|
||||||
"suppress_event maximize, match:class .*"
|
"suppress_event maximize, match:class .*"
|
||||||
|
|
@ -208,6 +221,7 @@ in
|
||||||
"$mod SHIFT, o, movetoworkspace, 9"
|
"$mod SHIFT, o, movetoworkspace, 9"
|
||||||
|
|
||||||
# Layout
|
# Layout
|
||||||
|
"$mod, g, exec, ${layout_toggle_script}/bin/layout-toggle"
|
||||||
"$mod, v, togglesplit"
|
"$mod, v, togglesplit"
|
||||||
"$mod, f, fullscreen"
|
"$mod, f, fullscreen"
|
||||||
"$mod SHIFT, f, togglefloating"
|
"$mod SHIFT, f, togglefloating"
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,6 @@ let
|
||||||
;
|
;
|
||||||
|
|
||||||
cfg = config.aa.nix;
|
cfg = config.aa.nix;
|
||||||
selfHostedCacheHost = "https://cache.kilonull.com/";
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.aa.nix = {
|
options.aa.nix = {
|
||||||
|
|
@ -72,13 +71,12 @@ in
|
||||||
if cfg.useSelfhostedCache then
|
if cfg.useSelfhostedCache then
|
||||||
[
|
[
|
||||||
# TESTING
|
# TESTING
|
||||||
"https://minio.kilonull.com/nix-store"
|
"https://attic.kilonull.com/nixosConfigs"
|
||||||
selfHostedCacheHost
|
|
||||||
]
|
]
|
||||||
else
|
else
|
||||||
[ ];
|
[ ];
|
||||||
trusted-public-keys = mkIf cfg.useSelfhostedCache [
|
trusted-public-keys = mkIf cfg.useSelfhostedCache [
|
||||||
"gospelCache:9cbn8Wm54BbwpPS0TXw+15wrYZBpfOJt4Fzfbfcq/pc="
|
"nixosConfigs:mjWq+JcnAqwT20OZSsrh9od6LTNn8U3cYdaXhqhDqP0="
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
aa = {
|
aa = {
|
||||||
nix = {
|
nix = {
|
||||||
enable = true;
|
enable = true;
|
||||||
useSelfhostedCache = false;
|
useSelfhostedCache = true;
|
||||||
remoteBuilder.client.enable = false;
|
remoteBuilder.client.enable = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue