From 9c63bb1dbdb7dceb51610c8ed3bf4ea56a1f6ae1 Mon Sep 17 00:00:00 2001 From: specCon18 Date: Thu, 31 Aug 2023 22:44:44 -0400 Subject: [PATCH] added rofi config --- flake.nix | 1 + modules/home-manager/hyprland.nix | 2 +- modules/home-manager/rofi.nix | 8 +++ modules/home-manager/style.css | 98 +++++-------------------------- modules/home-manager/waybar.nix | 8 +-- 5 files changed, 30 insertions(+), 87 deletions(-) create mode 100644 modules/home-manager/rofi.nix diff --git a/flake.nix b/flake.nix index 72c936e..46582d5 100644 --- a/flake.nix +++ b/flake.nix @@ -91,6 +91,7 @@ ./modules/home-manager/dconf-settings.nix ./modules/home-manager/syncthing.nix ./modules/home-manager/waybar.nix + ./modules/home-manager/rofi.nix ]; #extra modules to be loaded by home-manager }; }; diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix index 84aaf56..918cff3 100644 --- a/modules/home-manager/hyprland.nix +++ b/modules/home-manager/hyprland.nix @@ -31,7 +31,7 @@ bind = $mainMod SHIFT, 8, movetoworkspace, 8 bind = $mainMod SHIFT, 9, movetoworkspace, 9 bind = $mainMod SHIFT, 0, movetoworkspace, 10 - exec-once=systemctl --user restart waybar.service + exec-once=systemctl --user start waybar.service exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once=mako exec-once = swww init diff --git a/modules/home-manager/rofi.nix b/modules/home-manager/rofi.nix new file mode 100644 index 0000000..751757c --- /dev/null +++ b/modules/home-manager/rofi.nix @@ -0,0 +1,8 @@ +{ pkgs, config, lib, ...}: +{ + programs.rofi = { + enable = true; + theme = "android_notification"; + location = "top-left"; + }; +} \ No newline at end of file diff --git a/modules/home-manager/style.css b/modules/home-manager/style.css index e63c74e..11d06fe 100644 --- a/modules/home-manager/style.css +++ b/modules/home-manager/style.css @@ -5,8 +5,7 @@ } window#waybar { - background-color: rgba(68, 64, 60, 1); - border-bottom: 3px solid rgba(100, 114, 125, 0.5); + background-color: rgba(68, 64, 60, 0.0); color: #ffffff; transition-property: background-color; transition-duration: .5s; @@ -16,15 +15,6 @@ window#waybar.hidden { opacity: 0.2; } -/* -window#waybar.empty { - background-color: transparent; -} -window#waybar.solo { - background-color: #FFFFFF; -} -*/ - window#waybar.termite { background-color: #3F3F3F; } @@ -38,19 +28,13 @@ button { /* Use box-shadow instead of border so the text isn't offset */ box-shadow: inset 0 -3px transparent; /* Avoid rounded borders under each button name */ - border: none; + border: 0; border-radius: 0; } /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ button:hover { background: inherit; - box-shadow: inset 0 -3px #ffffff; -} - -#mode { - background-color: #64727D; - border-bottom: 3px solid #ffffff; } #clock, @@ -62,34 +46,29 @@ button:hover { #backlight, #network, #pulseaudio, -#wireplumber, -#custom-media, -#tray, -#mode, -#idle_inhibitor, -#scratchpad, -#mpd { +#wireplumber { padding: 0 10px; color: #030712; } -#window, -#workspaces { +#window { margin: 0 4px; } #clock { background-color: #ec4899; + border-radius: 24px; } #battery { - background-color: #ffffff; + background-color: #0ea5e9; color: #000000; + border-radius: 24px; } #battery.charging, #battery.plugged { - color: #ffffff; + color: #22c55e; background-color: #26A65B; } @@ -117,24 +96,29 @@ label:focus { #cpu { background-color: #10b981; color: #030712; + border-radius: 24px; } #memory { background-color: #d946ef; color: #030712; + border-radius: 24px; } #disk { background-color: #964B00; + border-radius: 24px; } #backlight { background-color: #8b5cf6; + border-radius: 24px; } #network { background-color: #0ea5e9; color: #030712; + border-radius: 24px; } #network.disconnected { @@ -144,6 +128,7 @@ label:focus { #pulseaudio { background-color: #eab308; color: #030712; + border-radius: 24px; } #pulseaudio.muted { @@ -154,73 +139,22 @@ label:focus { #wireplumber { background-color: #fff0f5; color: #000000; + border-radius: 24px; } #wireplumber.muted { background-color: #f53c3c; } -#custom-media { - background-color: #66cc99; - color: #2a5c45; - min-width: 100px; -} - -#custom-media.custom-spotify { - background-color: #66cc99; -} - -#custom-media.custom-vlc { - background-color: #ffa000; -} - #temperature { background-color: #f0932b; + border-radius: 24px; } #temperature.critical { background-color: #eb4d4b; } -#tray { - background-color: #2980b9; -} - -#tray>.passive { - -gtk-icon-effect: dim; -} - -#tray>.needs-attention { - -gtk-icon-effect: highlight; - background-color: #eb4d4b; -} - -#idle_inhibitor { - background-color: #2d3436; -} - -#idle_inhibitor.activated { - background-color: #ecf0f1; - color: #2d3436; -} - -#mpd { - background-color: #66cc99; - color: #2a5c45; -} - -#mpd.disconnected { - background-color: #f53c3c; -} - -#mpd.stopped { - background-color: #90b1b1; -} - -#mpd.paused { - background-color: #51a37a; -} - #language { background: #00b093; color: #740864; diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index 724ac43..3882b8c 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -15,10 +15,10 @@ spacing = 8; modules-left = []; modules-center = [ + "temperature" ]; modules-right = [ "battery" - "temperature" "backlight" "cpu" "memory" @@ -79,9 +79,9 @@ "" ]; }; - # "battery#bat2": { - # "bat": "BAT2" - # }, + "battery#bat2" = { + bat = "BAT2"; + }; network = { format-wifi = "{essid} ({signalStrength}%) "; format-ethernet = "{ipaddr}/{cidr} ";