diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 774a8de..a6c140a 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -266,9 +266,6 @@ 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$" diff --git a/modules/desktop/sddm.nix b/modules/desktop/sddm.nix index a37014a..69f3d02 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 = config.modules.desktop.themes.cursorTheme.size; + CursorSize = 24; }; }; }; diff --git a/modules/desktop/themes/default.nix b/modules/desktop/themes/default.nix index 54a76f5..bd5dc0f 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 the pixel size, but it doesn't matter since we define it in pixels right afterwards. this is a bit annoying but whatever man + # 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 # 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},${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"''; + general = ''"${sansSerif.family},-1,${toString sansSerif.size},5,${toString weight},${zeros},1"''; + fixed = ''"${monospace.family},-1,${toString monospace.size},5,${toString weight},${zeros},1"''; }; }; in { diff --git a/modules/software/dev/git.nix b/modules/software/dev/git.nix index 51f5e42..80c5372 100644 --- a/modules/software/dev/git.nix +++ b/modules/software/dev/git.nix @@ -6,17 +6,12 @@ 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 = cfg.package; + package = pkgs.gitFull; userName = ''reidlab''; userEmail = "reidlab325@gmail.com"; @@ -49,7 +44,8 @@ in { }; extraConfig = { - credential.helper = "${cfg.package}/bin/git-credential-libsecret"; + # password caching w libsecret, use gnome-keyring or kwallet + credential.helper = "${pkgs.gitFull}/bin/git-credential-libsecret"; push.autoSetupRemote = true; push.gpgSign = "if-asked"; diff --git a/packages/apple-firmware/default.nix b/packages/apple-firmware/default.nix index 40b85e6..148b3f5 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 = "70bdd14a778abade95544fc625f3cc2b9eef272a"; - hash = "sha256-ktXMIgyfSgx/l+QQqKc9B7+SZkbZ1/ut7hH7ffjUTLc="; + rev = "c3ba2bce7b5b7d08a478763c678d71ddded60403"; + hash = "sha256-p91pyOYKHnJvaBZ7nxrBqFU63UQhMPWhm2GxabfncY4="; }; 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, questionable legality + # not sure about the licenses on these # license = licenses.unfree; platforms = platforms.all; };