Skip to content

Commit

Permalink
feat(piecyk): various fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ajgon committed Nov 6, 2024
1 parent e05d4c0 commit 46973f2
Show file tree
Hide file tree
Showing 17 changed files with 303 additions and 220 deletions.
5 changes: 5 additions & 0 deletions machines/piecyk/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ rec {
name = "enp6s0";
bridge = true;
};
# ensure that homelab is available even if local DNS dies
extraHosts = ''
10.100.20.1 deedee.home.arpa
'';
};

ssh = {
Expand Down Expand Up @@ -116,6 +120,7 @@ rec {
id = "[email protected]";
}
];
rememberPasswordTime = 28800;
};
ssh = {
appendOptions = {
Expand Down
4 changes: 3 additions & 1 deletion modules/apps/awesome/config/bindings/globalkeys.lua
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ local globalkeys = gears.table.join(
awful.util.spawn(
[[sh -c ']]
.. RC.vars.scrotPath
.. [[ -a "$(]] ..RC.vars.slopPath .. [[ -f "%x,%y,%w,%h")" -f "]]
.. [[ -a "$(]]
.. RC.vars.slopPath
.. [[ -f "%x,%y,%w,%h")" -f "]]
.. home
.. [[/Pictures/Screenshots/%Y-%m-%d-%H%M%S_\$wx\$h_scrot.png"']]
)
Expand Down
2 changes: 2 additions & 0 deletions modules/apps/core.nix
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@
packages = [
pkgs.bzip2
pkgs.dnsutils
pkgs.file
pkgs.jq
pkgs.lsof
pkgs.nh
pkgs.pwgen
pkgs.silver-searcher
Expand Down
1 change: 1 addition & 0 deletions modules/apps/firefox/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ let
# passwords
"signon.autofillForms" = false;
"signon.formlessCapture.enabled" = false;
"signon.rememberSignons" = false;
"network.auth.subresource-http-auth-allow" = 1;

# downloads
Expand Down
2 changes: 1 addition & 1 deletion modules/apps/git/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ in
minus-style = "syntax ${base08-hex}";
plus-emph-style = "bold syntax ${base0B-hex}";
plus-style = "syntax ${base0B-hex}";
syntax-theme = "catppuccin-mocha";
syntax-theme = "base16-stylix";
};
};
};
Expand Down
7 changes: 7 additions & 0 deletions modules/apps/gnupg/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ in
);
default = [ ];
};
rememberPasswordTime = lib.mkOption {
type = lib.types.nullOr lib.types.int;
description = "Time in seconds, which password will be cached by gpg-agent (and not asked again).";
default = null;
example = 3600;
};
};

config = lib.mkIf cfg.enable {
Expand Down Expand Up @@ -89,6 +95,7 @@ in

enable = true;
enableScDaemon = true;
defaultCacheTtl = cfg.rememberPasswordTime;
};

systemd.user.services.gnupg-create-socketdir = lib.mkIf cfg.enableYubikey {
Expand Down
3 changes: 2 additions & 1 deletion modules/apps/kitty/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ in
config = lib.mkIf cfg.enable {
stylix.targets.kitty.enable = true;

home.shellAliases.ssh = "${lib.getExe' config.programs.kitty.package "kitten"} ssh";

programs.kitty = {
enable = true;
shellIntegration = {
Expand All @@ -24,7 +26,6 @@ in

environment = {
LC_ALL = osConfig.i18n.defaultLocale;
TERM = "xterm-256color";
};

font.size = 12;
Expand Down
4 changes: 4 additions & 0 deletions modules/apps/xorg/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
};

home = {
packages = [
pkgs.roboto
];

sessionVariables = {
XCOMPOSECACHE = "${config.xdg.cacheHome}/X11/xcompose";
};
Expand Down
31 changes: 31 additions & 0 deletions modules/apps/yazi/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,37 @@ in
programs.yazi = {
enable = true;
enableZshIntegration = true;
keymap = {
manager = {
prepend_keymap = [
{
on = "d";
run = "remove --permanently";
desc = "Remove permanently.";
}
];
};
};
settings = {
manager = {
ratio = [
1
3
6
];
sort_by = "alphabetical";
sort_sensitive = false;
sort_dir_first = true;
show_hidden = true;
show_symlink = true;
};
preview = {
wrap = "yes";
tab_size = 2;
max_width = 2700;
max_height = 2050;
};
};
};
};
}
Loading

0 comments on commit 46973f2

Please sign in to comment.