pagedmov/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc fixups

Browse Source
This commit is contained in:
pagedmov
2025-07-29 12:49:25 -04:00
parent 82d34571c8
commit bd1851f706
6 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@@ -75,7 +75,7 @@
modules = [ modules = [
./hosts/work/home.nix ./hosts/work/home.nix
./modules/home ./modules/home
stylix.homeManagerModules.stylix stylix.homeModules.stylix
nixvim.homeManagerModules.nixvim nixvim.homeManagerModules.nixvim
]; ];
}; };

13
modules/home/environment/hyprland.nix
View File

@@ -2,7 +2,7 @@
let let
desktop = host == "oganesson"; desktop = host == "oganesson";
screenshot_bind = if desktop then screenshot_bind = if desktop then
[ [
"super, print, exec, grimblast copy area" "super, print, exec, grimblast copy area"
"super shift, print, exec, grimblast --freeze copy area" "super shift, print, exec, grimblast --freeze copy area"
] ]
@@ -134,7 +134,6 @@ in {
"float, title:^(Firefox — 共有インジケーター)$" "float, title:^(Firefox — 共有インジケーター)$"
"nofocus, title:^(Firefox — 共有インジケーター)$" "nofocus, title:^(Firefox — 共有インジケーター)$"
"float, class:^(firefox)$,title^(Sign in - Google Accounts — Mozilla Firefox)$" "float, class:^(firefox)$,title^(Sign in - Google Accounts — Mozilla Firefox)$"
"= nofullscreenrequest, title:^(Firefox — 共有インジケーター)$"
"size 0 0, title:^(Firefox — 共有インジケーター)$" "size 0 0, title:^(Firefox — 共有インジケーター)$"
"move 100%-470 15,title:^(Firefox — Sharing Indicator)$" "move 100%-470 15,title:^(Firefox — Sharing Indicator)$"
"move 100%-470 15,title:^(Firefox — 共有インジケーター)$" "move 100%-470 15,title:^(Firefox — 共有インジケーター)$"
@@ -152,8 +151,8 @@ in {
gaps_in = 5; gaps_in = 5;
gaps_out = 9; gaps_out = 9;
border_size = 3; border_size = 3;
col.active_border = "rgba(404042ff)"; "col.active_border" = lib.mkForce "rgba(404042ff)";
col.inactive_border = "rgba(83858a00)"; "col.inactive_border" = lib.mkForce "rgba(83858a00)";
layout = "dwindle"; layout = "dwindle";
resize_on_border = true; resize_on_border = true;
no_border_on_floating = false; no_border_on_floating = false;
@@ -164,13 +163,18 @@ in {
}; };
}; };
misc = { misc = {
font_family = "EnvyCodeR Nerd Font Mono";
disable_autoreload = true; disable_autoreload = true;
disable_hyprland_logo = true; disable_hyprland_logo = true;
always_follow_on_dnd = true; always_follow_on_dnd = true;
layers_hog_keyboard_focus = true; layers_hog_keyboard_focus = true;
animate_manual_resizes = false; animate_manual_resizes = false;
swallow_regex = "^(kitty)$";
enable_swallow = true; enable_swallow = true;
focus_on_activate = true; focus_on_activate = true;
vfr = true;
background_color = lib.mkForce "0x202020";
mouse_move_enables_dpms = true;
}; };
dwindle = { dwindle = {
@@ -192,7 +196,6 @@ in {
ignore_window = true; ignore_window = true;
range = 80; range = 80;
render_power = 50; render_power = 50;
color = "rbga(00000065)";
}; };
}; };

12
modules/home/environment/stylixhome.nix
View File

@@ -34,16 +34,16 @@ in {
}; };
fonts = { fonts = {
monospace = { monospace = {
package = pkgs.nerd-fonts.jetbrains-mono; package = pkgs.nerd-fonts.envy-code-r;
name = "JetBrains Mono Nerd Font"; name = "EnvyCodeR Nerd Font Mono";
}; };
sansSerif = { sansSerif = {
package = pkgs.nerd-fonts.jetbrains-mono; package = pkgs.nerd-fonts.envy-code-r;
name = "JetBrains Mono Nerd Font"; name = "EnvyCodeR Nerd Font Mono";
}; };
serif = { serif = {
package = pkgs.nerd-fonts.jetbrains-mono; package = pkgs.nerd-fonts.envy-code-r;
name = "JetBrains Mono Nerd Font"; name = "EnvyCodeR Nerd Font Mono";
}; };
sizes = { sizes = {
desktop = 10; desktop = 10;

24
modules/home/environment/waybar.nix
View File

@@ -50,7 +50,7 @@ let
dark = scheme.base03; dark = scheme.base03;
}; };
fg = { fg = {
lightest = scheme.base07; lightester = scheme.base07;
lightest = scheme.base06; lightest = scheme.base06;
lighter = scheme.base05; lighter = scheme.base05;
light = scheme.base04; light = scheme.base04;
@@ -98,9 +98,9 @@ in {
else builtins.elemAt monitors 1; else builtins.elemAt monitors 1;
position = "top"; position = "top";
name = "mainBar"; name = "mainBar";
margin-left = 8; margin-left = 0;
margin-top = 5; margin-top = 0;
margin-right = if desktop then 8 else 5; margin-right = 0;
mode = "dock"; mode = "dock";
exclusive = true; exclusive = true;
passthrough = false; passthrough = false;
@@ -114,16 +114,16 @@ in {
clock = { clock = {
format = "[ CLK: {:%H.%M <span size='8pt'> %a %b %d</span>} ]"; format = "[ CLK: {:%H.%M <span size='8pt'> %a %b %d</span>} ]";
tooltip-format = "<tt>{calendar}"; tooltip-format = "<tt>{calendar}</tt>";
calendar = { calendar = {
mode = "month"; mode = "month";
weeks-pos = ""; weeks-pos = "";
on-scroll = 1; on-scroll = 1;
format = { format = {
months = "<span size = '16pt'><b>CAL: {}\n</b></span>"; months = "<span size='16pt'><b>CAL: {}\n</b></span>";
days = "<span size = '16pt'><b>{}</b></span>"; days = "<span size='16pt'><b>{}</b></span>";
weeks = "<span size = '16pt'><b>{}</b></span>"; weeks = "<span size='16pt'><b>{}</b></span>";
weekdays = "<span size = '16pt'><b>{}</b></span>"; weekdays = "<span size='16pt'><b>{}</b></span>";
today = "<span color='#E6E1CF'><b>{}</b></span>"; today = "<span color='#E6E1CF'><b>{}</b></span>";
}; };
}; };
@@ -168,7 +168,7 @@ in {
"█████░░░" "█████░░░"
"██████░░" "██████░░"
"<span color='#F07178'>!!!!!!!!</span>" "<span color='#F07178'>!!!!!!!!</span>"
"<span color='#F07178'>CRITICAL</span>" "<span color='#F07178'>CRITICAL</span>"
]; ];
}; };
@@ -195,10 +195,10 @@ in {
* { * {
font-size: 14px; font-size: 14px;
border: none; border: none;
font-familty: EnvyCodeR Nerd Font Mono; font-family: EnvyCodeR Nerd Font Mono;
font-weight: Bold; font-weight: Bold;
min-height: 0; min-height: 0;
border-radius 0px; border-radius: 0px;
padding: 2px; padding: 2px;
} }

4
modules/home/programs/kitty.nix
View File

@@ -7,8 +7,8 @@
programs.kitty = { programs.kitty = {
enable = true; enable = true;
font = { font = {
package = lib.mkForce pkgs.fira-code; package = lib.mkForce pkgs.nerd-fonts.envy-code-r;
name = lib.mkForce "Fira Code"; name = lib.mkForce "EnvyCodeR Nerd Font Mono";
size = lib.mkForce 20; size = lib.mkForce 20;
}; };

12
modules/sys/sysenv/stylix.nix
View File

@@ -34,16 +34,16 @@ in {
}; };
fonts = { fonts = {
monospace = { monospace = {
package = pkgs.nerd-fonts.jetbrains-mono; package = pkgs.nerd-fonts.envy-code-r;
name = "JetBrains Mono Nerd Font"; name = "EnvyCodeR Nerd Font Mono";
}; };
sansSerif = { sansSerif = {
package = pkgs.nerd-fonts.jetbrains-mono; package = pkgs.nerd-fonts.envy-code-r;
name = "JetBrains Mono Nerd Font"; name = "EnvyCodeR Nerd Font Mono";
}; };
serif = { serif = {
package = pkgs.nerd-fonts.jetbrains-mono; package = pkgs.nerd-fonts.envy-code-r;
name = "JetBrains Mono Nerd Font"; name = "EnvyCodeR Nerd Font Mono";
}; };
sizes = { sizes = {
desktop = 10; desktop = 10;