emmet/nixos-config
0
1
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Updated system

Browse Source
This commit is contained in:
Emmet
2025-06-07 17:26:14 -05:00
parent 95fa63e7f2
commit 46e06d4d55
5 changed files with 130 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/user/hyprland/default.nix
View File

@@ -52,6 +52,7 @@ in
settings = {
env = [
"AQ_DRM_DEVICES,${config.home.sessionVariables.AQ_DRM_DEVICES}"
"AW_NO_MODIFIERS,1"
];
exec-once = [
"hyprctl setcursor ${config.gtk.cursorTheme.name} ${builtins.toString config.gtk.cursorTheme.size}"
@@ -68,7 +69,7 @@ in
"alacritty --class scratch_term"
"kitty --class scratch_yazi -e yazi"
"alacritty --class scratch_numbat -e numbat"
"kitty --class scratch_music -e ncmpcpp"
"kitty --class scratch_music -e kew"
"alacritty --class scratch_btm -e btm"
"element-desktop"
];
@@ -245,7 +246,7 @@ in
"SUPER,F,togglespecialworkspace,scratch_yazi"
''SUPER,N,exec,if hyprctl clients | grep scratch_numbat; then echo "scratch_numbat respawn not needed"; else alacritty --class scratch_numbat -e numbat; fi''
"SUPER,N,togglespecialworkspace,scratch_numbat"
''SUPER,M,exec,if hyprctl clients | grep scratch_music; then echo "scratch_music respawn not needed"; else kitty --class scratch_music -e ncmpcpp; fi''
''SUPER,M,exec,if hyprctl clients | grep scratch_music; then echo "scratch_music respawn not needed"; else kitty --class scratch_music -e kew; fi''
"SUPER,M,togglespecialworkspace,scratch_music"
''SUPER,B,exec,if hyprctl clients | grep scratch_btm; then echo "scratch_yazi respawn not needed"; else alacritty --class scratch_btm -e btm; fi''
"SUPER,B,togglespecialworkspace,scratch_btm"
@@ -384,6 +385,7 @@ in
home.packages = (with pkgs; [
hyprland-monitor-attached
kew
alacritty
kitty
killall

72
modules/user/stylix/default.nix
View File

@@ -33,16 +33,16 @@ in
stylix.fonts = {
# TODO abstract fonts into an option
monospace = {
name = "Source Code Pro";
package = pkgs.source-code-pro;
name = "Fira Code Nerd Font";
package = pkgs.fira-code-nerdfont;
};
serif = {
name = "Source Serif Pro";
package = pkgs.source-serif-pro;
name = "Fira";
package = pkgs.fira;
};
sansSerif = {
name = "Source Sans Pro";
package = pkgs.source-sans-pro;
name = "Fira Sans";
package = pkgs.fira-sans;
};
emoji = {
name = "Twitter Color Emoji";
@@ -57,36 +57,36 @@ in
};
# move into alacritty config
stylix.targets.alacritty.enable = false;
programs.alacritty.settings = {
colors = {
# TODO revisit these color mappings
# these are just the default provided from stylix
# but declared directly due to alacritty v3.0 breakage
primary.background = "#"+config.lib.stylix.colors.base00;
primary.foreground = "#"+config.lib.stylix.colors.base07;
cursor.text = "#"+config.lib.stylix.colors.base00;
cursor.cursor = "#"+config.lib.stylix.colors.base07;
normal.black = "#"+config.lib.stylix.colors.base00;
normal.red = "#"+config.lib.stylix.colors.base08;
normal.green = "#"+config.lib.stylix.colors.base0B;
normal.yellow = "#"+config.lib.stylix.colors.base0A;
normal.blue = "#"+config.lib.stylix.colors.base0D;
normal.magenta = "#"+config.lib.stylix.colors.base0E;
normal.cyan = "#"+config.lib.stylix.colors.base0B;
normal.white = "#"+config.lib.stylix.colors.base05;
bright.black = "#"+config.lib.stylix.colors.base03;
bright.red = "#"+config.lib.stylix.colors.base09;
bright.green = "#"+config.lib.stylix.colors.base01;
bright.yellow = "#"+config.lib.stylix.colors.base02;
bright.blue = "#"+config.lib.stylix.colors.base04;
bright.magenta = "#"+config.lib.stylix.colors.base06;
bright.cyan = "#"+config.lib.stylix.colors.base0F;
bright.white = "#"+config.lib.stylix.colors.base07;
};
font.size = config.stylix.fonts.sizes.terminal;
font.normal.family = config.stylix.fonts.monospace.name;
};
stylix.targets.alacritty.enable = true;
#programs.alacritty.settings = {
# colors = {
# # TODO revisit these color mappings
# # these are just the default provided from stylix
# # but declared directly due to alacritty v3.0 breakage
# primary.background = "#"+config.lib.stylix.colors.base00;
# primary.foreground = "#"+config.lib.stylix.colors.base07;
# cursor.text = "#"+config.lib.stylix.colors.base00;
# cursor.cursor = "#"+config.lib.stylix.colors.base07;
# normal.black = "#"+config.lib.stylix.colors.base00;
# normal.red = "#"+config.lib.stylix.colors.base08;
# normal.green = "#"+config.lib.stylix.colors.base0B;
# normal.yellow = "#"+config.lib.stylix.colors.base0A;
# normal.blue = "#"+config.lib.stylix.colors.base0D;
# normal.magenta = "#"+config.lib.stylix.colors.base0E;
# normal.cyan = "#"+config.lib.stylix.colors.base0B;
# normal.white = "#"+config.lib.stylix.colors.base05;
# bright.black = "#"+config.lib.stylix.colors.base03;
# bright.red = "#"+config.lib.stylix.colors.base09;
# bright.green = "#"+config.lib.stylix.colors.base01;
# bright.yellow = "#"+config.lib.stylix.colors.base02;
# bright.blue = "#"+config.lib.stylix.colors.base04;
# bright.magenta = "#"+config.lib.stylix.colors.base06;
# bright.cyan = "#"+config.lib.stylix.colors.base0F;
# bright.white = "#"+config.lib.stylix.colors.base07;
# };
# font.size = config.stylix.fonts.sizes.terminal;
# font.normal.family = config.stylix.fonts.monospace.name;
#};
# move into kitty config
stylix.targets.kitty.enable = true;

4
modules/user/terminal/default.nix
View File

@@ -10,7 +10,7 @@
};
config = {
userSettings.alacritty.enable = lib.mkDefault (config.userSettings.browser == "brave");
userSettings.kitty.enable = lib.mkDefault (config.userSettings.browser == "librewolf");
userSettings.alacritty.enable = lib.mkDefault (config.userSettings.terminal == "alacritty");
userSettings.kitty.enable = lib.mkDefault (config.userSettings.terminal == "kitty");
};
}