Compare commits

...

5 commits

5 changed files with 17 additions and 10 deletions

View file

@ -266,6 +266,9 @@ in {
"float, initialTitle:^File Upload$" "float, initialTitle:^File Upload$"
"size 1100 650, initialTitle:^File Upload$" "size 1100 650, initialTitle:^File Upload$"
"center, initialTitle:^File Upload$" "center, initialTitle:^File Upload$"
"float, initialTitle:^MainPicker$"
"size 1100 650, initialTitle:^MainPicker$"
"center, initialTitle:^MainPicker$"
"float, class:^clipse$" "float, class:^clipse$"
"size 1100 650, class:^clipse$" "size 1100 650, class:^clipse$"
"center, class:^clipse$" "center, class:^clipse$"

View file

@ -24,7 +24,7 @@ in {
settings = { settings = {
Theme = { Theme = {
CursorTheme = config.modules.desktop.themes.cursorTheme.name; CursorTheme = config.modules.desktop.themes.cursorTheme.name;
CursorSize = 24; CursorSize = config.modules.desktop.themes.cursorTheme.size;
}; };
}; };
}; };

View file

@ -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) # (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) # 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 # 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 # 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 # yapping over. this is the best we can do for now
general = ''"${sansSerif.family},-1,${toString sansSerif.size},5,${toString weight},${zeros},1"''; general = ''"${sansSerif.family},${toString sansSerif.size},${toString sansSerif.size},5,${toString weight},${zeros},1"'';
fixed = ''"${monospace.family},-1,${toString monospace.size},5,${toString weight},${zeros},1"''; fixed = ''"${monospace.family},${toString monospace.size},${toString monospace.size},5,${toString weight},${zeros},1"'';
}; };
}; };
in { in {

View file

@ -6,12 +6,17 @@ let
in { in {
options.modules.software.dev.git = { options.modules.software.dev.git = {
enable = mkEnableOption "Enable git. You know what git is"; enable = mkEnableOption "Enable git. You know what git is";
package = mkOption {
type = types.package;
default = pkgs.gitFull;
example = "pkgs.gitFull";
};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
hm.programs.git = { hm.programs.git = {
enable = true; enable = true;
package = pkgs.gitFull; package = cfg.package;
userName = ''reidlab''; userName = ''reidlab'';
userEmail = "reidlab325@gmail.com"; userEmail = "reidlab325@gmail.com";
@ -44,8 +49,7 @@ in {
}; };
extraConfig = { extraConfig = {
# password caching w libsecret, use gnome-keyring or kwallet credential.helper = "${cfg.package}/bin/git-credential-libsecret";
credential.helper = "${pkgs.gitFull}/bin/git-credential-libsecret";
push.autoSetupRemote = true; push.autoSetupRemote = true;
push.gpgSign = "if-asked"; push.gpgSign = "if-asked";

View file

@ -7,8 +7,8 @@ stdenvNoCC.mkDerivation {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AdityaGarg8"; owner = "AdityaGarg8";
repo = "Apple-Firmware"; repo = "Apple-Firmware";
rev = "c3ba2bce7b5b7d08a478763c678d71ddded60403"; rev = "70bdd14a778abade95544fc625f3cc2b9eef272a";
hash = "sha256-p91pyOYKHnJvaBZ7nxrBqFU63UQhMPWhm2GxabfncY4="; hash = "sha256-ktXMIgyfSgx/l+QQqKc9B7+SZkbZ1/ut7hH7ffjUTLc=";
}; };
installPhase = '' installPhase = ''
@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation {
meta = with lib; { meta = with lib; {
description = "Various apple broadcom drivers, ripped from a runner image"; description = "Various apple broadcom drivers, ripped from a runner image";
homepage = "https://github.com/adityagarg8/apple-firmware"; 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; # license = licenses.unfree;
platforms = platforms.all; platforms = platforms.all;
}; };