Compare commits
11 Commits
weekly-202
...
143187e171
| Author | SHA1 | Date | |
|---|---|---|---|
| 143187e171 | |||
| ec57fb1611 | |||
| e4d8b16ee6 | |||
| b915571fb2 | |||
| f92834e4de | |||
| 3988202916 | |||
| 971d7d1d93 | |||
| e63a0590b4 | |||
| 771b7b1a42 | |||
| acdc0fb0eb | |||
| ab8d8f068d |
4
.gitignore
vendored
4
.gitignore
vendored
@@ -2,3 +2,7 @@
|
|||||||
config.el
|
config.el
|
||||||
*.qcow2
|
*.qcow2
|
||||||
result
|
result
|
||||||
|
# Prevent accidentally committing unencrypted secrets
|
||||||
|
**/secrets/*.yaml.dec
|
||||||
|
**/*-decrypted.*
|
||||||
|
**/temp-secrets.*
|
||||||
|
|||||||
@@ -25,6 +25,13 @@ creation_rules:
|
|||||||
- *workstation
|
- *workstation
|
||||||
- *server
|
- *server
|
||||||
- *miniserver
|
- *miniserver
|
||||||
|
- path_regex: secrets/gallery.yaml$
|
||||||
|
key_groups:
|
||||||
|
- age:
|
||||||
|
- *devkey
|
||||||
|
- *workstation
|
||||||
|
- *server
|
||||||
|
- *miniserver
|
||||||
- path_regex: secrets/wireguard.yaml$
|
- path_regex: secrets/wireguard.yaml$
|
||||||
key_groups:
|
key_groups:
|
||||||
- age:
|
- age:
|
||||||
|
|||||||
@@ -78,6 +78,7 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
nix = {
|
nix = {
|
||||||
|
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
|
||||||
distributedBuilds = true;
|
distributedBuilds = true;
|
||||||
optimise.automatic = true;
|
optimise.automatic = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|||||||
@@ -46,8 +46,13 @@ in
|
|||||||
};
|
};
|
||||||
git = {
|
git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
delta.enable = true;
|
||||||
userName = "Danilo Reyes";
|
userName = "Danilo Reyes";
|
||||||
userEmail = "CaptainJawZ@protonmail.com";
|
userEmail = "CaptainJawZ@protonmail.com";
|
||||||
|
extraConfig = {
|
||||||
|
init.defaultBranch = "main";
|
||||||
|
pull.rebase = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
bash = lib.mkIf (shellType == "bash") {
|
bash = lib.mkIf (shellType == "bash") {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
@@ -38,5 +38,10 @@ _final: prev: {
|
|||||||
waybar = prev.waybar.overrideAttrs (old: {
|
waybar = prev.waybar.overrideAttrs (old: {
|
||||||
mesonFlags = old.mesonFlags ++ [ "-Dexperimental=true" ];
|
mesonFlags = old.mesonFlags ++ [ "-Dexperimental=true" ];
|
||||||
});
|
});
|
||||||
inherit (pkgsU) symbola mealie flaresolver;
|
inherit (pkgsU)
|
||||||
|
symbola
|
||||||
|
mealie
|
||||||
|
flaresolver
|
||||||
|
deadnix
|
||||||
|
;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
};
|
};
|
||||||
bluesky = {
|
bluesky = {
|
||||||
username = "blablablamagic.bsky.social";
|
username = "blablablamagic.bsky.social";
|
||||||
password = "bb3m-xr4w-4vgf-oxmi";
|
password = "{env[GALLERY_DL_BLUESKY_PASSWORD]}";
|
||||||
reposts = false;
|
reposts = false;
|
||||||
videos = true;
|
videos = true;
|
||||||
directory = [ "{author['handle']}" ];
|
directory = [ "{author['handle']}" ];
|
||||||
@@ -30,8 +30,8 @@
|
|||||||
};
|
};
|
||||||
flickr = {
|
flickr = {
|
||||||
size-max = "Original";
|
size-max = "Original";
|
||||||
access-token = "72157720915197374-51a26dc4fdfdf173";
|
access-token = "{env[GALLERY_DL_FLICKR_ACCESS_TOKEN]}";
|
||||||
access-token-secret = "a1ddb10902f3fa85";
|
access-token-secret = "{env[GALLERY_DL_FLICKR_ACCESS_TOKEN_SECRET]}";
|
||||||
directory = [
|
directory = [
|
||||||
"{category}"
|
"{category}"
|
||||||
"{owner[username]}"
|
"{owner[username]}"
|
||||||
@@ -84,19 +84,19 @@
|
|||||||
"{title}"
|
"{title}"
|
||||||
];
|
];
|
||||||
tumblr = {
|
tumblr = {
|
||||||
access-token = "5VwIW8TNBoNVPo9CzvKMza2wcn9gJXd6rnUBy6Ctqb4BCPpI59";
|
access-token = "{env[GALLERY_DL_TUMBLR_ACCESS_TOKEN]}";
|
||||||
access-token-secret = "8krZGeauA171aZpXZhwgZN8nZCxKQkXYKXWL473mTQPKrqoP3e";
|
access-token-secret = "{env[GALLERY_DL_TUMBLR_ACCESS_TOKEN_SECRET]}";
|
||||||
external = true;
|
external = true;
|
||||||
inline = true;
|
inline = true;
|
||||||
posts = "all";
|
posts = "all";
|
||||||
reblogs = false;
|
reblogs = false;
|
||||||
parent-directory = true;
|
parent-directory = true;
|
||||||
api-key = "uhBUtgPaX9gl7eaD8suGWW6ZInRedQoVT6xsZzopljy0jXHqm5";
|
api-key = "{env[GALLERY_DL_TUMBLR_API_KEY]}";
|
||||||
api-secret = "D3FDj1INyPzXikVpp4jmzSqjlC9czFUQ8oj2I883PSYJdqwURv";
|
api-secret = "{env[GALLERY_DL_TUMBLR_API_SECRET]}";
|
||||||
directory = [ "{blog_name}" ];
|
directory = [ "{blog_name}" ];
|
||||||
};
|
};
|
||||||
deviantart = {
|
deviantart = {
|
||||||
refresh-token = "4364d30b6f3777b3c5c1ab2c1c428b0245272ebe";
|
refresh-token = "{env[GALLERY_DL_DEVIANTART_REFRESH_TOKEN]}";
|
||||||
include = "gallery,scraps";
|
include = "gallery,scraps";
|
||||||
flat = true;
|
flat = true;
|
||||||
original = true;
|
original = true;
|
||||||
@@ -139,7 +139,7 @@
|
|||||||
reddit = {
|
reddit = {
|
||||||
user-agent = "Python:gallery-dl:v1.0 (by /u/captainjawz)";
|
user-agent = "Python:gallery-dl:v1.0 (by /u/captainjawz)";
|
||||||
client-id = "T7nZ6WZ3_onJWBhLP8r08g";
|
client-id = "T7nZ6WZ3_onJWBhLP8r08g";
|
||||||
refresh-token = "184157546842-UHdPQX1c7kG1kbO09NAHY2O2taEiwg";
|
refresh-token = "{env[GALLERY_DL_REDDIT_REFRESH_TOKEN]}";
|
||||||
parent-directory = true;
|
parent-directory = true;
|
||||||
directory = [ "{author}" ];
|
directory = [ "{author}" ];
|
||||||
};
|
};
|
||||||
@@ -162,7 +162,7 @@
|
|||||||
];
|
];
|
||||||
baraag.directory = [ "{account[username]}" ];
|
baraag.directory = [ "{account[username]}" ];
|
||||||
pixiv = {
|
pixiv = {
|
||||||
refresh-token = "O4kc9tTzGItuuacDcfmevW6NELjm5CJdWiAbZdUv3Kk";
|
refresh-token = "{env[GALLERY_DL_PIXIV_REFRESH_TOKEN]}";
|
||||||
directory = [ "{user[account]} - {user[id]}" ];
|
directory = [ "{user[account]} - {user[id]}" ];
|
||||||
ugoira = true;
|
ugoira = true;
|
||||||
favorite.directory = [
|
favorite.directory = [
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
|
qt.enable = true;
|
||||||
services = {
|
services = {
|
||||||
gvfs.enable = true;
|
gvfs.enable = true;
|
||||||
libinput.enable = true;
|
libinput.enable = true;
|
||||||
@@ -32,7 +33,6 @@
|
|||||||
totem
|
totem
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
qt.enable = true;
|
|
||||||
users.users.jawz.packages = builtins.attrValues {
|
users.users.jawz.packages = builtins.attrValues {
|
||||||
inherit (pkgs.gnomeExtensions)
|
inherit (pkgs.gnomeExtensions)
|
||||||
tactile # window manager
|
tactile # window manager
|
||||||
|
|||||||
@@ -1,13 +1,36 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
|
config,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
startupScript = pkgs.pkgs.writeShellScriptBin "start" ''
|
# misc
|
||||||
${pkgs.waybar}/bin/waybar &
|
mod = "SUPER";
|
||||||
${pkgs.swww}/bin/swww init &
|
# waybar
|
||||||
sleep 1
|
inherit (config.lib.stylix) colors;
|
||||||
'';
|
net-icons = [
|
||||||
|
""
|
||||||
|
""
|
||||||
|
""
|
||||||
|
""
|
||||||
|
""
|
||||||
|
];
|
||||||
|
generic-percent-icons = [
|
||||||
|
"▁"
|
||||||
|
"▂"
|
||||||
|
"▃"
|
||||||
|
"▄"
|
||||||
|
"▅"
|
||||||
|
"▆"
|
||||||
|
"▇"
|
||||||
|
"█"
|
||||||
|
];
|
||||||
|
temp-icons = [
|
||||||
|
""
|
||||||
|
""
|
||||||
|
""
|
||||||
|
""
|
||||||
|
];
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
programs.hyprland.enable = true;
|
programs.hyprland.enable = true;
|
||||||
@@ -22,35 +45,144 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
extraPortals = [
|
extraPortals = [
|
||||||
pkgs.xdg-desktop-portal-hyprland
|
pkgs.xdg-desktop-portal-hyprland
|
||||||
# pkgs.xdg-desktop-portal-gtk
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
users.users.jawz.packages = builtins.attrValues {
|
users.users.jawz.packages = builtins.attrValues {
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
# Wayland utilities
|
# Wayland utilities
|
||||||
wl-clipboard
|
wl-clipboard-rs
|
||||||
wf-recorder
|
wf-recorder
|
||||||
grim
|
grimblast # screenshots
|
||||||
slurp
|
|
||||||
|
|
||||||
wofi # Application launcher
|
mako # notification daemon
|
||||||
mako # Notification daemon
|
|
||||||
libnotify # dependency of mako
|
libnotify # dependency of mako
|
||||||
swaylock-effects # Screen locker
|
swaylock-effects # screen locker
|
||||||
# nautilus # File manager
|
yazi # file manager
|
||||||
|
imv # images
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
home-manager.users.jawz = {
|
home-manager.users.jawz = {
|
||||||
programs.kitty.enable = true;
|
programs = {
|
||||||
|
wofi = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
allow_images = true;
|
||||||
|
allow_markup = true;
|
||||||
|
insensitive = true;
|
||||||
|
width = "30%";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
waybar = {
|
||||||
|
enable = true;
|
||||||
|
systemd.enable = true;
|
||||||
|
settings.main-bar = {
|
||||||
|
layer = "top";
|
||||||
|
tray.spacing = 5;
|
||||||
|
clock.format = "{:%H:%M %F}";
|
||||||
|
modules-left = [
|
||||||
|
"niri/workspaces"
|
||||||
|
"custom/sep"
|
||||||
|
"niri/window"
|
||||||
|
];
|
||||||
|
modules-center = [
|
||||||
|
"mpris"
|
||||||
|
];
|
||||||
|
modules-right = [
|
||||||
|
"cpu"
|
||||||
|
"temperature"
|
||||||
|
"memory"
|
||||||
|
"backlight"
|
||||||
|
"pulseaudio"
|
||||||
|
"battery"
|
||||||
|
"custom/recorder"
|
||||||
|
"clock"
|
||||||
|
"tray"
|
||||||
|
];
|
||||||
|
"hyprland/window".icon = true;
|
||||||
|
"niri/window".icon = true;
|
||||||
|
"niri/workspaces" = {
|
||||||
|
format = "{icon}";
|
||||||
|
format-icons = {
|
||||||
|
active = "";
|
||||||
|
default = "";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
cava = {
|
||||||
|
format-icons = generic-percent-icons;
|
||||||
|
bars = 14;
|
||||||
|
method = "pulse";
|
||||||
|
framerate = 20;
|
||||||
|
bar_delimiter = 0;
|
||||||
|
stereo = false;
|
||||||
|
};
|
||||||
|
network = {
|
||||||
|
format = "{icon} {ipaddr}";
|
||||||
|
format-icons = net-icons;
|
||||||
|
};
|
||||||
|
# pulseaudio = {
|
||||||
|
# format = "{icon} {volume}%";
|
||||||
|
# format-muted = "vol: muted";
|
||||||
|
# format-icons.default = audio-icons;
|
||||||
|
# on-click = "pavucontrol";
|
||||||
|
# scroll-step = 1;
|
||||||
|
# };
|
||||||
|
cpu = {
|
||||||
|
interval = 1;
|
||||||
|
format = " {icon}";
|
||||||
|
format-icons = generic-percent-icons;
|
||||||
|
tooltip-format = "usage: {usage}%\nload: {load}";
|
||||||
|
};
|
||||||
|
memory = {
|
||||||
|
interval = 1;
|
||||||
|
format = " {icon}";
|
||||||
|
format-icons = generic-percent-icons;
|
||||||
|
tooltip-format = "{used} GiB / {total} GiB \n{percentage}%";
|
||||||
|
};
|
||||||
|
temperature = {
|
||||||
|
interval = 1;
|
||||||
|
critical-threshold = 80;
|
||||||
|
format = "{temperatureC}°C";
|
||||||
|
format-icons = temp-icons;
|
||||||
|
};
|
||||||
|
mpris = {
|
||||||
|
format = "{status_icon} {dynamic}";
|
||||||
|
dynamic-len = 60;
|
||||||
|
interval = 5;
|
||||||
|
status-icons = {
|
||||||
|
paused = "";
|
||||||
|
playing = "";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
style = ''
|
||||||
|
* {
|
||||||
|
border: none;
|
||||||
|
font-family: "${config.stylix.fonts.monospace.name}";
|
||||||
|
font-size: ${toString config.stylix.fonts.sizes.desktop}pt;
|
||||||
|
color: #${colors.base04};
|
||||||
|
}
|
||||||
|
window#waybar {
|
||||||
|
background: #${colors.base00};
|
||||||
|
}
|
||||||
|
.module {
|
||||||
|
background: #${colors.base00};
|
||||||
|
margin: 0px 5px 0px 5px;
|
||||||
|
padding: 0px 0px 0px 5px;
|
||||||
|
}
|
||||||
|
#workspaces button {
|
||||||
|
padding: 0px;
|
||||||
|
border-bottom: 0px none transparent;
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
"$mainMod" = "SUPER";
|
|
||||||
exec-once = "${startupScript}/bin/start";
|
|
||||||
general = {
|
general = {
|
||||||
gaps_in = 5;
|
gaps_in = 5;
|
||||||
gaps_out = 10;
|
gaps_out = 10;
|
||||||
border_size = 2;
|
border_size = 3;
|
||||||
layout = "dwindle";
|
layout = "dwindle";
|
||||||
};
|
};
|
||||||
dwindle = {
|
dwindle = {
|
||||||
@@ -59,49 +191,78 @@ in
|
|||||||
force_split = 2;
|
force_split = 2;
|
||||||
};
|
};
|
||||||
bind = [
|
bind = [
|
||||||
"$mainMod, return, exec, kitty"
|
"${mod}, return, exec, ghostty"
|
||||||
"$mainMod, Q, killactive,"
|
"${mod}, Q, killactive,"
|
||||||
"$mainMod SHIFT, F, togglefloating,"
|
"${mod} SHIFT, F, togglefloating,"
|
||||||
"$mainMod, F, fullscreen,"
|
"${mod}, F, fullscreen,"
|
||||||
"$mainMod, T, pin,"
|
"${mod}, T, pin,"
|
||||||
"$mainMod, G, togglegroup,"
|
"${mod}, G, togglegroup,"
|
||||||
"$mainMod, bracketleft, changegroupactive, b"
|
"${mod}, bracketleft, changegroupactive, b"
|
||||||
"$mainMod, bracketright, changegroupactive, f"
|
"${mod}, bracketright, changegroupactive, f"
|
||||||
"$mainMod, S, exec, wofi --show drun icons"
|
"${mod}, S, exec, wofi --show drun icons"
|
||||||
"$mainMod, P, pin, active"
|
"${mod}, P, pin, active"
|
||||||
|
|
||||||
|
"${mod}, left, movefocus, l"
|
||||||
|
"${mod}, right, movefocus, r"
|
||||||
|
"${mod}, up, movefocus, u"
|
||||||
|
"${mod}, down, movefocus, d"
|
||||||
|
|
||||||
|
"${mod}, h, movefocus, l"
|
||||||
|
"${mod}, l, movefocus, r"
|
||||||
|
"${mod}, k, movefocus, u"
|
||||||
|
"${mod}, j, movefocus, d"
|
||||||
|
|
||||||
|
"${mod} SHIFT, left, movewindow, l"
|
||||||
|
"${mod} SHIFT, right, movewindow, r"
|
||||||
|
"${mod} SHIFT, up, movewindow, u"
|
||||||
|
"${mod} SHIFT, down, movewindow, d"
|
||||||
|
|
||||||
|
"${mod} SHIFT, h, movewindow, l"
|
||||||
|
"${mod} SHIFT, l, movewindow, r"
|
||||||
|
"${mod} SHIFT, k, movewindow, u"
|
||||||
|
"${mod} SHIFT, j, movewindow, d"
|
||||||
|
|
||||||
|
"${mod}, 1, workspace, 1"
|
||||||
|
"${mod}, 2, workspace, 2"
|
||||||
|
"${mod}, 3, workspace, 3"
|
||||||
|
"${mod}, 4, workspace, 4"
|
||||||
|
"${mod}, 5, workspace, 5"
|
||||||
|
"${mod}, 6, workspace, 6"
|
||||||
|
"${mod}, 7, workspace, 7"
|
||||||
|
"${mod}, 8, workspace, 8"
|
||||||
|
"${mod}, 9, workspace, 9"
|
||||||
|
"${mod}, 0, workspace, 10"
|
||||||
|
"${mod} SHIFT, 1, movetoworkspace, 1"
|
||||||
|
"${mod} SHIFT, 2, movetoworkspace, 2"
|
||||||
|
"${mod} SHIFT, 3, movetoworkspace, 3"
|
||||||
|
"${mod} SHIFT, 4, movetoworkspace, 4"
|
||||||
|
"${mod} SHIFT, 5, movetoworkspace, 5"
|
||||||
|
"${mod} SHIFT, 6, movetoworkspace, 6"
|
||||||
|
"${mod} SHIFT, 7, movetoworkspace, 7"
|
||||||
|
"${mod} SHIFT, 8, movetoworkspace, 8"
|
||||||
|
"${mod} SHIFT, 9, movetoworkspace, 9"
|
||||||
|
"${mod} SHIFT, 0, movetoworkspace, 10"
|
||||||
|
|
||||||
|
"${mod}, F3, exec, grimblast save area ~/Pictures/screenshots/$(date +'%Y-%m-%d_%H-%M-%S').png"
|
||||||
|
"${mod} SHIFT, F3, exec, grimblast save screen ~/Pictures/screenshots/$(date +'%Y-%m-%d_%H-%M-%S').png"
|
||||||
|
];
|
||||||
|
binde = [
|
||||||
|
"${mod} SHIFT, h, moveactive, -20 0"
|
||||||
|
"${mod} SHIFT, l, moveactive, 20 0"
|
||||||
|
"${mod} SHIFT, k, moveactive, 0 -20"
|
||||||
|
"${mod} SHIFT, j, moveactive, 0 20"
|
||||||
|
|
||||||
|
"${mod} CTRL, l, resizeactive, 30 0"
|
||||||
|
"${mod} CTRL, h, resizeactive, -30 0"
|
||||||
|
"${mod} CTRL, k, resizeactive, 0 -10"
|
||||||
|
"${mod} CTRL, j, resizeactive, 0 10"
|
||||||
|
|
||||||
",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%+"
|
",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%+"
|
||||||
",XF86AudioLowerVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%-"
|
",XF86AudioLowerVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%-"
|
||||||
|
|
||||||
"$mainMod, left, movefocus, l"
|
|
||||||
"$mainMod, right, movefocus, r"
|
|
||||||
"$mainMod, up, movefocus, u"
|
|
||||||
"$mainMod, down, movefocus, d"
|
|
||||||
|
|
||||||
"$mainMod, h, movefocus, l"
|
|
||||||
"$mainMod, l, movefocus, r"
|
|
||||||
"$mainMod, k, movefocus, u"
|
|
||||||
"$mainMod, j, movefocus, d"
|
|
||||||
|
|
||||||
"$mainMod SHIFT, h, movewindow, l"
|
|
||||||
"$mainMod SHIFT, l, movewindow, r"
|
|
||||||
"$mainMod SHIFT, k, movewindow, u"
|
|
||||||
"$mainMod SHIFT, j, movewindow, d"
|
|
||||||
];
|
|
||||||
binde = [
|
|
||||||
"$mainMod SHIFT, h, moveactive, -20 0"
|
|
||||||
"$mainMod SHIFT, l, moveactive, 20 0"
|
|
||||||
"$mainMod SHIFT, k, moveactive, 0 -20"
|
|
||||||
"$mainMod SHIFT, j, moveactive, 0 20"
|
|
||||||
|
|
||||||
"$mainMod CTRL, l, resizeactive, 30 0"
|
|
||||||
"$mainMod CTRL, h, resizeactive, -30 0"
|
|
||||||
"$mainMod CTRL, k, resizeactive, 0 -10"
|
|
||||||
"$mainMod CTRL, j, resizeactive, 0 10"
|
|
||||||
];
|
];
|
||||||
bindm = [
|
bindm = [
|
||||||
"$mainMod, mouse:272, movewindow"
|
"${mod}, mouse:272, movewindow"
|
||||||
"$mainMod, mouse:273, resizewindow"
|
"${mod}, mouse:273, resizewindow"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
19
flake.lock
generated
19
flake.lock
generated
@@ -125,27 +125,28 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759221805,
|
"lastModified": 1757147654,
|
||||||
"narHash": "sha256-gKne7A7DWffiqdfUPdX4TK1/a4FU942LM7e6E8ORsTY=",
|
"narHash": "sha256-mGoonbnnd38MZS/H80/vbXCHCxl6KlFup/XKK+zcAuY=",
|
||||||
"owner": "marienz",
|
"owner": "marienz",
|
||||||
"repo": "nix-doom-emacs-unstraightened",
|
"repo": "nix-doom-emacs-unstraightened",
|
||||||
"rev": "5697968fa38469d12012706d9322211de10309c9",
|
"rev": "ad01165af00765af07989b6ad14115960ac675f8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "marienz",
|
"owner": "marienz",
|
||||||
"repo": "nix-doom-emacs-unstraightened",
|
"repo": "nix-doom-emacs-unstraightened",
|
||||||
|
"rev": "ad01165af00765af07989b6ad14115960ac675f8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"doomemacs": {
|
"doomemacs": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759180402,
|
"lastModified": 1757106921,
|
||||||
"narHash": "sha256-Y67ooUjDMWjPk+/IjMRnhe+OPn19Q0wF73prtExwyiI=",
|
"narHash": "sha256-vHwgENjip2+AFzs4oZfnKEAJKwf5Zid7fakImvxxQUw=",
|
||||||
"owner": "doomemacs",
|
"owner": "doomemacs",
|
||||||
"repo": "doomemacs",
|
"repo": "doomemacs",
|
||||||
"rev": "5e7e93beb9f2b5a81768aaf4950203ceea21c4f6",
|
"rev": "8f55404781edacf66fa330205533b002de3fb5ee",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -164,11 +165,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759221279,
|
"lastModified": 1757124175,
|
||||||
"narHash": "sha256-7EAByrl70kQ2gV0opDiNhySsk9KcJiRpnnL+BEaNOhc=",
|
"narHash": "sha256-drA0+kWXGrTgvhlsCiEE7VJ+vFsPi74p32n/7L5L5aU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "6bbda1ce5dc002b22c95323b01d40518e843a00d",
|
"rev": "802b82be7856f6350d5e9ccb536fb4e20cb82069",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
||||||
ucodenix.url = "github:e-tho/ucodenix";
|
ucodenix.url = "github:e-tho/ucodenix";
|
||||||
doom-emacs = {
|
doom-emacs = {
|
||||||
url = "github:marienz/nix-doom-emacs-unstraightened";
|
url = "github:marienz/nix-doom-emacs-unstraightened/ad01165af00765af07989b6ad14115960ac675f8";
|
||||||
inputs.nixpkgs.follows = "";
|
inputs.nixpkgs.follows = "";
|
||||||
};
|
};
|
||||||
jawz-scripts = {
|
jawz-scripts = {
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ in
|
|||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
../../config/base.nix
|
../../config/base.nix
|
||||||
../../config/stylix.nix
|
../../config/stylix.nix
|
||||||
|
../../environments/gnome.nix
|
||||||
];
|
];
|
||||||
my = import ./toggles.nix // {
|
my = import ./toggles.nix // {
|
||||||
nix.cores = 8;
|
nix.cores = 8;
|
||||||
@@ -47,16 +48,6 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
specialisation = {
|
|
||||||
gnome.configuration = {
|
|
||||||
imports = [ ../../environments/gnome.nix ];
|
|
||||||
services.flatpak.enable = true;
|
|
||||||
};
|
|
||||||
hyprland.configuration = {
|
|
||||||
imports = [ ../../environments/hyprland.nix ];
|
|
||||||
services.flatpak.enable = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "workstation";
|
hostName = "workstation";
|
||||||
firewall =
|
firewall =
|
||||||
@@ -164,7 +155,7 @@ in
|
|||||||
};
|
};
|
||||||
sunshine = {
|
sunshine = {
|
||||||
enable = true;
|
enable = true;
|
||||||
autoStart = true;
|
autoStart = false;
|
||||||
capSysAdmin = true;
|
capSysAdmin = true;
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ in
|
|||||||
boot = {
|
boot = {
|
||||||
plymouth.enable = true;
|
plymouth.enable = true;
|
||||||
consoleLogLevel = 0;
|
consoleLogLevel = 0;
|
||||||
loader.timeout = 5;
|
loader.timeout = 3;
|
||||||
kernelParams = [
|
kernelParams = [
|
||||||
"splash"
|
"splash"
|
||||||
"boot.shell_on_fail"
|
"boot.shell_on_fail"
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ let
|
|||||||
nixfmt-rfc-style # formatting
|
nixfmt-rfc-style # formatting
|
||||||
cachix # binary cache management
|
cachix # binary cache management
|
||||||
nixd # language server for Nix
|
nixd # language server for Nix
|
||||||
|
deadnix # detext unused/uneeded dependencies
|
||||||
statix # linter for Nix expressions
|
statix # linter for Nix expressions
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
@@ -34,9 +35,9 @@ in
|
|||||||
users.users.jawz = { inherit packages; };
|
users.users.jawz = { inherit packages; };
|
||||||
home-manager.users.jawz.programs.${shellType}.shellAliases = {
|
home-manager.users.jawz.programs.${shellType}.shellAliases = {
|
||||||
nixformat = ''
|
nixformat = ''
|
||||||
nix run unstable#deadnix -- -e && \
|
deadnix -e && \
|
||||||
nix run unstable#nixfmt-tree && \
|
nix run nixpkgs#nixfmt-tree && \
|
||||||
nix run unstable#statix fix
|
statix fix
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -7,6 +7,11 @@
|
|||||||
{
|
{
|
||||||
options.my.shell.multimedia.enable = lib.mkEnableOption "multimedia CLI tools and codecs";
|
options.my.shell.multimedia.enable = lib.mkEnableOption "multimedia CLI tools and codecs";
|
||||||
config = lib.mkIf config.my.shell.multimedia.enable {
|
config = lib.mkIf config.my.shell.multimedia.enable {
|
||||||
|
sops.secrets."gallery-dl/secrets" = {
|
||||||
|
sopsFile = ../../secrets/gallery.yaml;
|
||||||
|
owner = "jawz";
|
||||||
|
mode = "0400";
|
||||||
|
};
|
||||||
home-manager.users.jawz.programs = {
|
home-manager.users.jawz.programs = {
|
||||||
yt-dlp = {
|
yt-dlp = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -21,6 +26,15 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
settings = import ../../dotfiles/gallery-dl.nix;
|
settings = import ../../dotfiles/gallery-dl.nix;
|
||||||
};
|
};
|
||||||
|
${config.my.shell.type} = {
|
||||||
|
initExtra = lib.mkAfter ''
|
||||||
|
if [ -r "${config.sops.secrets."gallery-dl/secrets".path}" ]; then
|
||||||
|
set -a # automatically export all variables
|
||||||
|
source "${config.sops.secrets."gallery-dl/secrets".path}"
|
||||||
|
set +a # stop automatically exporting
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
users.users.jawz.packages = builtins.attrValues {
|
users.users.jawz.packages = builtins.attrValues {
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
|
|||||||
@@ -17,11 +17,45 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.htop-vim;
|
package = pkgs.htop-vim;
|
||||||
};
|
};
|
||||||
|
eza = {
|
||||||
|
enable = true;
|
||||||
|
git = true;
|
||||||
|
icons = "auto";
|
||||||
|
};
|
||||||
zoxide = {
|
zoxide = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableBashIntegration = shellType == "bash";
|
enableBashIntegration = shellType == "bash";
|
||||||
enableZshIntegration = shellType == "zsh";
|
enableZshIntegration = shellType == "zsh";
|
||||||
};
|
};
|
||||||
|
bat = {
|
||||||
|
enable = true;
|
||||||
|
config.pager = "less -FR";
|
||||||
|
extraPackages = builtins.attrValues {
|
||||||
|
inherit (pkgs.bat-extras)
|
||||||
|
batman # man pages
|
||||||
|
batpipe # piping
|
||||||
|
batgrep # ripgrep
|
||||||
|
batdiff # this is getting crazy!
|
||||||
|
batwatch # probably my next best friend
|
||||||
|
prettybat # trans your sourcecode!
|
||||||
|
;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
password-store = {
|
||||||
|
enable = false;
|
||||||
|
package = pkgs.gopass;
|
||||||
|
settings = {
|
||||||
|
PASSWORD_STORE_AUTOCLIP = "true";
|
||||||
|
PASSWORD_STORE_AUTOIMPORT = "false";
|
||||||
|
PASSWORD_STORE_CLIPTIMEOUT = "45";
|
||||||
|
PASSWORD_STORE_EXPORTKEYS = "false";
|
||||||
|
PASSWORD_STORE_NOPAGER = "false";
|
||||||
|
PASSWORD_STORE_NOTIFICATIONS = "false";
|
||||||
|
PASSWORD_STORE_PARSING = "true";
|
||||||
|
PASSWORD_STORE_PATH = "/home/jawz/.local/share/pass";
|
||||||
|
PASSWORD_STORE_SAFECONTENT = "true";
|
||||||
|
};
|
||||||
|
};
|
||||||
${shellType} = {
|
${shellType} = {
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
cd = "z";
|
cd = "z";
|
||||||
@@ -56,35 +90,6 @@ in
|
|||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
bat = {
|
|
||||||
enable = true;
|
|
||||||
config.pager = "less -FR";
|
|
||||||
extraPackages = builtins.attrValues {
|
|
||||||
inherit (pkgs.bat-extras)
|
|
||||||
batman # man pages
|
|
||||||
batpipe # piping
|
|
||||||
batgrep # ripgrep
|
|
||||||
batdiff # this is getting crazy!
|
|
||||||
batwatch # probably my next best friend
|
|
||||||
prettybat # trans your sourcecode!
|
|
||||||
;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
password-store = {
|
|
||||||
enable = false;
|
|
||||||
package = pkgs.gopass;
|
|
||||||
settings = {
|
|
||||||
PASSWORD_STORE_AUTOCLIP = "true";
|
|
||||||
PASSWORD_STORE_AUTOIMPORT = "false";
|
|
||||||
PASSWORD_STORE_CLIPTIMEOUT = "45";
|
|
||||||
PASSWORD_STORE_EXPORTKEYS = "false";
|
|
||||||
PASSWORD_STORE_NOPAGER = "false";
|
|
||||||
PASSWORD_STORE_NOTIFICATIONS = "false";
|
|
||||||
PASSWORD_STORE_PARSING = "true";
|
|
||||||
PASSWORD_STORE_PATH = "/home/jawz/.local/share/pass";
|
|
||||||
PASSWORD_STORE_SAFECONTENT = "true";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
programs = {
|
programs = {
|
||||||
starship.enable = true;
|
starship.enable = true;
|
||||||
@@ -99,7 +104,6 @@ in
|
|||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
ripgrep # modern grep
|
ripgrep # modern grep
|
||||||
du-dust # rusty du similar to gdu
|
du-dust # rusty du similar to gdu
|
||||||
eza # like ls but with colors
|
|
||||||
fd # modern find, faster searches
|
fd # modern find, faster searches
|
||||||
fzf # fuzzy finder! super cool and useful
|
fzf # fuzzy finder! super cool and useful
|
||||||
gdu # disk-space utility checker, somewhat useful
|
gdu # disk-space utility checker, somewhat useful
|
||||||
|
|||||||
44
secrets/gallery.yaml
Normal file
44
secrets/gallery.yaml
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
gallery-dl:
|
||||||
|
secrets: ENC[AES256_GCM,data:5K9B7XZ3dOL1BIXLUvlE5D9xLkKkagvh2mMkFtd+6gJUJqPDwerp9QDcATeqiJLz54DGB1JI6podlCm8N3qVbA3aMHroSiAd2YaldqvLkh76vGDhfI6pAfYWmjLYR7KR/Qy5sy7qhkNmvhwV34JiqXMdfDaWDE9y9Zgqq3lyS/8mYixNh0sz9Pc7ohcIHpwVNcESxaPW9BCpzHOwhtZKqqgLTUrHCyO14YR1+hB+nGXnmtaFcFVDjb0ctHsgL8+R5Kw1oAE7s8fM+ghnKNqPusSVomTaNIQI8VMbk0YQyPsHn9zKEocjUEpwX7WdWmNLNjuYl29+NnJS7VCSOsZmqhNlKJMIvQ3v19UNIQG5/hB3QlBIlEr615W8l5q8jdD+twzufGkEnCIfZzn+T9UDijNlmZhK19lhOpF+mdi7vpzyJFrIK0JfFfRYnyvXOHIcDKK4rsMFTT8U04WM9PpYrUxWDmMMlAZsJ+Jj6d0jpRYsoB4C5ODKRa5V27wnhp9DQiQOAqvfYnUtCAFnFEqVu7qaa5WcQhG211Nhdcpvtyp/8sDXgZBTT/E8JTtG8YbSNUZxw3xE7fyp4Bdnb+bxbdcgVRGkFwZShu2qWF1Ckj4Lr2xzaBu+fGtUDqPnMq0PgQeRIVP/NsbtavrlISWhB5Ctw4QSRvGMTi5JqvhmLEWi5wvimYzt91aGj2tm/k8AOTtwwjK4iZyWKxE1PsjwmKwiEJZvTRKLTySxomqHDg1TOKGmAcJK/wCG7kO9ETp+yZxv1Sv3L7ZeCfyzM4fupRiPytbIMfeJsq6PxTpJGlD7lDC0EXUjRKV8JD8vnP91F0HXoZQ3tyb27/1BmZ/nSx3iGcmXhlV7eLgLS3MIpBChjget8d7oE4NnxBGrX8YoVFJzAUH5UawVNFHa3y/rKqUsS51vn0Q0Wxl+uK3KtK90TdML6VNW8HywWiNer5tbIY+Kl6I=,iv:4Sa8LyNhp2EyarQpQ19jJZFUAINmfuw3EnUVhiYGCJg=,tag:o5rLdUbGjao+SJ9Cqtr+jA==,type:str]
|
||||||
|
sops:
|
||||||
|
age:
|
||||||
|
- recipient: age1lufn6t35gs4wgevyr2gud4eec7lvkn7pgnnv4tja64ww3hef7gqq8fas37
|
||||||
|
enc: |
|
||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIY05VY1FPOU5FTFFnazlQ
|
||||||
|
RStQVExNdWIySE5qSVMxMFd3NFM0L2VCRWxzClhleTEzNTVOaVl1cGovM1hmWEoy
|
||||||
|
eGNxZ2E4U1pRNlBaTDZ0ZW4wbVZjT0EKLS0tIEJ0ZXR5blBlckIxSVlmT0hxY1Bz
|
||||||
|
TGVGRFgzaHI5VW5GdjJvcmswUWFvaWMKQCK47p7OQUXq45aYo9BkkcGrzmPKCJOI
|
||||||
|
OKu/+W4xYOnfIo03GGL6f4LrbCaKr1mdtsRnuHmaFXiXdaKbZFDEhw==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
- recipient: age17jlsydpgl35qx5ahc3exu44jt8dfa63chymt6xqp9xx0r6dh347qpg55cz
|
||||||
|
enc: |
|
||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJb0MzQVZvY0ZCNlAwT2Qw
|
||||||
|
RnJOUXJISFg1Smt4VWdoYy9PT2hQNG1MNm5ZCmVhUFI5UGpQUkR4MTA4VktuVyt1
|
||||||
|
TXlVZ3haNjd4OHNYNE4rVzd2MkNGTkEKLS0tICtkZDRvODBZaGRCTmdlUkRESjMv
|
||||||
|
bElZc21OSXJsZnZaSHF5ZTBDSlNXaHcKixDNfM98AqYagtidcYE3lgkFM9XTIrVg
|
||||||
|
gbYoSOk5rL9Hi2rvP+BCEgsrRSuExGKVvdqODYltD+nNfTI1zcnTFg==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
- recipient: age15hx530yrqmhm80vsjmffyg9deq9gssj7hl5rsqdnsn3dwegj9qusv4sjf5
|
||||||
|
enc: |
|
||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKZncwdllnQjYyc284RXVm
|
||||||
|
VVVJTHI1Z25FWXBhY3o1SmgyVW01alRlcVVVCklDNDYvMktDU1U4L0RTMVgvaU0v
|
||||||
|
d0NlK3pqYzZ4NFRUd3V1WHZTTkVpK00KLS0tIHVQSmRDekcrK093QUJQVHNZcUg3
|
||||||
|
WGVJQm5MdGhMbzd5RkNPU1VuNTZVeFkKQq/WyqLOOde86NNYnVq0Lw31YB2OcLY/
|
||||||
|
h/HtFN4GynmBOYcTuqIvBJ/TksXs30kWFKW2XSY0jP0JSY7Yo0BxhA==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
- recipient: age13w4elx3x6afrte2d82lak59mwr2k25wfz3hx79tny6sfdk66lqjq989dzl
|
||||||
|
enc: |
|
||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGZU0zK3V6M2IyMkFOdm5U
|
||||||
|
UG1oVi9IMzM0SllUQUMwMlh4NkF2V2pCcWtvCk1kR0QxVWRPM1pyWmdVOE1UdWxs
|
||||||
|
NldjZXBOZU1uK1JELzF1blhTQy83Zm8KLS0tIFFVRjVScVVGa09sbEdBdjNXNTZR
|
||||||
|
d0YvYk8vNitDbzNCQ1VqS20xUWx6ZDgK+kIRATTtC0Vd7/uPf8E4pIans79Ksh6J
|
||||||
|
Y77+owFFw1AvQ3KvaI7QVfKW61MzxI+S1bWqI3ZNOJ19Qv4ZoVhnVg==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
lastmodified: "2025-10-02T18:11:48Z"
|
||||||
|
mac: ENC[AES256_GCM,data:qKoRMXroUtMaH1yrgNQxUPX8FpUmLmNU29zyzfnKkmiLoPsWNsogHxNVkqosyvbW0y0w6XnQh4OrSd4FF3fi8ZuJfk54jDWO7jlXFRk+07OobPgngYvNXLw76BNkXnAtxcduV2cTuSY6XwnwE0LtxFDmkM8N/AxIC8jhKkGQtwY=,iv:n3yBotpOggFvSUnboAG1L7pJMMi1PfV8KsSHN3/Li8c=,tag:4D5TqqroQBZNKUYol/ZCHg==,type:str]
|
||||||
|
unencrypted_suffix: _unencrypted
|
||||||
|
version: 3.10.2
|
||||||
Reference in New Issue
Block a user