diff --git a/README.md b/README.md index 093e586..b904ffc 100755 --- a/README.md +++ b/README.md @@ -23,3 +23,4 @@ each host should have these files: - sddm x11 support, too. or maybe just remove x11 - gnome-keyring basic libsecret support works, add ssh too plz :heart: - git gpg signing + - hyprcursor \ No newline at end of file diff --git a/modules/desktop/gnome-keyring.nix b/modules/desktop/gnome-keyring.nix index 7ae4ab6..8913d2a 100644 --- a/modules/desktop/gnome-keyring.nix +++ b/modules/desktop/gnome-keyring.nix @@ -9,6 +9,7 @@ in { }; config = mkIf cfg.enable { - services.gnome.gnome-keyring.enable = true; + hm.services.gnome-keyring.enable = true; + hm.services.gnome-keyring.components = [ "secrets" ]; }; } diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 75436ff..457202e 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -157,6 +157,9 @@ in { "float, initialTitle:^Select a file to open$" "center, initialTitle:^Select a file to open$" "size 1100 650, initialTitle:^Select a file to open$" + "float, initialTitle:^File Upload$" + "center, initialTitle:^File Upload$" + "size 1100 650, initialTitle:^File Upload$" # https://github.com/hyprwm/Hyprland/issues/6154 "center, class:^gcr-prompter" "center, class:^pinentry-" diff --git a/modules/desktop/themes/catppuccin/default.nix b/modules/desktop/themes/catppuccin/default.nix index d7258de..ac9a320 100644 --- a/modules/desktop/themes/catppuccin/default.nix +++ b/modules/desktop/themes/catppuccin/default.nix @@ -48,13 +48,13 @@ in { name = "Catppuccin Mocha"; extension = pkgs.vscode-extensions.catppuccin.catppuccin-vsc; #extension = (pkgs.vscode-extensions.catppuccin.catppuccin-vsc.override { - # accent = accent; - # boldKeywords = false; - # italicComments = false; - # italicKeywords = false; - # extraBordersEnabled = false; - # workbenchMode = "flat"; - # bracketMode = "rainbow"; + #accent = accent; + #boldKeywords = false; + #italicComments = false; + #italicKeywords = false; + #extraBordersEnabled = false; + #workbenchMode = "flat"; + #bracketMode = "rainbow"; #}); }; iconTheme = { diff --git a/modules/software/tools/gpg.nix b/modules/software/tools/gpg.nix index 2761cba..a36baaf 100644 --- a/modules/software/tools/gpg.nix +++ b/modules/software/tools/gpg.nix @@ -12,6 +12,8 @@ in { hm.programs.gpg.enable = true; hm.services.gpg-agent = { enable = true; + enableExtraSocket = true; + enableSshSupport = true; pinentryPackage = pkgs.pinentry-gnome3; }; diff --git a/modules/software/tools/mpv.nix b/modules/software/tools/mpv.nix index 6eba94e..9bc6fe4 100644 --- a/modules/software/tools/mpv.nix +++ b/modules/software/tools/mpv.nix @@ -11,6 +11,10 @@ in { config = mkIf cfg.enable { hm.programs.mpv = { enable = true; + + config = { + hwdec = "auto"; + }; scripts = with pkgs.mpvScripts; [ mpris