Myned/nixos
Myned/nixos
1
1
Fork 0
Code Issues Activity

Compare commits

base: Myned:ef8f3957e80969ca85f67e84539f11a008c15744
Branches Tags
Myned:master
...
compare: Myned:7d1e2a757a807dc6686a40c9807b8bc6c763b4f7
Branches Tags
Myned:master

7 commits
ef8f3957e8 ... 7d1e2a757a

Author SHA1 Message Date
Myned
7d1e2a757a
nix: update flake.lock 
Signed-off-by: Myned <dev@bjork.tech>
 2025-01-12 13:20:16 -06:00
Myned
4b38dce2ae
gtk: modify font size and clean up formatting 
Signed-off-by: Myned <dev@bjork.tech>
 2025-01-12 13:20:06 -06:00
Myned
7b7e032851
fonts: add more typefaces 
Signed-off-by: Myned <dev@bjork.tech>
 2025-01-12 13:19:18 -06:00
Myned
921263e7e6
nautilus: enable service 
Signed-off-by: Myned <dev@bjork.tech>
 2025-01-12 13:18:46 -06:00
Myned
04e4b47794
search: add google fonts engine 
Signed-off-by: Myned <dev@bjork.tech>
 2025-01-12 13:18:31 -06:00
Myned
d8427e213a
niri: update rules to nix syntax 
Signed-off-by: Myned <dev@bjork.tech>
 2025-01-12 13:17:53 -06:00
Myned
163cb674bb
niri: add text editor bind 
Signed-off-by: Myned <dev@bjork.tech>
 2025-01-12 13:17:16 -06:00
10 changed files with 144 additions and 125 deletions
Show stats Expand all files Collapse all files

108
flake.lock generated
View file

@ -74,11 +74,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736090999, "lastModified": 1736677288,
"narHash": "sha256-B5CJuHqfJrzPa7tObK0H9669/EClSHpa/P7B9EuvElU=", "narHash": "sha256-Vj3WOLy6o6Zf44Rwg9eLqNRQPlVoDrQ89tsef3l3990=",
"owner": "Aylur", "owner": "Aylur",
"repo": "ags", "repo": "ags",
"rev": "5527c3c07d92c11e04e7fd99d58429493dba7e3c", "rev": "90db9b9fecc0f4228440d83107c6c745a35e7d77",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -623,11 +623,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736199437, "lastModified": 1736591904,
"narHash": "sha256-TdU0a/x8048rbbJmkKWzSY1CtsbbGKNkIJcMdr8Zf4Q=", "narHash": "sha256-LFO8pSrPKrH8OPq2HaAuBG5skk8/MNJ/9YmK3KsnSks=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "49f8aa791f81ff2402039b3efe0c35b9386c4bcf", "rev": "33827d2bd16bfe2e21b62956526c72d313595dfd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1484,11 +1484,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736421950, "lastModified": 1736508663,
"narHash": "sha256-RyrX0WFXxFrYvzHNLTIyuk3NcNl3UBykuYru/P0zW5E=", "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d4aebb947a301b8da8654a804979a738c5c5da50", "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1883,11 +1883,11 @@
"systems": "systems_9" "systems": "systems_9"
}, },
"locked": { "locked": {
"lastModified": 1736169493, "lastModified": 1736613498,
"narHash": "sha256-btbk2tgg8LcOZZoKkaRutZLTylR9bJ6Gn/dadnYjCvc=", "narHash": "sha256-evIiWy0nFQlh+0gxCaAQUqx/rpBOZbWg7S6YSyOS/sA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlock", "repo": "hyprlock",
"rev": "de844d39adb09a827f15f4246a10bb7876f3c341", "rev": "023aff52ad45a3c55144c6bbda33395dfb9e9db0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2177,11 +2177,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736409493, "lastModified": 1736580596,
"narHash": "sha256-XezBEaGENmXgndx2gsVxQ0JoHUeQs9OSUZvVx/GDqyQ=", "narHash": "sha256-t+BygGMcg1yyyTBXCAJWx4ZnH1StDzbd8CfzQonAJp8=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "9a958cc0aa5241ea3badf44a063a4b0389dc0110", "rev": "1ddf0b3bfe076fa50b84244e42a55b9234f96083",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2232,11 +2232,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1736412901, "lastModified": 1736614405,
"narHash": "sha256-BlZBzs895dvKE3Y9joC8kxAsTOFBchIWC2YNtWhysew=", "narHash": "sha256-AJ1rlgNOPb3/+DbS5hkhm21t6Oz8IgqLllwmZt0lyzk=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "142e57450dae5eba25b7f306d3c6dc9f51518a3d", "rev": "e05bc269e678ecf828b96ae79c991c13b00b38a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2257,11 +2257,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1736416109, "lastModified": 1736673871,
"narHash": "sha256-WXh21oWr1CdyjbHiLgJsxWh3Cgn/PX0emP00jpD+61U=", "narHash": "sha256-NdVXsCowp7EoljenuHyQDvdlAoSR1SM+AtdlgyqlqtY=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "4f9b050c5106d40a56bdf29d1f262711554c158e", "rev": "488841331264a7b1315830ab0425cfdd469d43a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2290,11 +2290,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1736412901, "lastModified": 1736614405,
"narHash": "sha256-BlZBzs895dvKE3Y9joC8kxAsTOFBchIWC2YNtWhysew=", "narHash": "sha256-AJ1rlgNOPb3/+DbS5hkhm21t6Oz8IgqLllwmZt0lyzk=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "142e57450dae5eba25b7f306d3c6dc9f51518a3d", "rev": "e05bc269e678ecf828b96ae79c991c13b00b38a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2433,11 +2433,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736047960, "lastModified": 1736652904,
"narHash": "sha256-hutd85FA1jUJhhqBRRJ+u7UHO9oFGD/RVm2x5w8WjVQ=", "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "816a6ae88774ba7e74314830546c29e134e0dffb", "rev": "271e5bd7c57e1f001693799518b10a02d1123b12",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2453,11 +2453,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736047960, "lastModified": 1736652904,
"narHash": "sha256-hutd85FA1jUJhhqBRRJ+u7UHO9oFGD/RVm2x5w8WjVQ=", "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "816a6ae88774ba7e74314830546c29e134e0dffb", "rev": "271e5bd7c57e1f001693799518b10a02d1123b12",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2498,11 +2498,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736388880, "lastModified": 1736646936,
"narHash": "sha256-lA+4MhhcdoanbMnFLjZW+jPdEKcsLs9st2GAst1iuVU=", "narHash": "sha256-NJaM0SiWs6nSZCQ9w3H9cV6ysg447/PYoBpMWYV12h4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "2a84ca07753e3ec608c96ed2907606361979467a", "rev": "5669bbca35e6dd98ba43477e2fa4d87d0a0da3db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2567,11 +2567,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1736283893, "lastModified": 1736441705,
"narHash": "sha256-BG1FfTexFwNty5VhYjaQLMR6CMPfI3QRcaZrFQYu2EM=", "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "4f339f6be2b61662f957c2ee9eda0fa597d8a6d6", "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2626,11 +2626,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1736463205, "lastModified": 1736699512,
"narHash": "sha256-CfGtZWEbLitx2XIsJzAa/vHxvgv4DECfW7g14z2in/w=", "narHash": "sha256-m8hVad/QDLshUg3yubq9ve6QZMyIZ+MWtkza+P+U5QQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bc4f1c13b19761d41e24afc84e433bbb9637cc14", "rev": "1be4915300454a13010cc65fd6dfbca27aa57b8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2722,11 +2722,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1736200483, "lastModified": 1736549401,
"narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2738,11 +2738,11 @@
}, },
"nixpkgs-stable_5": { "nixpkgs-stable_5": {
"locked": { "locked": {
"lastModified": 1736200483, "lastModified": 1736549401,
"narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2754,11 +2754,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1736344531, "lastModified": 1736523798,
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "rev": "130595eba61081acde9001f43de3248d8888ac4a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -3047,11 +3047,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1736300059, "lastModified": 1736698505,
"narHash": "sha256-z3mR+0gBN/iVM8UgfCSIxjgw4jm1bu1kjMKyQx9mGBc=", "narHash": "sha256-aK0EEINPULn6Er8X5PavqYdPd1armqvn2NigVzeEXpc=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "168306ce7f5d823ccee8b7d4e112ea20671c2b8f", "rev": "0a20c8d0ede42be2ab75038f868f6b961d9d827f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -3518,11 +3518,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1736399287, "lastModified": 1736487362,
"narHash": "sha256-6S9TXKK/4PZGQkl3GTGq479aRN1Z1pgbSxs6/dNKUJ4=", "narHash": "sha256-4kGoOA7FgK9N2mzS+TFEn41kUUNY6KwdiA/0rqlr868=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "ba9c1a6a3e00dc01a9a6a2bf57c5fc0c5aa46ed4", "rev": "8f55e27f63a749881c4bbfbb6b1da028342a91d1",
"type": "github" "type": "github"
}, },
"original": { "original": {

7
options/custom/desktops/niri/binds.nix
View file

@ -13,6 +13,7 @@ with lib; let
cat = "${pkgs.coreutils}/bin/cat"; cat = "${pkgs.coreutils}/bin/cat";
codium = "${config.home-manager.users.${config.custom.username}.programs.vscode.package}/bin/codium"; codium = "${config.home-manager.users.${config.custom.username}.programs.vscode.package}/bin/codium";
ghostty = "${hm.programs.ghostty.package}/bin/ghostty"; ghostty = "${hm.programs.ghostty.package}/bin/ghostty";
gnome-text-editor = "${pkgs.gnome-text-editor}/bin/gnome-text-editor";
hyprlock = "${config.home-manager.users.${config.custom.username}.programs.hyprlock.package}/bin/hyprlock"; hyprlock = "${config.home-manager.users.${config.custom.username}.programs.hyprlock.package}/bin/hyprlock";
hyprpicker = "${pkgs.hyprpicker}/bin/hyprpicker"; hyprpicker = "${pkgs.hyprpicker}/bin/hyprpicker";
inhibit = config.home-manager.users.${config.custom.username}.home.file.".local/bin/inhibit".source; inhibit = config.home-manager.users.${config.custom.username}.home.file.".local/bin/inhibit".source;
@ -115,14 +116,16 @@ in {
(key "Delete" "Ctrl+Alt" (spawn [loginctl "terminate-user" config.custom.username])) (key "Delete" "Ctrl+Alt" (spawn [loginctl "terminate-user" config.custom.username]))
(key "Delete" "Mod" (spawn [playerctl] "play-pause")) (key "Delete" "Mod" (spawn [playerctl] "play-pause"))
(key "Down" "Mod" (spawn [swayosd-client "--brightness" "lower"])) (key "Down" "Mod" (spawn [swayosd-client "--brightness" "lower"]))
(key "E" "Ctrl+Alt" (spawn [pkill "codium"])) (key "E" "Ctrl+Alt" (spawn [pkill "gnome-text-editor"]))
(key "E" "Mod" (spawn codium)) (key "E" "Mod" (spawn gnome-text-editor))
(key "Equal" "Mod" (spawn [swayosd-client "--output-volume" "raise"])) (key "Equal" "Mod" (spawn [swayosd-client "--output-volume" "raise"]))
(key "Escape" "Mod" toggle-window-floating) (key "Escape" "Mod" toggle-window-floating)
(key "Escape" "Mod+Alt" (spawn ["lifx" "state" "--color" "red"])) (key "Escape" "Mod+Alt" (spawn ["lifx" "state" "--color" "red"]))
(key "F" "Mod" (spawn [nautilus "--new-window"])) (key "F" "Mod" (spawn [nautilus "--new-window"]))
(key "G" "Ctrl+Alt" (spawn [pkill "steam"])) (key "G" "Ctrl+Alt" (spawn [pkill "steam"]))
(key "G" "Mod" (spawn steam)) (key "G" "Mod" (spawn steam))
(key "I" "Ctrl+Alt" (spawn [pkill "codium"]))
(key "I" "Mod" (spawn codium))
(key "K" "Ctrl+Alt" (spawn [pkill "obsidian"])) (key "K" "Ctrl+Alt" (spawn [pkill "obsidian"]))
(key "K" "Mod" (spawn obsidian)) (key "K" "Mod" (spawn obsidian))
(key "L" "Mod" (spawn [bash "-c" "${hyprlock} --immediate & ${niri} msg action power-off-monitors"])) (key "L" "Mod" (spawn [bash "-c" "${hyprlock} --immediate & ${niri} msg action power-off-monitors"]))

46
options/custom/desktops/niri/default.nix
View file

@ -61,48 +61,10 @@ in {
# https://github.com/YaLTeR/niri/wiki/Configuration:-Overview # https://github.com/YaLTeR/niri/wiki/Configuration:-Overview
# HACK: Prepend validated kdl config not currently implemented in settings module for e.g. custom build # HACK: Prepend validated kdl config not currently implemented in settings module for e.g. custom build
# https://github.com/sodiboo/niri-flake/blob/main/settings.nix # https://github.com/sodiboo/niri-flake/blob/main/settings.nix
config = let config = with inputs.niri-flake.lib;
# BUG: Fixed width may not take borders into account (internal.settings-module {config = hm;}).options.programs.niri.config.default
# https://github.com/YaLTeR/niri/issues/269 # https://github.com/sodiboo/niri-flake/blob/main/default-config.kdl.nix
pip = with config.custom; rec { ++ (with kdl; []);
x = gap;
y = gap;
w = builtins.floor (width * 0.3 - gap); # 30%
h = builtins.floor (w * 9 / 16); # 16:9
};
in
with inputs.niri-flake.lib;
(internal.settings-module {config = hm;}).options.programs.niri.config.default
# https://github.com/sodiboo/niri-flake/blob/main/default-config.kdl.nix
++ (with kdl; [
# TODO: Migrate to window-rules when released
# https://github.com/YaLTeR/niri/pull/871
(plain "window-rule" [
(leaf "match" {is-floating = true;})
(plain "border" [(flag "off")])
(plain "focus-ring" [(flag "off")])
])
(plain "window-rule" [
(leaf "match" {title = "^Picture.in.[Pp]icture$";})
(leaf "default-floating-position" {
x = pip.x;
y = pip.y;
relative-to = "top-right";
})
(plain "default-column-width" [(leaf "fixed" (pip.w))])
(plain "default-window-height" [(leaf "fixed" (pip.h))])
(leaf "open-floating" true)
(leaf "open-focused" false)
])
(plain "window-rule" [
(leaf "match" {app-id = "^(sdl-|wl|x)freerdp$";})
(leaf "open-floating" false)
])
]);
# https://github.com/YaLTeR/niri/wiki/Configuration:-Debug-Options # https://github.com/YaLTeR/niri/wiki/Configuration:-Debug-Options
# https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingsdebug # https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingsdebug

33
options/custom/desktops/niri/rules.nix
View file

@ -42,6 +42,14 @@ in {
clip-to-geometry = true; clip-to-geometry = true;
} }
{
# Floating
matches = [{is-floating = true;}];
border.enable = false;
focus-ring.enable = false;
}
{ {
# Startup # Startup
#?? <= 60 secs after niri launches #?? <= 60 secs after niri launches
@ -139,10 +147,30 @@ in {
#// open-on-workspace = "2"; #// open-on-workspace = "2";
} }
{ (let
# BUG: Fixed width may not take borders into account
# https://github.com/YaLTeR/niri/issues/269
pip = with config.custom; rec {
x = gap;
y = gap;
w = builtins.floor (width * 0.3 - gap); # 30%
h = builtins.floor (w * 9 / 16); # 16:9
};
in {
# PiP # PiP
matches = [{title = "^Picture.in.[Pp]icture$";}]; matches = [{title = "^Picture.in.[Pp]icture$";}];
}
default-floating-position = {
x = pip.x;
y = pip.y;
relative-to = "top-right";
};
default-column-width.fixed = pip.w;
default-window-height.fixed = pip.h;
open-floating = true;
open-focused = false;
})
{ {
# Terminals # Terminals
@ -170,6 +198,7 @@ in {
{app-id = "^virt-manager$";} {app-id = "^virt-manager$";}
]; ];
open-floating = false;
#// open-on-workspace = "1"; #// open-on-workspace = "1";
} }

6
options/custom/programs/chromium.nix
View file

@ -120,6 +120,12 @@ in {
url = "https://github.com/search?q={searchTerms}"; url = "https://github.com/search?q={searchTerms}";
} }
{
name = "Google Fonts";
shortcut = "gf";
url = "https://fonts.google.com/?query={searchTerms}";
}
{ {
name = "Home Manager Issues"; name = "Home Manager Issues";
shortcut = "hi"; shortcut = "hi";

7
options/custom/programs/firefox.nix
View file

@ -318,6 +318,13 @@ in {
URLTemplate = "https://www.google.com/search?q={searchTerms}"; URLTemplate = "https://www.google.com/search?q={searchTerms}";
} }
{
Name = "Google Fonts";
Alias = "gf";
IconURL = "https://www.gstatic.com/images/icons/material/apps/fonts/1x/catalog/v5/favicon.svg";
URLTemplate = "https://fonts.google.com/?query={searchTerms}";
}
{ {
Name = "GitHub"; Name = "GitHub";
Alias = "gh"; Alias = "gh";

2
options/custom/programs/nautilus.nix
View file

@ -11,7 +11,7 @@ in {
enable = mkOption {default = false;}; enable = mkOption {default = false;};
git = mkOption {default = false;}; git = mkOption {default = false;};
index = mkOption {default = true;}; index = mkOption {default = true;};
service = mkOption {default = false;}; service = mkOption {default = true;};
terminal = mkOption {default = "ghostty";}; terminal = mkOption {default = "ghostty";};
}; };

6
options/custom/programs/walker/search.sh
View file

@ -56,6 +56,12 @@ case "$1" in
url="https://www.google.com/search?q=" url="https://www.google.com/search?q="
query="${1:2}" query="${1:2}"
;; ;;
'gf '*)
label="Google Fonts"
icon="google"
url="https://fonts.google.com/?query="
query="${1:3}"
;;
'gh '*) 'gh '*)
label="GitHub" label="GitHub"
icon="github" icon="github"

42
options/custom/settings/fonts.nix
View file

@ -12,9 +12,9 @@ in {
emoji = mkOption {default = "Blobmoji";}; emoji = mkOption {default = "Blobmoji";};
fallback = mkOption {default = "Unifont";}; fallback = mkOption {default = "Unifont";};
monospace = mkOption {default = "IosevkaTermSlab NFP Medium";}; monospace = mkOption {default = "IosevkaTermSlab NFP Medium";};
sans-serif = mkOption {default = "Afacad";}; sans-serif = mkOption {default = "Arvo";};
serif = mkOption {default = "Lora";}; serif = mkOption {default = "Lora";};
weight = mkOption {default = "500";}; weight = mkOption {default = "400";};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
@ -24,7 +24,7 @@ in {
packages = with pkgs.nerd-fonts; packages = with pkgs.nerd-fonts;
[ [
### Monospace # Monospace
# https://www.nerdfonts.com/#home # https://www.nerdfonts.com/#home
#?? kitten choose-fonts #?? kitten choose-fonts
departure-mono departure-mono
@ -32,6 +32,7 @@ in {
iosevka-term iosevka-term
iosevka-term-slab iosevka-term-slab
jetbrains-mono jetbrains-mono
roboto-mono
shure-tech-mono shure-tech-mono
space-mono space-mono
zed-mono zed-mono
@ -39,28 +40,39 @@ in {
++ (with pkgs; [ ++ (with pkgs; [
(google-fonts.override { (google-fonts.override {
fonts = [ fonts = [
### Sans Serif
# Text
"Afacad"
"Outfit"
"Urbanist"
# Condensed
"Oswald"
# Pixel # Pixel
"Geo" "Geo"
"Silkscreen" "Silkscreen"
### Serif # Sans-serif
"Josefin Sans"
"Jost"
"Lexend"
"Outfit"
"Roboto"
"Roboto Flex"
# Sans-serif condensed
"Oswald"
"Roboto Condensed"
# Serif
"Lora" "Lora"
"Roboto Serif"
# Slab
"Aleo"
"Arvo"
"Josefin Slab"
"Roboto Slab"
"Solway"
]; ];
}) })
### Emoji # Emoji
noto-fonts-color-emoji
noto-fonts-emoji-blob-bin noto-fonts-emoji-blob-bin
### Other
# Microsoft # Microsoft
corefonts corefonts
vistafonts vistafonts

12
options/custom/settings/gtk/default.nix
View file

@ -23,7 +23,7 @@ in {
font = with config.custom.settings.fonts; { font = with config.custom.settings.fonts; {
name = sans-serif; name = sans-serif;
size = 14; size = 12;
}; };
cursorTheme = with config.custom.settings.icons.cursor; { cursorTheme = with config.custom.settings.icons.cursor; {
@ -42,14 +42,8 @@ in {
#// package = pkgs.adw-gtk3; #// package = pkgs.adw-gtk3;
}; };
gtk3 = { gtk3.extraCss = css;
extraCss = css; gtk4.extraCss = css;
};
gtk4 = {
#// extraConfig.gtk-hint-font-metrics = 1; # Fix blurry fonts
extraCss = css;
};
}; };
}; };
} }