Compare commits
7 commits
15f1278142
...
ef8f3957e8
Author | SHA1 | Date | |
---|---|---|---|
ef8f3957e8 | |||
4cc5db838f | |||
85bc980e12 | |||
4bfe083b80 | |||
9186d72672 | |||
d7a6d64a4d | |||
5c9f535ed5 |
7 changed files with 34 additions and 19 deletions
|
@ -107,6 +107,7 @@ in {
|
||||||
(key "B" "Mod" (spawn config.custom.browser.command))
|
(key "B" "Mod" (spawn config.custom.browser.command))
|
||||||
(key "Backslash" "Mod" (spawn inhibit))
|
(key "Backslash" "Mod" (spawn inhibit))
|
||||||
(key "Backslash" "Mod+Shift" (spawn power))
|
(key "Backslash" "Mod+Shift" (spawn power))
|
||||||
|
(key "Backspace" "Mod" center-column)
|
||||||
(key "Bracketleft" "Mod" (switch-layout "prev"))
|
(key "Bracketleft" "Mod" (switch-layout "prev"))
|
||||||
(key "Bracketright" "Mod" (switch-layout "next"))
|
(key "Bracketright" "Mod" (switch-layout "next"))
|
||||||
(key "C" "Mod" (spawn [walker "--modules" "clipboard"]))
|
(key "C" "Mod" (spawn [walker "--modules" "clipboard"]))
|
||||||
|
@ -137,7 +138,6 @@ in {
|
||||||
(key "R" "Mod" focus-window-or-workspace-down)
|
(key "R" "Mod" focus-window-or-workspace-down)
|
||||||
(key "R" "Mod+Shift" move-window-down-or-to-workspace-down)
|
(key "R" "Mod+Shift" move-window-down-or-to-workspace-down)
|
||||||
(key "Return" "Mod" maximize-column)
|
(key "Return" "Mod" maximize-column)
|
||||||
(key "Return" "Mod+Ctrl" center-column)
|
|
||||||
(key "Return" "Mod+Shift" fullscreen-window)
|
(key "Return" "Mod+Shift" fullscreen-window)
|
||||||
(key "Right" "Mod" (spawn [playerctl "next"]))
|
(key "Right" "Mod" (spawn [playerctl "next"]))
|
||||||
(key "S" "Mod" focus-column-or-monitor-right)
|
(key "S" "Mod" focus-column-or-monitor-right)
|
||||||
|
|
|
@ -24,8 +24,8 @@ in {
|
||||||
border = {
|
border = {
|
||||||
enable = true;
|
enable = true;
|
||||||
width = 1;
|
width = 1;
|
||||||
active.color = "#073642";
|
active.color = "#002b36";
|
||||||
inactive.color = "#073642";
|
inactive.color = "#002b36";
|
||||||
};
|
};
|
||||||
|
|
||||||
# https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingslayoutcenter-focused-column
|
# https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingslayoutcenter-focused-column
|
||||||
|
|
|
@ -39,9 +39,9 @@ in {
|
||||||
# https://ghostty.org/docs/config/reference#font-size
|
# https://ghostty.org/docs/config/reference#font-size
|
||||||
font-size = 14;
|
font-size = 14;
|
||||||
|
|
||||||
# https://github.com/ghostty-org/ghostty/discussions/3515
|
|
||||||
# https://ghostty.org/docs/config/reference#freetype-load-flags
|
# https://ghostty.org/docs/config/reference#freetype-load-flags
|
||||||
freetype-load-flags = "no-force-autohint";
|
# https://github.com/ghostty-org/ghostty/discussions/3515
|
||||||
|
#// freetype-load-flags = "no-force-autohint";
|
||||||
|
|
||||||
# https://ghostty.org/docs/config/reference#gtk-titlebar
|
# https://ghostty.org/docs/config/reference#gtk-titlebar
|
||||||
gtk-titlebar = false;
|
gtk-titlebar = false;
|
||||||
|
|
|
@ -12,7 +12,7 @@ in {
|
||||||
git = mkOption {default = false;};
|
git = mkOption {default = false;};
|
||||||
index = mkOption {default = true;};
|
index = mkOption {default = true;};
|
||||||
service = mkOption {default = false;};
|
service = mkOption {default = false;};
|
||||||
terminal = mkOption {default = "kitty";};
|
terminal = mkOption {default = "ghostty";};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
|
|
@ -40,15 +40,15 @@ in {
|
||||||
|
|
||||||
# https://github.com/ErikReider/SwayNotificationCenter/blob/main/src/configSchema.json
|
# https://github.com/ErikReider/SwayNotificationCenter/blob/main/src/configSchema.json
|
||||||
settings = {
|
settings = {
|
||||||
control-center-height = builtins.floor (config.custom.height / 2);
|
control-center-height = builtins.floor (config.custom.height * 0.75); # 75%
|
||||||
control-center-positionY = "bottom";
|
control-center-positionY = "bottom";
|
||||||
control-center-width = builtins.floor (750 * config.custom.scale);
|
control-center-width = 750;
|
||||||
fit-to-screen = false;
|
fit-to-screen = false;
|
||||||
hide-on-clear = true;
|
hide-on-clear = true;
|
||||||
notification-2fa-action = false;
|
notification-2fa-action = false;
|
||||||
notification-icon-size = 32;
|
notification-icon-size = 32;
|
||||||
#// notification-inline-replies = true;
|
#// notification-inline-replies = true;
|
||||||
notification-window-width = builtins.floor (500 * config.custom.scale);
|
notification-window-width = 500;
|
||||||
positionX = "center";
|
positionX = "center";
|
||||||
positionY = "top";
|
positionY = "top";
|
||||||
timeout = 5; # normal
|
timeout = 5; # normal
|
||||||
|
|
|
@ -9,11 +9,12 @@ with lib; let
|
||||||
in {
|
in {
|
||||||
options.custom.settings.fonts = {
|
options.custom.settings.fonts = {
|
||||||
enable = mkOption {default = false;};
|
enable = mkOption {default = false;};
|
||||||
emoji = mkOption {default = "Noto Color Emoji";};
|
emoji = mkOption {default = "Blobmoji";};
|
||||||
fallback = mkOption {default = "Unifont";};
|
fallback = mkOption {default = "Unifont";};
|
||||||
monospace = mkOption {default = "IosevkaTerm NFP SemiBold";};
|
monospace = mkOption {default = "IosevkaTermSlab NFP Medium";};
|
||||||
sans-serif = mkOption {default = "Outfit";};
|
sans-serif = mkOption {default = "Afacad";};
|
||||||
serif = mkOption {default = "Liberation Serif";};
|
serif = mkOption {default = "Lora";};
|
||||||
|
weight = mkOption {default = "500";};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
@ -31,26 +32,34 @@ in {
|
||||||
iosevka-term
|
iosevka-term
|
||||||
iosevka-term-slab
|
iosevka-term-slab
|
||||||
jetbrains-mono
|
jetbrains-mono
|
||||||
|
shure-tech-mono
|
||||||
space-mono
|
space-mono
|
||||||
zed-mono
|
zed-mono
|
||||||
]
|
]
|
||||||
++ (with pkgs; [
|
++ (with pkgs; [
|
||||||
### Sans Serif
|
|
||||||
(google-fonts.override {
|
(google-fonts.override {
|
||||||
fonts = [
|
fonts = [
|
||||||
|
### Sans Serif
|
||||||
# Text
|
# Text
|
||||||
"Jost"
|
"Afacad"
|
||||||
"Lexend"
|
|
||||||
"Outfit"
|
"Outfit"
|
||||||
|
"Urbanist"
|
||||||
|
|
||||||
# Condensed
|
# Condensed
|
||||||
"Oswald"
|
"Oswald"
|
||||||
|
|
||||||
# Pixel
|
# Pixel
|
||||||
|
"Geo"
|
||||||
"Silkscreen"
|
"Silkscreen"
|
||||||
|
|
||||||
|
### Serif
|
||||||
|
"Lora"
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
|
|
||||||
|
### Emoji
|
||||||
|
noto-fonts-emoji-blob-bin
|
||||||
|
|
||||||
### Other
|
### Other
|
||||||
# Microsoft
|
# Microsoft
|
||||||
corefonts
|
corefonts
|
||||||
|
@ -60,7 +69,7 @@ in {
|
||||||
unifont
|
unifont
|
||||||
]);
|
]);
|
||||||
|
|
||||||
#?? fc-list --brief | grep family: | sort
|
#?? fc-list : family | sort
|
||||||
fontconfig.defaultFonts = {
|
fontconfig.defaultFonts = {
|
||||||
emoji = [cfg.emoji];
|
emoji = [cfg.emoji];
|
||||||
monospace = [cfg.monospace];
|
monospace = [cfg.monospace];
|
||||||
|
|
|
@ -11,13 +11,19 @@ in {
|
||||||
|
|
||||||
config.home-manager.users.${config.custom.username} = mkIf cfg.enable {
|
config.home-manager.users.${config.custom.username} = mkIf cfg.enable {
|
||||||
gtk = let
|
gtk = let
|
||||||
css = readFile ./style.css;
|
css = ''
|
||||||
|
* {
|
||||||
|
font-weight: ${config.custom.settings.fonts.weight};
|
||||||
|
}
|
||||||
|
|
||||||
|
${readFile ./style.css}
|
||||||
|
'';
|
||||||
in {
|
in {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
font = with config.custom.settings.fonts; {
|
font = with config.custom.settings.fonts; {
|
||||||
name = sans-serif;
|
name = sans-serif;
|
||||||
size = 12;
|
size = 14;
|
||||||
};
|
};
|
||||||
|
|
||||||
cursorTheme = with config.custom.settings.icons.cursor; {
|
cursorTheme = with config.custom.settings.icons.cursor; {
|
||||||
|
|
Loading…
Add table
Reference in a new issue