diff --git a/flake.nix b/flake.nix
index 3f498c5..f4f2313 100755
--- a/flake.nix
+++ b/flake.nix
@@ -75,7 +75,7 @@
modules = [
./hosts/work/home.nix
./modules/home
- stylix.homeManagerModules.stylix
+ stylix.homeModules.stylix
nixvim.homeManagerModules.nixvim
];
};
diff --git a/modules/home/environment/hyprland.nix b/modules/home/environment/hyprland.nix
index b986dc3..a6cca82 100755
--- a/modules/home/environment/hyprland.nix
+++ b/modules/home/environment/hyprland.nix
@@ -2,7 +2,7 @@
let
desktop = host == "oganesson";
screenshot_bind = if desktop then
- [
+ [
"super, print, exec, grimblast copy area"
"super shift, print, exec, grimblast --freeze copy area"
]
@@ -134,7 +134,6 @@ in {
"float, title:^(Firefox — 共有インジケーター)$"
"nofocus, title:^(Firefox — 共有インジケーター)$"
"float, class:^(firefox)$,title^(Sign in - Google Accounts — Mozilla Firefox)$"
- "= nofullscreenrequest, title:^(Firefox — 共有インジケーター)$"
"size 0 0, title:^(Firefox — 共有インジケーター)$"
"move 100%-470 15,title:^(Firefox — Sharing Indicator)$"
"move 100%-470 15,title:^(Firefox — 共有インジケーター)$"
@@ -152,8 +151,8 @@ in {
gaps_in = 5;
gaps_out = 9;
border_size = 3;
- col.active_border = "rgba(404042ff)";
- col.inactive_border = "rgba(83858a00)";
+ "col.active_border" = lib.mkForce "rgba(404042ff)";
+ "col.inactive_border" = lib.mkForce "rgba(83858a00)";
layout = "dwindle";
resize_on_border = true;
no_border_on_floating = false;
@@ -164,13 +163,18 @@ in {
};
};
misc = {
+ font_family = "EnvyCodeR Nerd Font Mono";
disable_autoreload = true;
disable_hyprland_logo = true;
always_follow_on_dnd = true;
layers_hog_keyboard_focus = true;
animate_manual_resizes = false;
+ swallow_regex = "^(kitty)$";
enable_swallow = true;
focus_on_activate = true;
+ vfr = true;
+ background_color = lib.mkForce "0x202020";
+ mouse_move_enables_dpms = true;
};
dwindle = {
@@ -192,7 +196,6 @@ in {
ignore_window = true;
range = 80;
render_power = 50;
- color = "rbga(00000065)";
};
};
diff --git a/modules/home/environment/stylixhome.nix b/modules/home/environment/stylixhome.nix
index 70df530..efd8460 100755
--- a/modules/home/environment/stylixhome.nix
+++ b/modules/home/environment/stylixhome.nix
@@ -34,16 +34,16 @@ in {
};
fonts = {
monospace = {
- package = pkgs.nerd-fonts.jetbrains-mono;
- name = "JetBrains Mono Nerd Font";
+ package = pkgs.nerd-fonts.envy-code-r;
+ name = "EnvyCodeR Nerd Font Mono";
};
sansSerif = {
- package = pkgs.nerd-fonts.jetbrains-mono;
- name = "JetBrains Mono Nerd Font";
+ package = pkgs.nerd-fonts.envy-code-r;
+ name = "EnvyCodeR Nerd Font Mono";
};
serif = {
- package = pkgs.nerd-fonts.jetbrains-mono;
- name = "JetBrains Mono Nerd Font";
+ package = pkgs.nerd-fonts.envy-code-r;
+ name = "EnvyCodeR Nerd Font Mono";
};
sizes = {
desktop = 10;
diff --git a/modules/home/environment/waybar.nix b/modules/home/environment/waybar.nix
index cd1a166..4a72b99 100755
--- a/modules/home/environment/waybar.nix
+++ b/modules/home/environment/waybar.nix
@@ -50,7 +50,7 @@ let
dark = scheme.base03;
};
fg = {
- lightest = scheme.base07;
+ lightester = scheme.base07;
lightest = scheme.base06;
lighter = scheme.base05;
light = scheme.base04;
@@ -98,9 +98,9 @@ in {
else builtins.elemAt monitors 1;
position = "top";
name = "mainBar";
- margin-left = 8;
- margin-top = 5;
- margin-right = if desktop then 8 else 5;
+ margin-left = 0;
+ margin-top = 0;
+ margin-right = 0;
mode = "dock";
exclusive = true;
passthrough = false;
@@ -114,16 +114,16 @@ in {
clock = {
format = "[ CLK: {:%H.%M %a %b %d} ]";
- tooltip-format = "{calendar}";
+ tooltip-format = "{calendar}";
calendar = {
mode = "month";
weeks-pos = "";
on-scroll = 1;
format = {
- months = "CAL: {}\n";
- days = "{}";
- weeks = "{}";
- weekdays = "{}";
+ months = "CAL: {}\n";
+ days = "{}";
+ weeks = "{}";
+ weekdays = "{}";
today = "{}";
};
};
@@ -168,7 +168,7 @@ in {
"█████░░░"
"██████░░"
"!!!!!!!!"
- "CRITICAL"
+ "CRITICAL"
];
};
@@ -195,10 +195,10 @@ in {
* {
font-size: 14px;
border: none;
- font-familty: EnvyCodeR Nerd Font Mono;
+ font-family: EnvyCodeR Nerd Font Mono;
font-weight: Bold;
min-height: 0;
- border-radius 0px;
+ border-radius: 0px;
padding: 2px;
}
diff --git a/modules/home/programs/kitty.nix b/modules/home/programs/kitty.nix
index 3577b54..d15a096 100755
--- a/modules/home/programs/kitty.nix
+++ b/modules/home/programs/kitty.nix
@@ -7,8 +7,8 @@
programs.kitty = {
enable = true;
font = {
- package = lib.mkForce pkgs.fira-code;
- name = lib.mkForce "Fira Code";
+ package = lib.mkForce pkgs.nerd-fonts.envy-code-r;
+ name = lib.mkForce "EnvyCodeR Nerd Font Mono";
size = lib.mkForce 20;
};
diff --git a/modules/sys/sysenv/stylix.nix b/modules/sys/sysenv/stylix.nix
index bc83c44..47f451c 100755
--- a/modules/sys/sysenv/stylix.nix
+++ b/modules/sys/sysenv/stylix.nix
@@ -34,16 +34,16 @@ in {
};
fonts = {
monospace = {
- package = pkgs.nerd-fonts.jetbrains-mono;
- name = "JetBrains Mono Nerd Font";
+ package = pkgs.nerd-fonts.envy-code-r;
+ name = "EnvyCodeR Nerd Font Mono";
};
sansSerif = {
- package = pkgs.nerd-fonts.jetbrains-mono;
- name = "JetBrains Mono Nerd Font";
+ package = pkgs.nerd-fonts.envy-code-r;
+ name = "EnvyCodeR Nerd Font Mono";
};
serif = {
- package = pkgs.nerd-fonts.jetbrains-mono;
- name = "JetBrains Mono Nerd Font";
+ package = pkgs.nerd-fonts.envy-code-r;
+ name = "EnvyCodeR Nerd Font Mono";
};
sizes = {
desktop = 10;