Updated fonts and symbols stuff.
This commit is contained in:
parent
43ae001367
commit
a4ef5a74ef
|
|
@ -99,6 +99,7 @@ rec {
|
||||||
imv
|
imv
|
||||||
vlc
|
vlc
|
||||||
pavucontrol
|
pavucontrol
|
||||||
|
font-manager
|
||||||
] ++ # Basic graphical apps
|
] ++ # Basic graphical apps
|
||||||
[
|
[
|
||||||
libreoffice
|
libreoffice
|
||||||
|
|
@ -122,9 +123,9 @@ rec {
|
||||||
olympus
|
olympus
|
||||||
shticker-book-unwritten
|
shticker-book-unwritten
|
||||||
] ++ # Games
|
] ++ # Games
|
||||||
[ swaybg bemenu j4-dmenu-desktop ] ++ # Sway- and Wayland-related packages
|
|
||||||
[
|
[
|
||||||
noto-fonts
|
noto-fonts
|
||||||
|
inter
|
||||||
redhat-official-fonts
|
redhat-official-fonts
|
||||||
overpass
|
overpass
|
||||||
ibm-plex
|
ibm-plex
|
||||||
|
|
@ -132,10 +133,12 @@ rec {
|
||||||
archivo
|
archivo
|
||||||
highway-gothic
|
highway-gothic
|
||||||
merriweather-sans
|
merriweather-sans
|
||||||
|
paratype-pt-sans
|
||||||
paratype-pt-serif
|
paratype-pt-serif
|
||||||
libertinus
|
libertinus
|
||||||
roboto
|
roboto
|
||||||
font-awesome
|
openmoji-black
|
||||||
|
openmoji-color
|
||||||
] ++ # Fonts
|
] ++ # Fonts
|
||||||
# [ papirus-icon-theme ] ++ # Icons
|
# [ papirus-icon-theme ] ++ # Icons
|
||||||
# [ vanilla-dmz ] ++ # Cursor
|
# [ vanilla-dmz ] ++ # Cursor
|
||||||
|
|
@ -173,9 +176,15 @@ rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
# configure fonts correctly
|
# configure fonts correctly
|
||||||
fonts.fontconfig.enable = true;
|
fonts.fontconfig = {
|
||||||
xdg.configFile."fontconfig/conf.d/20-default.fonts.conf".source =
|
enable = true;
|
||||||
../../extra/20-default-fonts.conf;
|
defaultFonts = {
|
||||||
|
sansSerif = [ "Inter" "Noto Sans" "DejaVu Sans" ];
|
||||||
|
serif = [ "Noto Serif" "DejaVu Serif" ];
|
||||||
|
monospace = [ "Noto Mono" ];
|
||||||
|
emoji = [ "OpenMoji Color" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
# terminal emulator
|
# terminal emulator
|
||||||
programs.alacritty.enable = true;
|
programs.alacritty.enable = true;
|
||||||
|
|
@ -219,7 +228,7 @@ rec {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
global = {
|
global = {
|
||||||
font = "Red Hat Display 12";
|
font = "Inter 12";
|
||||||
mouse_left_click = "do_action, close_current";
|
mouse_left_click = "do_action, close_current";
|
||||||
mouse_middle_click = "close_all";
|
mouse_middle_click = "close_all";
|
||||||
mouse_right_click = "close_current";
|
mouse_right_click = "close_current";
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, pkgs, ... }@inputs:
|
{ lib, pkgs, config, ... }@inputs:
|
||||||
|
|
||||||
let
|
let
|
||||||
extra = ../extra;
|
extra = ../extra;
|
||||||
|
|
@ -8,18 +8,17 @@ let
|
||||||
changebrightness = pkgs.writeShellScript "changebrightness"
|
changebrightness = pkgs.writeShellScript "changebrightness"
|
||||||
(builtins.readFile "${scripts}/changebrightness.sh");
|
(builtins.readFile "${scripts}/changebrightness.sh");
|
||||||
mod = "Mod4";
|
mod = "Mod4";
|
||||||
dmenuCommand = builtins.readFile "${scripts}/dmenu.sh";
|
|
||||||
shutdownMenu = pkgs.writeShellScript "shutdownmenu"
|
shutdownMenu = pkgs.writeShellScript "shutdownmenu"
|
||||||
(builtins.readFile "${scripts}/shutdownmenu.sh");
|
(builtins.readFile "${scripts}/shutdownmenu.sh");
|
||||||
backgroundImage = "${extra}/kuwaitboat.jpg";
|
backgroundImage = "${extra}/kuwaitboat.jpg";
|
||||||
in {
|
in rec {
|
||||||
wayland.windowManager.sway = {
|
wayland.windowManager.sway = {
|
||||||
enable = true;
|
enable = true;
|
||||||
config = rec {
|
config = rec {
|
||||||
terminal = "${pkgs.lib.getExe inputs.config.defaultPrograms.terminal}";
|
terminal = "${pkgs.lib.getExe inputs.config.defaultPrograms.terminal}";
|
||||||
modifier = mod;
|
modifier = mod;
|
||||||
fonts = {
|
fonts = {
|
||||||
names = [ "Red Hat Display" ];
|
names = [ "Inter" ];
|
||||||
style = "Regular";
|
style = "Regular";
|
||||||
size = 12.0;
|
size = 12.0;
|
||||||
};
|
};
|
||||||
|
|
@ -65,7 +64,7 @@ in {
|
||||||
XF86AudioMedia =
|
XF86AudioMedia =
|
||||||
"dunstctl set-paused toggle; dunstify -a 'dunst_mute_key' -u low -h string:x-dunst-stack-tag:dunst_mute_key 'Notifications mute toggled'";
|
"dunstctl set-paused toggle; dunstify -a 'dunst_mute_key' -u low -h string:x-dunst-stack-tag:dunst_mute_key 'Notifications mute toggled'";
|
||||||
XF86PowerOff =
|
XF86PowerOff =
|
||||||
"exec DMENU_COMMAND='${dmenuCommand}' bash ${shutdownMenu}";
|
"exec DMENU_COMMAND='rofi -dmenu -prompt=\"Sélectionnez :\"' bash ${shutdownMenu}";
|
||||||
"${mod}+Pause" = XF86PowerOff;
|
"${mod}+Pause" = XF86PowerOff;
|
||||||
} // {
|
} // {
|
||||||
"${mod}+space" = ''input "*" xkb_switch_layout next'';
|
"${mod}+space" = ''input "*" xkb_switch_layout next'';
|
||||||
|
|
@ -73,9 +72,10 @@ in {
|
||||||
"${mod}+Home" = "move workspace to output left";
|
"${mod}+Home" = "move workspace to output left";
|
||||||
"${mod}+End" = "move workspace to output right";
|
"${mod}+End" = "move workspace to output right";
|
||||||
} // { });
|
} // { });
|
||||||
menu = "j4-dmenu-desktop --no-generic --term=${
|
# menu = "j4-dmenu-desktop --no-generic --term=${
|
||||||
terminal
|
# terminal
|
||||||
} --dmenu='${dmenuCommand}'";
|
# } --dmenu='${dmenuCommand}'";
|
||||||
|
menu = "${pkgs.lib.getExe config.programs.rofi.package} -modes \"drun,run\" -show-icons -show drun";
|
||||||
focus.followMouse = false;
|
focus.followMouse = false;
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
|
@ -112,4 +112,13 @@ in {
|
||||||
'' + # Clamshell mode
|
'' + # Clamshell mode
|
||||||
"";
|
"";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
programs.rofi = {
|
||||||
|
enable = true;
|
||||||
|
font = "Inter 12";
|
||||||
|
package = pkgs.rofi-wayland;
|
||||||
|
theme = "android_notification";
|
||||||
|
};
|
||||||
|
|
||||||
|
home.packages = with pkgs; [ swaybg bemenu j4-dmenu-desktop ];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ rec {
|
||||||
pulseaudio = {
|
pulseaudio = {
|
||||||
format = "{volume}% {icon} {format_source}";
|
format = "{volume}% {icon} {format_source}";
|
||||||
format-bluetooth = "{volume}% {icon} {format_source}";
|
format-bluetooth = "{volume}% {icon} {format_source}";
|
||||||
format-muted = "{volume}% {format_source}";
|
format-muted = "{volume}% 🔇 {format_source}";
|
||||||
format-source = "{volume}% ";
|
format-source = "{volume}% ";
|
||||||
format-source-muted = "{volume}% ";
|
format-source-muted = "{volume}% ";
|
||||||
format-icons = [ "" "" ];
|
format-icons = [ "" "" ];
|
||||||
|
|
@ -38,7 +38,7 @@ rec {
|
||||||
on-scroll-down = "";
|
on-scroll-down = "";
|
||||||
};
|
};
|
||||||
network = {
|
network = {
|
||||||
format-wifi = "{essid} ({signalStrength}%) ";
|
format-wifi = "{essid} ({signalStrength}%) ";
|
||||||
format-ethernet = "{ipaddr}/{cidr} ";
|
format-ethernet = "{ipaddr}/{cidr} ";
|
||||||
tooltip-format = "{ifname} via {gwaddr} ";
|
tooltip-format = "{ifname} via {gwaddr} ";
|
||||||
format-linked = "{ifname} (No IP) ";
|
format-linked = "{ifname} (No IP) ";
|
||||||
|
|
@ -59,7 +59,7 @@ rec {
|
||||||
on-click = "exec blueman-manager";
|
on-click = "exec blueman-manager";
|
||||||
on-click-right = "exec bluetoothctl disconnect";
|
on-click-right = "exec bluetoothctl disconnect";
|
||||||
};
|
};
|
||||||
cpu = { format = "{usage}% "; };
|
cpu = { format = "{usage}% 😀"; };
|
||||||
memory = { format = "{used:0.1f}GB/{total:0.1f}GB "; };
|
memory = { format = "{used:0.1f}GB/{total:0.1f}GB "; };
|
||||||
disk = {
|
disk = {
|
||||||
format = "{used} ";
|
format = "{used} ";
|
||||||
|
|
@ -99,7 +99,7 @@ rec {
|
||||||
}];
|
}];
|
||||||
style = ''
|
style = ''
|
||||||
* {
|
* {
|
||||||
font-family: FontAwesome, Red Hat Display, sans-serif;
|
font-family: Inter, "OpenMoji Black", sans-serif;
|
||||||
font-size: 12pt;
|
font-size: 12pt;
|
||||||
min-height: 20pt;
|
min-height: 20pt;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue