From 63390ed0a868fde3dbec1b961f915059076502dc Mon Sep 17 00:00:00 2001 From: Varris Date: Thu, 24 Aug 2023 18:19:35 +0200 Subject: [PATCH] removed waybar --- system/configuration.nix | 2 - user/configs/wayland/hyprland/default.nix | 5 +- user/configs/wayland/waybar/default.nix | 103 ---------------------- user/configs/wayland/waybar/style.css | 93 ------------------- user/home.nix | 6 +- 5 files changed, 6 insertions(+), 203 deletions(-) delete mode 100755 user/configs/wayland/waybar/default.nix delete mode 100755 user/configs/wayland/waybar/style.css diff --git a/system/configuration.nix b/system/configuration.nix index 42a7811..7dbfe67 100755 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -4,8 +4,6 @@ ./hardware-configuration.nix ]; - nixpkgs.config.allowUnfree = true; - boot = { kernelParams = [ diff --git a/user/configs/wayland/hyprland/default.nix b/user/configs/wayland/hyprland/default.nix index e0478fe..636efa5 100755 --- a/user/configs/wayland/hyprland/default.nix +++ b/user/configs/wayland/hyprland/default.nix @@ -56,11 +56,10 @@ in { imports = [ inputs.hyprland.homeManagerModules.default - ../waybar + ../eww ../foot ../wob ../mako - ../eww ]; wayland.windowManager.hyprland = { @@ -146,7 +145,6 @@ in exec = ${pkgs.xorg.xrandr}/bin/xrandr --output ${rightMonitor.display} --primary exec = ${wob-voldaemon}/bin/wob-volumeindicator.sh; - # exec = pkill waybar; ${pkgs.waybar}/bin/waybar exec = ${pkgs.eww-git}/bin/eww kill; ${pkgs.eww-git}/bin/eww open-many bar0 bar1 exec = pkill swww; sleep 2 && ${pkgs.swww}/bin/swww init && ${pkgs.swww}/bin/swww img $(cat ~/.cache/swww/wallpaper.txt) @@ -209,7 +207,6 @@ in bind = ${modKey} SHIFT, C, exec, hyprctl reload - layerrule = blur, waybar layerrule = blur, notifications layerrule = blur, gtk-layer-shell diff --git a/user/configs/wayland/waybar/default.nix b/user/configs/wayland/waybar/default.nix deleted file mode 100755 index dd14483..0000000 --- a/user/configs/wayland/waybar/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ pkgs, lib, ... }: -let - wobsock = "/tmp/wob-vol.fifo"; - - ds-battery = pkgs.writeShellScriptBin "ds-battery.sh" '' - ds_capacity_file="/sys/class/power_supply/ps-controller-battery-e8:47:3a:46:72:1b/capacity" - ds_status_file="/sys/class/power_supply/ps-controller-battery-e8:47:3a:46:72:1b/status" - - while true; do - if [[ -f $ds_capacity_file ]]; then - charge=$(<"$ds_capacity_file") - if [[ $(<"$ds_status_file") == "Charging" ]]; then - echo "{\"class\":\"charging\",\"text\":\" Charging: $charge%\",\"tooltip\":\"Charging:\n$charge%\"}" - else - echo "{\"class\":\"discharging\",\"text\":\" $charge%\",\"tooltip\":\"Battery:\\n$charge%\"}" - fi - else - echo "{\"class\":\"not_connected\",\"text\":\"\"}" - fi - sleep 10 - done - ''; -in -{ - programs.waybar = { - enable = true; - package = pkgs.waybar; - - settings = [{ - layer = "top"; - position = "top"; - height = 32; - - modules-left = [ "wlr/workspaces" "custom/blank" "hyprland/window" ]; - modules-center = [ "wireplumber" "custom/blank" "mpd" ]; - modules-right = [ - "custom/ds-battery" - "tray" - "clock" - "custom/blank" - ]; - - "wlr/workspaces" = { - on-click = "activate"; - on-scroll-up = "hyprctl dispatch workspace e+1"; - on-scroll-down = "hyprctl dispatch workspace e-1"; - persistent_workspaces = { - "1" = [ "DP-1" ]; - "2" = [ "DP-1" ]; - "3" = [ "DP-1" ]; - "4" = [ "HDMI-A-1" ]; - "5" = [ "HDMI-A-1" ]; - "6" = [ "HDMI-A-1" ]; - }; - }; - - "hyprland/window" = { - separate-outputs = true; - }; - - "clock" = { - format = "{:%a %d. %B %H:%M}"; - }; - - "wireplumber" = { - scroll-step = 5; - format = "{icon} {volume}%"; - format-icons = [ "" "" "󰕾" "" ]; - ignored-sinks = [ "Easy Effects Sink" ]; - on-scroll-up = "${pkgs.pamixer}/bin/pamixer -i 10 --get-volume > ${wobsock}"; - on-scroll-down = "${pkgs.pamixer}/bin/pamixer -d 10 --get-volume > ${wobsock}"; - }; - - "tray" = { - icon-size = 16; - spacing = 10; - }; - - "mpd" = { - format = - "{stateIcon} {artist} - {title} {elapsedTime:%M:%S}/{totalTime:%M:%S}"; - format-stopped = "󰓛 stopped"; - state-icons = { - playing = ""; - paused = "󰏤"; - }; - on-click = "${pkgs.foot}/bin/foot -e ${pkgs.ncmpcpp}/bin/ncmpcpp"; - }; - - "custom/ds-battery" = { - return-type = "json"; - exec = "${ds-battery}/bin/ds-battery.sh"; - escape = "true"; - }; - - "custom/blank" = { format = " "; }; - - }]; - - style = builtins.readFile ./style.css; - }; -} - diff --git a/user/configs/wayland/waybar/style.css b/user/configs/wayland/waybar/style.css deleted file mode 100755 index 57184d1..0000000 --- a/user/configs/wayland/waybar/style.css +++ /dev/null @@ -1,93 +0,0 @@ -@define-color bg rgba(40,40,40,0.8); -@define-color fg rgb(235,219,178); -@define-color box-bg rgb(80,73,69); - -@define-color wsfg rgb(235,219,178); -@define-color wsbg rgb(60,56,54); -@define-color activewsbg rgb(102,92,84); - -* { - font-family: "JetBrainsMono Nerd Font"; - font-size: 12; -} - -window#waybar { - background: transparent; - color: @fg; -} - -window#waybar > box { - background-color: @bg; -} - -#wireplumber, -#mpd, -#custom-waybar-mpris, -#custom-ds-battery, -#window, -#keyboard-state, -#tray, -#clock, -#custom-swaync { - background: @box-bg; - padding: 0px 10px 0px 10px; - margin: 5px 10px 5px 0px; - border-radius: 10px; -} - -#window { - margin: 5px 10px 5px 10px; -} - -#wireplumber { - margin: 5px 0px 5px 0px; - border-radius: 10px 0px 0px 10px; -} - -#mpd { - border-radius: 0px 10px 10px 0px; -} - -#tray { - margin: 5px 10px 5px 0px; -} - -#clock { - margin: 5px 5px 5px 0; -} - -#workspaces { - margin: 5px 0px 5px 0px; - padding-left: 10px; -} - -#workspaces button { - color: @fg; - background: @wsbg; - padding: 0px 5px; - border-radius: 0; -} - -#workspaces button:last-child { - border-radius: 0px 10px 10px 0px; -} - -#workspaces button:first-child { - border-radius: 10px 0px 0px 10px; -} - -#workspaces button:only-child { - border-radius: 10px 10px 10px 10px; -} - -#workspaces button.active { - color: @wsfg; - background: @activewsbg; - font-weight: bold; -} - -#workspaces button.persistent { - color: @wsfg; - background: @wsbg; - font-weight: bold; -} diff --git a/user/home.nix b/user/home.nix index fb79962..0f2619e 100755 --- a/user/home.nix +++ b/user/home.nix @@ -43,7 +43,6 @@ nerdfonts noto-fonts-cjk-sans noto-fonts-cjk-serif - obs-studio openmw pamixer pavucontrol @@ -154,6 +153,11 @@ enableFishIntegration = true; }; nix-index-database.comma.enable = true; + + obs-studio = { + enable = true; + plugins = [ pkgs.obs-studio-plugins.obs-vkcapture ]; + }; }; services.gnome-keyring.enable = true;