chore: remove custom xdg dirs, specify hyprshot output dir

This commit is contained in:
Nydragon 2024-11-28 21:14:31 +01:00
parent 7e524df309
commit 09becef7a9
Signed by: nydragon
SSH key fingerprint: SHA256:WcjW5NJPQ8Dx4uQDmoIlVPLWE27Od3fxoe0IUvuoPHE
6 changed files with 32 additions and 46 deletions

View file

@ -2,7 +2,6 @@
self,
pkgs,
lib,
config,
...
}:
let
@ -18,43 +17,9 @@ let
};
in
{
xdg = {
desktopEntries = builtins.listToAttrs [
(mkURLEntry "Paperless" "https://paperless.ccnlc.eu" "${self}/assets/favicon-paperless.png")
(mkURLEntry "KitchenOwl" "https://kitchenowl.ccnlc.eu" "${self}/assets/favicon-kitchenowl.png")
(mkURLEntry "Discord" "https://discord.com/app" "${self}/assets/favicon-discord.png")
];
userDirs =
let
home = config.home.homeDirectory;
disable =
a:
lib.listToAttrs (
lib.map (key: {
name = key;
value = null;
}) a
);
in
(lib.mapAttrs (_: folder: "${home}/${folder}") {
download = "downloads";
videos = "videos";
pictures = "pictures";
})
// (disable [
"music"
"documents"
"templates"
"publicShare"
"desktop"
])
// {
enable = true;
createDirectories = true;
extraConfig = {
XDG_DEVEL_DIR = "${home}/devel";
};
};
};
xdg.desktopEntries = builtins.listToAttrs [
(mkURLEntry "Paperless" "https://paperless.ccnlc.eu" "${self}/assets/favicon-paperless.png")
(mkURLEntry "KitchenOwl" "https://kitchenowl.ccnlc.eu" "${self}/assets/favicon-kitchenowl.png")
(mkURLEntry "Discord" "https://discord.com/app" "${self}/assets/favicon-discord.png")
];
}

View file

@ -156,8 +156,8 @@ lib.mkIf osConfig.programs.hyprland.enable {
"$mod, X, fullscreen, 1"
"$mod, F, fullscreen, 0"
"$mod, N, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t"
"$mod, U, exec, ${pkgs.hyprpicker}/bin/hyprpicker -r -z & ${pkgs.hyprshot}/bin/hyprshot -o ~/Pictures/screenshots -m region"
"$mod SHIFT, U, exec, ${pkgs.hyprpicker}/bin/hyprpicker -r -z & ${pkgs.hyprshot}/bin/hyprshot --raw -m region | ${pkgs.satty}/bin/satty -f - --fullscreen"
"$mod, U, exec, ${pkgs.hyprshot}/bin/hyprshot -z -o $XDG_PICTURES_DIR/screenshots -m region"
"$mod SHIFT, U, exec, ${pkgs.hyprshot}/bin/hyprshot -z --raw -m region | ${pkgs.satty}/bin/satty -f - --fullscreen"
#: Brightness and Media {{{
",XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl s +10%"

View file

@ -1,3 +1,6 @@
{
imports = [ ./kdeconnect.nix ];
imports = [
./kdeconnect.nix
./syncthing.nix
];
}

View file

@ -0,0 +1,19 @@
{
pkgs,
config,
lib,
...
}:
let
inherit (lib) mkIf;
in
{
config = mkIf config.services.syncthing.enable {
xdg.desktopEntries."Syncthing" = {
name = "Syncthing";
icon = "";
terminal = false;
exec = "${pkgs.syncthing}/bin/syncthing --browser-only";
};
};
}

View file

@ -87,8 +87,7 @@ lib.mkIf osConfig.programs.sway.enable {
"--locked XF86AudioPause" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
"--locked XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
"--locked XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
"Print" = "exec ${pkgs.hyprshot}/bin/hyprshot -m region";
"${mod}+u" = "exec ${pkgs.hyprshot}/bin/hyprshot -m region";
"${mod}+u" = "exec ${pkgs.hyprshot}/bin/hyprshot -o $XDG_PICTURES_DIR/screenshots -m region";
"${mod}+Shift+u" = "exec ${pkgs.hyprshot}/bin/hyprshot --raw -m region | ${pkgs.satty}/bin/satty -f - --fullscreen";
#: Workspace movement {{{

View file

@ -98,7 +98,7 @@
enable = true;
settings = {
default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd \"sway --unsupported-gpu\"";
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time";
user = "greeter";
};
};