1
1
Fork 0

Compare commits

..

No commits in common. "16b21be084b789e0efa706f0e917c7ca748267c5" and "cac626eee7e2abc97b2a611f75f2b4a1840124cf" have entirely different histories.

4 changed files with 88 additions and 158 deletions

186
flake.lock generated
View file

@ -30,11 +30,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733424266, "lastModified": 1731956781,
"narHash": "sha256-cBxteBDr4K4GdUr6ugitxkhcnNDxqoExyK9TVz1RhRQ=", "narHash": "sha256-AAZiAMQ2LBCY375NnbQa8HHFJc3KLyfnlGiFXDdb1pE=",
"owner": "ezKEa", "owner": "ezKEa",
"repo": "aagl-gtk-on-nix", "repo": "aagl-gtk-on-nix",
"rev": "24e2f7bf68d27e25dd5997185a91d576cc1f409a", "rev": "862c5b3acd097906cd242eedd9ddcc95ac9382cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -152,11 +152,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733366839, "lastModified": 1730775052,
"narHash": "sha256-Ep3w+wJ7IeJLNJDL9firzF5bQmT4Voku+2SExmEv2w4=", "narHash": "sha256-YXbgfHYJaAXCxrAQzjd03GkSMGd3iGeTmhkMwpFhTPk=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "arion", "repo": "arion",
"rev": "9b48f2df099720925f4b9ae204ce400bd9ec4a3f", "rev": "38ea1d87421f1695743d5eca90b0c37ef3123fbb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -492,11 +492,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733168902, "lastModified": 1732645828,
"narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", "narHash": "sha256-+4U2I2653JvPFxcux837ulwYS864QvEueIljUkwytsk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", "rev": "869ba3a87486289a4197b52a6c9e7222edf00b3e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -719,11 +719,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733312601, "lastModified": 1730504689,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -741,11 +741,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733312601, "lastModified": 1712014858,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1056,11 +1056,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733333617, "lastModified": 1730229744,
"narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=", "narHash": "sha256-2W//PmgocN9lplDJ7WoiP9EcrfUxqvtxplCAqlwvquY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-effects", "repo": "hercules-ci-effects",
"rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea", "rev": "d70658494391994c7b32e8fe5610dae76737e4df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1118,11 +1118,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733484277, "lastModified": 1732482255,
"narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1160,64 +1160,6 @@
"type": "github" "type": "github"
} }
}, },
"hyprgraphics": {
"inputs": {
"hyprutils": [
"hyprlock",
"hyprutils"
],
"nixpkgs": [
"hyprlock",
"nixpkgs"
],
"systems": [
"hyprlock",
"systems"
]
},
"locked": {
"lastModified": 1732808127,
"narHash": "sha256-jwqYmLVfvoLPu8UScEzZgdbbiNU3ioYcrsthjEEnGqI=",
"owner": "hyprwm",
"repo": "hyprgraphics",
"rev": "4d927a52be7e15e0846456f2aa1b0ad76b5bf059",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprgraphics",
"type": "github"
}
},
"hyprgraphics_2": {
"inputs": {
"hyprutils": [
"hyprpaper",
"hyprutils"
],
"nixpkgs": [
"hyprpaper",
"nixpkgs"
],
"systems": [
"hyprpaper",
"systems"
]
},
"locked": {
"lastModified": 1732808127,
"narHash": "sha256-jwqYmLVfvoLPu8UScEzZgdbbiNU3ioYcrsthjEEnGqI=",
"owner": "hyprwm",
"repo": "hyprgraphics",
"rev": "4d927a52be7e15e0846456f2aa1b0ad76b5bf059",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprgraphics",
"type": "github"
}
},
"hypridle": { "hypridle": {
"inputs": { "inputs": {
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
@ -1278,11 +1220,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733056338, "lastModified": 1730743354,
"narHash": "sha256-sp14z0mrqrtmouz1+bU4Jh8/0xi+xwQHF2l7mhGSSVU=", "narHash": "sha256-gU4NySYyXeAzVaF5bI6BKmj2CdgiwGFnuPjXUId3Dx0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "d7c55140f1785b8d9fef351f1cd2a4c9e1eaa466", "rev": "792f6b83dc719214e0e2a0b380c34f147b28ece2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1308,11 +1250,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733324289, "lastModified": 1732053779,
"narHash": "sha256-5gCIIiQT9JlBPO1M98j1Aaboa2CTKtwBqiksCLf6qC0=", "narHash": "sha256-v9FS0r2XWMf/+uwevvzaF/2TimMFeLEQTf4T8cgc6c0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-plugins", "repo": "hyprland-plugins",
"rev": "2530394e67b436f4aea8225111cf37c1403ccb78", "rev": "0bc619b2c3b4f9c2b65247e81d69f8bbc573d991",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1464,7 +1406,6 @@
}, },
"hyprlock": { "hyprlock": {
"inputs": { "inputs": {
"hyprgraphics": "hyprgraphics",
"hyprlang": "hyprlang_3", "hyprlang": "hyprlang_3",
"hyprutils": "hyprutils_3", "hyprutils": "hyprutils_3",
"nixpkgs": [ "nixpkgs": [
@ -1473,11 +1414,11 @@
"systems": "systems_9" "systems": "systems_9"
}, },
"locked": { "locked": {
"lastModified": 1733073235, "lastModified": 1732023353,
"narHash": "sha256-zbaWpcnwK9XG2lzWPNY2tAtEoTAO4HVk1tMM6AsJq8I=", "narHash": "sha256-FbHP2io0nKSC0qEjTdAhrfmlqiv9oB1P/DcV3jFAnWY=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlock", "repo": "hyprlock",
"rev": "cc7ffe73e7588137eb239239da0d83fe334b3ddd", "rev": "578246b9967dec77c56993dc55ca192d35ba9bb7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1488,7 +1429,6 @@
}, },
"hyprpaper": { "hyprpaper": {
"inputs": { "inputs": {
"hyprgraphics": "hyprgraphics_2",
"hyprlang": "hyprlang_4", "hyprlang": "hyprlang_4",
"hyprutils": "hyprutils_4", "hyprutils": "hyprutils_4",
"hyprwayland-scanner": "hyprwayland-scanner_2", "hyprwayland-scanner": "hyprwayland-scanner_2",
@ -1498,11 +1438,11 @@
"systems": "systems_10" "systems": "systems_10"
}, },
"locked": { "locked": {
"lastModified": 1732809500, "lastModified": 1732281484,
"narHash": "sha256-CW4r78WhaHtFJN6L+heBztj02ucxthBPgUzFeUZ+yVw=", "narHash": "sha256-0a+oP7iBgAsgMQ2Vz7LlZVfqfvj4W1iuyjHgIs0VEYM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprpaper", "repo": "hyprpaper",
"rev": "a3ceb20095c1fae9acb10c37713caf2df28f3ec9", "rev": "0b5e350011116f4bfa0d004a7b3b8c8e30425619",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1521,11 +1461,11 @@
"systems": "systems_11" "systems": "systems_11"
}, },
"locked": { "locked": {
"lastModified": 1732810179, "lastModified": 1731193353,
"narHash": "sha256-J39wjWN4+dxjwf8Fw5yv1aVcbkOg7oQi42zVY4ZxJMU=", "narHash": "sha256-oiNuCxbwtfLOPGEoXjsojdVOXNEL5aFPtdELdaz65hw=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprpicker", "repo": "hyprpicker",
"rev": "d26cb2f4396e4fd3477f5f12131c87c2f5002ab7", "rev": "4e8837ddabf669600c9571189e8a6a7937ba336a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1742,11 +1682,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733491721, "lastModified": 1732648910,
"narHash": "sha256-n4fTKTYXeGRngeanNDxSxbuWSRCQ6l74IwOBlqp8dcw=", "narHash": "sha256-1F83DUfEHnCZpGY4UOlWaamWoDx8eZ9tHaUF51p2hng=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "0f415721ee427270bc078ef3a5ba2a308d47461f", "rev": "e86d2ad72094354326887bd6fe156f327d63d491",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1903,11 +1843,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733024876, "lastModified": 1732519917,
"narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=", "narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "6e0b7f81367069589a480b91603a10bcf71f3103", "rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1923,11 +1863,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733024876, "lastModified": 1732519917,
"narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=", "narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "6e0b7f81367069589a480b91603a10bcf71f3103", "rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1968,11 +1908,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733623412, "lastModified": 1732653228,
"narHash": "sha256-Dc7xuCu6XaSTYbfRxQDHl0nW8mgIXWr8YRBOEmm9GMk=", "narHash": "sha256-FtJ0ByjxgRdF39wZ7ezEkDFLurTUjSa8MsBHVMB/xqQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "094ded90ffc925bca8a44ef47f03f229c9fc68f2", "rev": "82943da4abd1d29dc98ce1630e717eb863f33b72",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2022,11 +1962,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1732760430, "lastModified": 1732342928,
"narHash": "sha256-HC+kuzNIL5q87s5ISeJQk3Dv8pqg8U8wDyRSBrpFeFY=", "narHash": "sha256-87zIj5gt1wY0UmRXHnf4ydCJoweOX4HCS/nEbvEF0b8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixd", "repo": "nixd",
"rev": "f12e2f77094ac73c1b1101390c02ec5bcf69ad46", "rev": "5507bb141efc11cf548e87e39b61da66dfbca9e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2037,11 +1977,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1733481457, "lastModified": 1732483221,
"narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "e563803af3526852b6b1d77107a81908c66a9fcf", "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2166,11 +2106,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1733384649, "lastModified": 1731797254,
"narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=", "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13", "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2182,11 +2122,11 @@
}, },
"nixpkgs-staging-next": { "nixpkgs-staging-next": {
"locked": { "locked": {
"lastModified": 1733594656, "lastModified": 1732644279,
"narHash": "sha256-kpCCbAyJLkGPabUbfNU2+qkffFOoaKVomCUXICscBKc=", "narHash": "sha256-zxHhbvoM8+eYQgggJ7fVok/bcs/tWgydtaV+RKkJ5cw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cb0b413f460a27fac50ff32a6a49f7ee9780f3ea", "rev": "8c2d58df123aafefb5301e31b12d850cf0599abf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2198,11 +2138,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1733392399, "lastModified": 1732521221,
"narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -40,7 +40,7 @@ in {
font = { font = {
emoji = mkOption {default = "Noto Color Emoji";}; emoji = mkOption {default = "Noto Color Emoji";};
monospace = mkOption {default = "IosevkaTermSlab NFP Medium";}; monospace = mkOption {default = "Iosevka NFP SemiBold";};
sans-serif = mkOption {default = "Outfit";}; sans-serif = mkOption {default = "Outfit";};
serif = mkOption {default = "Liberation Serif";}; serif = mkOption {default = "Liberation Serif";};
}; };

View file

@ -26,7 +26,7 @@ in {
device_battery = "gamepad,mouse"; device_battery = "gamepad,mouse";
dynamic_frame_timing = true; dynamic_frame_timing = true;
engine_color = "dc322f"; engine_color = "dc322f";
font_file = "${pkgs.nerd-fonts.iosevka}/share/fonts/truetype/NerdFonts/IosevkaTermSlabNerdFontPropo-Medium.ttf"; font_file = "${(pkgs.nerdfonts.override {fonts = ["Iosevka"];})}/share/fonts/truetype/NerdFonts/IosevkaNerdFontPropo-SemiBold.ttf";
font_size = 24; font_size = 24;
fps_limit = "100,75,60,50"; # !! Monitor dependent fps_limit = "100,75,60,50"; # !! Monitor dependent
fps_limit_method = "early"; # Smoother frametimes compared to late fps_limit_method = "early"; # Smoother frametimes compared to late

View file

@ -14,21 +14,11 @@ in {
fonts = { fonts = {
enableDefaultPackages = true; # Fallback fonts enableDefaultPackages = true; # Fallback fonts
packages = with pkgs.nerd-fonts; packages = with pkgs; [
[ # Monospace
### Monospace (nerdfonts.override {fonts = ["Iosevka"];})
# https://www.nerdfonts.com/#home
#?? kitten choose-fonts # Sans Serif
departure-mono
gohufont
iosevka-term
iosevka-term-slab
jetbrains-mono
space-mono
zed-mono
]
++ (with pkgs; [
### Sans Serif
(google-fonts.override { (google-fonts.override {
fonts = [ fonts = [
# Text # Text
@ -44,11 +34,10 @@ in {
]; ];
}) })
### Other
# Microsoft # Microsoft
corefonts corefonts
vistafonts vistafonts
]); ];
#?? fc-list --brief | grep family: | sort #?? fc-list --brief | grep family: | sort
fontconfig.defaultFonts = { fontconfig.defaultFonts = {
@ -59,6 +48,7 @@ in {
}; };
}; };
home-manager.users.${config.custom.username}.fonts.fontconfig.defaultFonts = config.fonts.fontconfig.defaultFonts; home-manager.users.${config.custom.username}.fonts.fontconfig.defaultFonts =
config.fonts.fontconfig.defaultFonts;
}; };
} }