From 5e8d467c73fee7445b70082e6974e3c34219b37b Mon Sep 17 00:00:00 2001 From: reidlab Date: Thu, 26 Dec 2024 00:55:47 -0800 Subject: [PATCH 1/5] window rule for hyprland-share-picker --- modules/desktop/hyprland.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index a6c140a..774a8de 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -266,6 +266,9 @@ in { "float, initialTitle:^File Upload$" "size 1100 650, initialTitle:^File Upload$" "center, initialTitle:^File Upload$" + "float, initialTitle:^MainPicker$" + "size 1100 650, initialTitle:^MainPicker$" + "center, initialTitle:^MainPicker$" "float, class:^clipse$" "size 1100 650, class:^clipse$" "center, class:^clipse$" From 178d4e6f110fa2cc727aa616bdf04bc548985d89 Mon Sep 17 00:00:00 2001 From: reidlab Date: Thu, 26 Dec 2024 01:11:28 -0800 Subject: [PATCH 2/5] update apple firmware --- packages/apple-firmware/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/apple-firmware/default.nix b/packages/apple-firmware/default.nix index 148b3f5..40b85e6 100644 --- a/packages/apple-firmware/default.nix +++ b/packages/apple-firmware/default.nix @@ -7,8 +7,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "AdityaGarg8"; repo = "Apple-Firmware"; - rev = "c3ba2bce7b5b7d08a478763c678d71ddded60403"; - hash = "sha256-p91pyOYKHnJvaBZ7nxrBqFU63UQhMPWhm2GxabfncY4="; + rev = "70bdd14a778abade95544fc625f3cc2b9eef272a"; + hash = "sha256-ktXMIgyfSgx/l+QQqKc9B7+SZkbZ1/ut7hH7ffjUTLc="; }; installPhase = '' @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation { meta = with lib; { description = "Various apple broadcom drivers, ripped from a runner image"; homepage = "https://github.com/adityagarg8/apple-firmware"; - # not sure about the licenses on these + # not sure about the licenses on these, questionable legality # license = licenses.unfree; platforms = platforms.all; }; From e6c00aa21832c655116cd484c2b302190fcc4dde Mon Sep 17 00:00:00 2001 From: reidlab Date: Thu, 26 Dec 2024 19:40:47 -0800 Subject: [PATCH 3/5] make sddm use cursor size --- modules/desktop/sddm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/desktop/sddm.nix b/modules/desktop/sddm.nix index 69f3d02..a37014a 100644 --- a/modules/desktop/sddm.nix +++ b/modules/desktop/sddm.nix @@ -24,7 +24,7 @@ in { settings = { Theme = { CursorTheme = config.modules.desktop.themes.cursorTheme.name; - CursorSize = 24; + CursorSize = config.modules.desktop.themes.cursorTheme.size; }; }; }; From fdf6231b63e38f26a4986319983c9e6ca63e8cfc Mon Sep 17 00:00:00 2001 From: reidlab Date: Thu, 26 Dec 2024 19:41:17 -0800 Subject: [PATCH 4/5] change how qt font pts are handled --- modules/desktop/themes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/desktop/themes/default.nix b/modules/desktop/themes/default.nix index bd5dc0f..54a76f5 100644 --- a/modules/desktop/themes/default.nix +++ b/modules/desktop/themes/default.nix @@ -164,11 +164,11 @@ in { # (for qt5, font weight is on a different scale where 50 is equivalent to 400 in qt6, even more fun) # font weight is set to 400, this is the default weight for every font ever and it will fall back to something else if the font doesn't have a 400 weight (ex. cozette only has a 500 weight) # setting the font style name is BAD!! i found it breaks font selection for others that aren't the weight that is given, and it's not required anyway - # technically this isn't perfect because we are setting the font size in points to -1, but it doesn't matter since we define it in pixels right afterwards. this causes only a warning in the logs for some qt apps!! so it's fine but it's still a bit annoying because i'm weird + # technically this isn't perfect because we are setting the font size in points to the pixel size, but it doesn't matter since we define it in pixels right afterwards. this is a bit annoying but whatever man # oh and, because why not, the qt5 font config has less zeros than the qt6 font config. the docs don't say anything about this. i am going to kill myself @The Qt Company # yapping over. this is the best we can do for now - general = ''"${sansSerif.family},-1,${toString sansSerif.size},5,${toString weight},${zeros},1"''; - fixed = ''"${monospace.family},-1,${toString monospace.size},5,${toString weight},${zeros},1"''; + general = ''"${sansSerif.family},${toString sansSerif.size},${toString sansSerif.size},5,${toString weight},${zeros},1"''; + fixed = ''"${monospace.family},${toString monospace.size},${toString monospace.size},5,${toString weight},${zeros},1"''; }; }; in { From 07592e29726e082519a9be2a1763a43164db07b7 Mon Sep 17 00:00:00 2001 From: reidlab Date: Thu, 26 Dec 2024 19:44:24 -0800 Subject: [PATCH 5/5] make git use a package config option --- modules/software/dev/git.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/software/dev/git.nix b/modules/software/dev/git.nix index 80c5372..51f5e42 100644 --- a/modules/software/dev/git.nix +++ b/modules/software/dev/git.nix @@ -6,12 +6,17 @@ let in { options.modules.software.dev.git = { enable = mkEnableOption "Enable git. You know what git is"; + package = mkOption { + type = types.package; + default = pkgs.gitFull; + example = "pkgs.gitFull"; + }; }; config = mkIf cfg.enable { hm.programs.git = { enable = true; - package = pkgs.gitFull; + package = cfg.package; userName = ''reidlab''; userEmail = "reidlab325@gmail.com"; @@ -44,8 +49,7 @@ in { }; extraConfig = { - # password caching w libsecret, use gnome-keyring or kwallet - credential.helper = "${pkgs.gitFull}/bin/git-credential-libsecret"; + credential.helper = "${cfg.package}/bin/git-credential-libsecret"; push.autoSetupRemote = true; push.gpgSign = "if-asked";