fonts, color, bings
This commit is contained in:
parent
c8dd5276e6
commit
746bb52e03
10 changed files with 106 additions and 107 deletions
36
flake.lock
generated
36
flake.lock
generated
|
@ -88,11 +88,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1748107096,
|
||||
"narHash": "sha256-PmQY/yDSlxxma3RBW2v+yWSvpJTubcmXUdoAlaJv7Dk=",
|
||||
"lastModified": 1748163896,
|
||||
"narHash": "sha256-IaLOUPFlgFLnj9BjaP1HqZ3EmX4O7jzR/Q9zxK9Yrl4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "5e55769b7a39ab810f761874aff5787c74e981da",
|
||||
"rev": "566f386a7e716cbde6b60c2cbf5e938655f29911",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -376,11 +376,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747978958,
|
||||
"narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=",
|
||||
"lastModified": 1748182899,
|
||||
"narHash": "sha256-r6MHSalDFydlUmjorVTSsyhLjIt8VWNtGc5+mffXvFQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "7419250703fd5eb50e99bdfb07a86671939103ea",
|
||||
"rev": "901f8fef7f349cf8a8e97b3230b22fd592df9160",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -988,11 +988,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1747862697,
|
||||
"narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=",
|
||||
"lastModified": 1748037224,
|
||||
"narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2baa12ff69913392faf0ace833bc54bba297ea95",
|
||||
"rev": "f09dede81861f3a83f7f06641ead34f02f37597f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1036,11 +1036,11 @@
|
|||
},
|
||||
"nixpkgs-stable_4": {
|
||||
"locked": {
|
||||
"lastModified": 1747862697,
|
||||
"narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=",
|
||||
"lastModified": 1748037224,
|
||||
"narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2baa12ff69913392faf0ace833bc54bba297ea95",
|
||||
"rev": "f09dede81861f3a83f7f06641ead34f02f37597f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1560,11 +1560,11 @@
|
|||
},
|
||||
"locked": {
|
||||
"dir": "nix",
|
||||
"lastModified": 1748097989,
|
||||
"narHash": "sha256-5i53CqWRUyQZpEWLi848GUon7CcZIM++1k/EiKcd/Qg=",
|
||||
"lastModified": 1748110864,
|
||||
"narHash": "sha256-Vew2z81xcYvrj8/Ne/i489VqHJxyZcujgjgdZ1wXQhE=",
|
||||
"owner": "wez",
|
||||
"repo": "wezterm",
|
||||
"rev": "f150ade689a0daae2658c01e3ae91227a1d1fc74",
|
||||
"rev": "b11cd7ae7e7ba96e9ee9121e10954b62fdc5fee1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1659,11 +1659,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1748090150,
|
||||
"narHash": "sha256-WrcGLv4Q94B2eG+jj5EckQfItR4zTAz/8uX2to4bU4g=",
|
||||
"lastModified": 1748143192,
|
||||
"narHash": "sha256-KvP468pbSw0c6fXQmd4Q2tp/ywxvxrz5ijRT3odniaw=",
|
||||
"owner": "0xc000022070",
|
||||
"repo": "zen-browser-flake",
|
||||
"rev": "d25f7e7fc5a2ebcb4c41924b4755eec642e6f18d",
|
||||
"rev": "04d982716fb6c1fc64e0de6e55103b15c892ceda",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
theme = "oxocarbon"
|
||||
|
||||
[font]
|
||||
family = "Jetbrains-Mono"
|
||||
family = "IBM Plex Mono"
|
||||
size = 18
|
||||
|
||||
[servers.liberachat]
|
||||
|
|
|
@ -570,15 +570,12 @@
|
|||
useEmbeddedBitmaps = true;
|
||||
};
|
||||
packages = with pkgs; [
|
||||
fira-code
|
||||
font-awesome
|
||||
fira
|
||||
cooper-hewitt
|
||||
ibm-plex
|
||||
jetbrains-mono
|
||||
iosevka
|
||||
spleen
|
||||
fira-code-symbols
|
||||
blackout
|
||||
powerline-fonts
|
||||
noto-fonts-color-emoji
|
||||
|
@ -586,7 +583,7 @@
|
|||
noto-fonts-cjk-sans
|
||||
noto-fonts-emoji
|
||||
nerd-fonts.jetbrains-mono
|
||||
nerd-fonts.fira-code
|
||||
nerd-fonts.blex-mono
|
||||
nerd-fonts._0xproto
|
||||
nerd-fonts.symbols-only
|
||||
];
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
{ inputs, ... }:
|
||||
{
|
||||
{ inputs, pkgs, ... }:
|
||||
with pkgs.lib.nix-rice;
|
||||
let strPalette = palette.toRGBHex pkgs.rice.colorPalette;
|
||||
fnt = pkgs.rice.font.monospace.name;
|
||||
in {
|
||||
programs.hyprlock = {
|
||||
enable = true;
|
||||
package = inputs.hyprlock.packages.x86_64-linux.default;
|
||||
|
@ -29,7 +32,7 @@
|
|||
position = "0, 0";
|
||||
halign = "center";
|
||||
valign = "center";
|
||||
font_family = "JetBrains Mono";
|
||||
font_family = fnt;
|
||||
};
|
||||
|
||||
# DATE
|
||||
|
@ -38,7 +41,7 @@
|
|||
text = "cmd[update:1000] echo \"$(date +\"%A, %B %d\")\"";
|
||||
color = "rgba(242, 243, 244, 0.75)";
|
||||
font_size = 32;
|
||||
font_family = "JetBrains Mono";
|
||||
font_family = fnt;
|
||||
position = "0, 300";
|
||||
halign = "center";
|
||||
valign = "center";
|
||||
|
@ -49,7 +52,7 @@
|
|||
text = "cmd[update:1000] echo \"$(date +\"%-I:%M\")\"";
|
||||
color = "rgba(242, 243, 244, 0.75)";
|
||||
font_size = 32;
|
||||
font_family = "JetBrains Mono";
|
||||
font_family = fnt;
|
||||
position = "0, 200";
|
||||
halign = "center";
|
||||
valign = "center";
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
layer="top";
|
||||
anchor="top-right";
|
||||
|
||||
font="JetbrainsMono-Light 12";
|
||||
font="IBMPlexMono 12";
|
||||
backgroundColor="#111111";
|
||||
textColor="#eeeeee";
|
||||
width=300;
|
||||
|
|
|
@ -33,6 +33,8 @@
|
|||
|
||||
nix-du
|
||||
nix-melt
|
||||
nix-tree
|
||||
|
||||
usbutils
|
||||
pciutils
|
||||
util-linux
|
||||
|
|
|
@ -9,7 +9,7 @@ config.enable_wayland = false;
|
|||
|
||||
config.font_size = 14
|
||||
config.font = wezterm.font {
|
||||
family = 'JetBrains Mono',
|
||||
family = 'IBM Plex Mono',
|
||||
weight = 'Medium'
|
||||
}
|
||||
|
||||
|
|
|
@ -48,6 +48,11 @@ config.audible_bell = "Disabled";
|
|||
config.warn_about_missing_glyphs = false;
|
||||
|
||||
config.font_size = 14
|
||||
config.font = wezterm.font {
|
||||
family = 'IBM Plex Mono',
|
||||
-- weight = ''
|
||||
}
|
||||
|
||||
config.freetype_load_flags = 'NO_HINTING'
|
||||
|
||||
-- config.color_scheme = 'One Dark (Gogh)'
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ inputs, pkgs, ... }:
|
||||
with pkgs.lib.nix-rice;
|
||||
let strPalette = palette.toRGBHex pkgs.rice.colorPalette;
|
||||
fnt = pkgs.rice.font.monospace.name;
|
||||
in {
|
||||
|
||||
programs.waybar = {
|
||||
|
@ -67,8 +68,8 @@ in {
|
|||
|
||||
"idle_inhibitor" = {
|
||||
"format" = "{icon}";
|
||||
"tooltip-format-activated" = "idle inhibitor = {status}";
|
||||
"tooltip-format-deactivated" = "idle inhibitor = {status}";
|
||||
"tooltip-format-activated" = "idle inhibitor {status}";
|
||||
"tooltip-format-deactivated" = "idle inhibitor {status}";
|
||||
"format-icons" = {
|
||||
"activated" = "";
|
||||
"deactivated" = "";
|
||||
|
@ -172,10 +173,38 @@ in {
|
|||
};
|
||||
|
||||
style = ''
|
||||
|
||||
/*
|
||||
#battery,
|
||||
#custom-clipboard,
|
||||
#custom-colorpicker,
|
||||
#custom-powerDraw,
|
||||
#pulseaudio,
|
||||
#wireplumber,
|
||||
#disk,
|
||||
#taskbar
|
||||
#cpu,
|
||||
#temperature,
|
||||
#custom-weather,
|
||||
#jack,
|
||||
#upower,
|
||||
#power-profiles-daemon
|
||||
#tray,
|
||||
#window,
|
||||
#workspaces,
|
||||
#clock
|
||||
#memory
|
||||
#cpu
|
||||
#battery
|
||||
#taskbar
|
||||
#tray
|
||||
#power-profiles-daemon
|
||||
*/
|
||||
|
||||
* {
|
||||
border: none;
|
||||
border: none;
|
||||
font-size: 12pt;
|
||||
font-family: "JetBrainsMono Nerd Font" ;
|
||||
font-family: "${fnt}" ;
|
||||
min-height: 30px;
|
||||
}
|
||||
|
||||
|
@ -191,22 +220,33 @@ window#waybar {
|
|||
margin: 5px;
|
||||
}
|
||||
|
||||
.modules-right {
|
||||
padding-left: 5px;
|
||||
.module {
|
||||
margin: 0;
|
||||
padding: 0 18px;
|
||||
min-width: 1em;
|
||||
}
|
||||
|
||||
.modules-left, .modules-right {
|
||||
margin-top: 2px;
|
||||
color: #ccc;
|
||||
}
|
||||
|
||||
.modules-left .module {
|
||||
border-right: 2px #222 solid;
|
||||
}
|
||||
|
||||
.modules-right .module {
|
||||
border-right: 2px #222 solid;
|
||||
}
|
||||
|
||||
.modules-center {
|
||||
padding: 0 15px;
|
||||
margin-top: 2px;
|
||||
color: #ccc;
|
||||
}
|
||||
|
||||
.modules-left {
|
||||
margin-top: 2px;
|
||||
color: #ccc;
|
||||
padding-right: 5px;
|
||||
.modules-center .module {
|
||||
border: none;
|
||||
}
|
||||
|
||||
#taskbar > *:hover {
|
||||
|
@ -217,70 +257,13 @@ window#waybar {
|
|||
background: #333;
|
||||
}
|
||||
|
||||
#network {
|
||||
padding: 0 10px 0 15px;
|
||||
}
|
||||
|
||||
#battery,
|
||||
#custom-clipboard,
|
||||
#custom-colorpicker,
|
||||
#custom-powerDraw,
|
||||
#bluetooth,
|
||||
#pulseaudio,
|
||||
#wireplumber,
|
||||
#disk,
|
||||
#taskbar
|
||||
#cpu,
|
||||
#temperature,
|
||||
#custom-weather,
|
||||
#idle_inhibitor,
|
||||
#jack,
|
||||
#upower,
|
||||
#power-profiles-daemon
|
||||
#tray,
|
||||
#window,
|
||||
#workspaces,
|
||||
#clock
|
||||
#custom-notification {
|
||||
padding: 0 20px;
|
||||
}
|
||||
|
||||
#memory {
|
||||
padding: 0 20px 0 10px;
|
||||
}
|
||||
|
||||
#battery {
|
||||
padding-right: 0;
|
||||
}
|
||||
|
||||
#custom-notification {
|
||||
min-width: 30px;
|
||||
padding-right: 6px;
|
||||
font-size: 13pt;
|
||||
}
|
||||
|
||||
#idle_inhibitor {
|
||||
min-width: 30px;
|
||||
padding-left: 0;
|
||||
font-size: 13pt;
|
||||
}
|
||||
|
||||
#power-profiles-daemon {
|
||||
min-width: 40px;
|
||||
}
|
||||
|
||||
#temperature.critical,
|
||||
#pulseaudio.muted {
|
||||
color: #FF0000;
|
||||
padding-top: 0;
|
||||
}
|
||||
|
||||
#cpu {
|
||||
padding-right: 30px;
|
||||
}
|
||||
|
||||
#clock{
|
||||
padding-left: 6px;
|
||||
color: ${strPalette.normal.magenta};
|
||||
}
|
||||
|
||||
|
@ -306,10 +289,12 @@ window#waybar {
|
|||
|
||||
#mpris {
|
||||
margin-left: 15px;
|
||||
border: none;
|
||||
}
|
||||
|
||||
#workspaces button {
|
||||
color: #666;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
#workspaces button:hover {
|
||||
|
@ -325,10 +310,6 @@ window#waybar {
|
|||
color: #ccc;
|
||||
}
|
||||
|
||||
#taskbar, #tray {
|
||||
padding-right: 30px;
|
||||
}
|
||||
|
||||
#taskbar button.active {
|
||||
background: #333;
|
||||
}
|
||||
|
@ -339,6 +320,7 @@ window#waybar {
|
|||
color: #000000;
|
||||
}
|
||||
}
|
||||
'';
|
||||
'';
|
||||
|
||||
};
|
||||
}
|
||||
|
|
|
@ -56,13 +56,23 @@ in {
|
|||
} // theme;
|
||||
font = {
|
||||
monospace = {
|
||||
name = "JetBrainsMono Nerd Font";
|
||||
package = self.nerdfonts.override { fonts = [ "Jetbrains-Mono" ]; };
|
||||
name = "BlexMono Nerd Font";
|
||||
package = self.nerd-fonts.blex-mono;
|
||||
size = 12;
|
||||
};
|
||||
normal = {
|
||||
name = "JetBrainsMono Nerd Font";
|
||||
package = self.nerdfonts.override { fonts = [ "Jetbrains-Mono" ]; };
|
||||
propo = {
|
||||
name = "BlexMono Nerd Font Propo";
|
||||
package = self.nerd-fonts.blex-mono;
|
||||
size = 12;
|
||||
};
|
||||
sans = {
|
||||
name = "IBM Plex Sans";
|
||||
package = self.ibm-plex;
|
||||
size = 12;
|
||||
};
|
||||
serif = {
|
||||
name = "IBM Plex Serif";
|
||||
package = self.ibm-plex;
|
||||
size = 12;
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue