diff --git a/home/environments/niri/binds.nix b/home/environments/niri/binds.nix index 02736947..e9d3428c 100644 --- a/home/environments/niri/binds.nix +++ b/home/environments/niri/binds.nix @@ -33,9 +33,9 @@ in { # ▀ # personalBindings = { - "Mod+Return".action = sh ''${getExe config.programs.wezterm.package}''; + "Mod+Return".action = sh ''${getExe config.programs.alacritty.package}''; "Mod+T".action.toggle-window-floating = {}; - "Mod+D".action = sh ''${getExe config.programs.fuzzel.package} -T "${getExe config.programs.wezterm.package} start"''; + "Mod+D".action = sh ''${getExe config.programs.fuzzel.package} -T "${getExe config.programs.alacritty.package} --command"''; "Mod+Escape".action = sh ''${getExe config.programs.wlogout.package} -p layer-shell''; "Mod+Shift+Escape".action = sh ''${getExe config.programs.swaylock.package} -f''; "Alt+Tab" = { diff --git a/home/environments/niri/waybar.nix b/home/environments/niri/waybar.nix index 3054cf10..bca1b5c7 100644 --- a/home/environments/niri/waybar.nix +++ b/home/environments/niri/waybar.nix @@ -67,9 +67,9 @@ _: { } #workspaces button.active, #workspaces button.focused { - background: @base0E; + background: @base0C; color: @base00; - border-bottom: 3px solid @base0E; + border-bottom: 3px solid @base0C; } #window { @@ -87,7 +87,7 @@ _: { } #mpris { - color: @base0A; + color: @base00; } #custom-notification { @@ -95,21 +95,21 @@ _: { } #mpris.playing { - background-color: @base0E; + background-color: @base0B; } #mpris.paused { - background-color: @base09; + background-color: @base0A; } #mpris.stopped { - background-color: @base08; + background-color: @base09; } #mode { background: @base07; - border-bottom: 3px solid @base0E; - color: @base06; + border-bottom: 3px solid @base0D; + color: @base02; } #clock { @@ -119,20 +119,20 @@ _: { } #battery.charging { - color: white; - background-color: #26A65B; + color: @base00; + background-color: @base0B; } @keyframes blink { to { - background-color: #ffffff; - color: black; + background-color: @base00; + color: @base07; } } #battery.warning:not(.charging) { - background: #f53c3c; - color: white; + background: @base0F; + color: @base00; animation-name: blink; animation-duration: 0.5s; animation-timing-function: steps(12); diff --git a/home/environments/niri/window-rules.nix b/home/environments/niri/window-rules.nix index a7bf2c2e..52be7ccd 100644 --- a/home/environments/niri/window-rules.nix +++ b/home/environments/niri/window-rules.nix @@ -34,5 +34,18 @@ _: { matches = [{app-id = "^spotify$";}]; open-on-workspace = "media"; } + { + matches = [ + { + app-id = "steam"; + title = "^notificationtoasts_\d+_desktop$"; + } + ]; + default-floating-position = { + x = 10; + y = 10; + relative-to = "top-right"; + }; + } ]; } diff --git a/home/profiles/common/stylix.nix b/home/profiles/common/stylix.nix index 6d9937da..293c8ec5 100644 --- a/home/profiles/common/stylix.nix +++ b/home/profiles/common/stylix.nix @@ -6,6 +6,20 @@ name = "Bibata-Modern-Ice"; size = 32; }; + fonts = { + sansSerif = { + name = "Jost"; + package = pkgs.jost; + }; + serif = { + name = "Libre Baskerville"; + package = pkgs.libre-baskerville; + }; + monospace = { + name = "Monaspace Krypton"; + package = pkgs.monaspace; + }; + }; autoEnable = true; base16Scheme = "${pkgs.base16-schemes}/share/themes/sakura.yaml"; }; diff --git a/home/profiles/graphical/alacritty.nix b/home/profiles/graphical/alacritty.nix index 4aab6799..938657f0 100644 --- a/home/profiles/graphical/alacritty.nix +++ b/home/profiles/graphical/alacritty.nix @@ -1,6 +1,7 @@ -_: { +{ pkgs, ... }: { stylix.targets.alacritty.enable = true; programs.alacritty = { enable = true; + package = pkgs.alacritty-graphics; }; } diff --git a/home/profiles/graphical/fastfetch.nix b/home/profiles/graphical/fastfetch.nix new file mode 100644 index 00000000..e13fb1f3 --- /dev/null +++ b/home/profiles/graphical/fastfetch.nix @@ -0,0 +1,100 @@ +_: { + programs.fastfetch = { + enable = true; + settings = { + logo = { + type = "chafa"; + source = ./nixowos.png; + height = 32; + padding = { + right = 2; + }; + }; + display = { + size = { + binaryPrefix = "si"; + }; + color = "magenta"; + separator = "  "; + }; + modules = [ + { + type = "datetime"; + key = "Date"; + format = "{1}-{3}-{11}"; + } + { + type = "datetime"; + key = "Time"; + format = "{14}:{17}:{20}"; + } + "break" + "title" + "break" + "os" + "kernel" + "bootmgr" + "uptime" + { + type = "battery"; + format = "{/4}{-}{/}{4}{?5} [{5}]{?}"; + } + "break" + "shell" + "display" + "terminal" + "break" + "chassis" + "board" + { + type = "cpu"; + showPeCoreCount = true; + temp = true; + } + { + type = "gpu"; + key = "GPU"; + temp = true; + } + "monitor" + "memory" + { + type = "swap"; + separate = true; + } + "break" + "disk" + "zpool" + { + type = "physicaldisk"; + temp = true; + } + "lm" + "wm" + "theme" + "wmtheme" + "icons" + "font" + "cursor" + "terminal" + "terminalfont" + "terminalsize" + "terminaltheme" + "break" + { + type = "weather"; + timeout = 1000; + } + "dns" + "break" + "break" + "bluetooth" + "break" + "player" + "media" + "break" + "colors" + ]; + }; + }; +} diff --git a/home/profiles/graphical/nixowos.png b/home/profiles/graphical/nixowos.png new file mode 100644 index 00000000..e0eca1a6 Binary files /dev/null and b/home/profiles/graphical/nixowos.png differ diff --git a/home/profiles/graphical/uwufetch.nix b/home/profiles/graphical/uwufetch.nix new file mode 100644 index 00000000..487b1d70 --- /dev/null +++ b/home/profiles/graphical/uwufetch.nix @@ -0,0 +1,11 @@ +{ + pkgs, + lib, + ... +}: let + inherit (lib.meta) getExe; +in { + programs.zsh.shellAliases = { + uwufetch = "${getExe pkgs.fastfetch} --chafa ${./nixowos.png} --logo-height 32"; + }; +} diff --git a/home/profiles/shell/zsh.nix b/home/profiles/shell/zsh.nix index e416c050..efc66c7f 100644 --- a/home/profiles/shell/zsh.nix +++ b/home/profiles/shell/zsh.nix @@ -13,10 +13,6 @@ in { home.packages = with pkgs; [ # programs.zsh.enableAutosuggestions only includes nix-zsh-autocompletions zsh-completions - fortune - hyfetch - fastfetch - ponysay ]; #xdg.configFile."kattheme_immutable.json".text = serde.toJSON rec { @@ -61,7 +57,7 @@ in { '' } PROMPT_EOL_MARK=''' - ZSH_TAB_TITLE_ADDITIONAL_TERMS='wezterm' + ZSH_TAB_TITLE_ADDITIONAL_TERMS='alacritty' ZSH_TAB_TITLE_ENABLE_FULL_COMMAND=true zmodload -i zsh/complist h=() diff --git a/nixos/common/stylix.nix b/nixos/common/stylix.nix index cd89e5c1..826246d1 100644 --- a/nixos/common/stylix.nix +++ b/nixos/common/stylix.nix @@ -13,6 +13,12 @@ name = "Bibata-Modern-Ice"; size = 32; }; + opacity = { + desktop = 1.0; + applications = 1.0; + terminal = 0.8; + popups = 0.8; + }; fonts = { sansSerif = { name = "Jost";