From 66f7c9545171cdd328e30156f64f9100cb3431cb Mon Sep 17 00:00:00 2001 From: iiogama Date: Sat, 13 Jan 2024 09:40:27 -0800 Subject: [PATCH] Removed river-bsp-layout flake addition for Wayland merge and push. I will create a new branch for flake package integrations --- flake.lock | 20 ++++++++++- home-manager/dots/waybar/colors.css | 12 ------- home-manager/dots/waybar/config | 48 ------------------------- home-manager/dots/waybar/now_playing.sh | 7 ---- home-manager/dots/waybar/style.css | 37 ------------------- home-manager/dots/waybar/wittr.sh | 5 --- home-manager/wayland.nix | 5 --- nixos/wayland.nix | 2 ++ 8 files changed, 21 insertions(+), 115 deletions(-) delete mode 100644 home-manager/dots/waybar/colors.css delete mode 100644 home-manager/dots/waybar/config delete mode 100755 home-manager/dots/waybar/now_playing.sh delete mode 100644 home-manager/dots/waybar/style.css delete mode 100755 home-manager/dots/waybar/wittr.sh diff --git a/flake.lock b/flake.lock index 72e2204..d9a1c67 100644 --- a/flake.lock +++ b/flake.lock @@ -36,10 +36,28 @@ "type": "github" } }, + "river-bsp-layout": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1, + "narHash": "sha256-9l80YSyV6CEKAJVnJ3LoUc88O/M0b9wKbj0mMGmL6gI=", + "path": "./packages/river-bsp-layout", + "type": "path" + }, + "original": { + "path": "./packages/river-bsp-layout", + "type": "path" + } + }, "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "river-bsp-layout": "river-bsp-layout" } } }, diff --git a/home-manager/dots/waybar/colors.css b/home-manager/dots/waybar/colors.css deleted file mode 100644 index c1d5bda..0000000 --- a/home-manager/dots/waybar/colors.css +++ /dev/null @@ -1,12 +0,0 @@ -@define-color background-darker rgba(30, 31, 41, 230); -@define-color background #282a36; -@define-color selection #44475a; -@define-color foreground #f8f8f2; -@define-color comment #6272a4; -@define-color cyan #8be9fd; -@define-color green #50fa7b; -@define-color orange #ffb86c; -@define-color pink #ff79c6; -@define-color purple #bd93f9; -@define-color red #ff5555; -@define-color yellow #f1fa8c; diff --git a/home-manager/dots/waybar/config b/home-manager/dots/waybar/config deleted file mode 100644 index 62b27e1..0000000 --- a/home-manager/dots/waybar/config +++ /dev/null @@ -1,48 +0,0 @@ -{ - "layer": "bottom", - "position": "top", - "height": 24, - "spacing": 8, - "modules-left": [ - "river/mode", - "wlr/taskbar" - ], - "modules-center": [ - "custom/now_playing" - ], - "modules-right": [ - "tray", - "custom/weather", - "clock", - ], - "wlr/taskbar": { - "on-click": "activate", - "on-click-middle": "close", - "ignore-list": [ - "foot" - ] - }, - "custom/now_playing": { - "exec": "~/.config/waybar/now_playing.sh", - "return-type": "text", - "format": "{}", - "tooltip": false, - "interval": 180 - }, - "tray": { - "icon-size": 21, - "spacing": 10 - }, - "custom/weather": { - "exec": "~/.config/waybar/wittr.sh", - "return-type": "json", - "format": "{}", - "tooltip": true, - "interval": 900 - }, - "clock": { - "format": "{:%Y.%m.%d %H:%M:%S}", - "tooltip-format": "{:%Y %B}\n{calendar}", - "interval": 1 - } -} diff --git a/home-manager/dots/waybar/now_playing.sh b/home-manager/dots/waybar/now_playing.sh deleted file mode 100755 index bf576d1..0000000 --- a/home-manager/dots/waybar/now_playing.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env sh - -CHECK=$(cmus-remote -Q | grep status | cut -f 2- -d ' ') -if [ "$CHECK" = "playing" ]; then - NOWPLAYING=$(basename "$(cmus-remote -Q | grep file | cut -f 2- -d ' ')") - printf '%s' "$NOWPLAYING" -fi diff --git a/home-manager/dots/waybar/style.css b/home-manager/dots/waybar/style.css deleted file mode 100644 index 035af1f..0000000 --- a/home-manager/dots/waybar/style.css +++ /dev/null @@ -1,37 +0,0 @@ -@import url("./colors.css"); -* { - border: none; - border-radius: 0; - font-family: Comic Mono; - font-size: 12pt; - min-height: 0; -} -window#waybar { - opacity: 0.9; - background: @background-darker; - color: @foreground; - border-bottom: 2px solid @background; -} -#workspaces button { - padding: 0 10px; - background: @background; - color: @foreground; -} -#workspaces button:hover { - box-shadow: inherit; - text-shadow: inherit; - background-image: linear-gradient(0deg, @selection, @background-darker); -} -#workspaces button.active { - background-image: linear-gradient(0deg, @purple, @selection); -} -#workspaces button.urgent { - background-image: linear-gradient(0deg, @red, @background-darker); -} -#taskbar button.active { - background-image: linear-gradient(0deg, @selection, @background-darker); -} -#clock { - padding: 0 4px; - background: @comment; -} diff --git a/home-manager/dots/waybar/wittr.sh b/home-manager/dots/waybar/wittr.sh deleted file mode 100755 index 1e0b1f1..0000000 --- a/home-manager/dots/waybar/wittr.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env sh -req=$(curl -s wttr.in/sacramento?format="%t|%l+(%c%f)+%h,+%C") -bar=$(echo $req | awk -F "|" '{print $1}') -tooltip=$(echo $req | awk -F "|" '{print $2}') -echo "{\"text\":\"$bar\", \"tooltip\":\"$tooltip\"}" diff --git a/home-manager/wayland.nix b/home-manager/wayland.nix index cbe434a..be7c62c 100644 --- a/home-manager/wayland.nix +++ b/home-manager/wayland.nix @@ -25,11 +25,6 @@ target = "swaylock"; recursive = true; }; - "waybar" = { - source = ./dots/waybar; - target = "waybar"; - recursive = true; - }; "way-displays" = { source = ./dots/way-displays; target = "way-displays"; diff --git a/nixos/wayland.nix b/nixos/wayland.nix index e4236dd..cb902e3 100644 --- a/nixos/wayland.nix +++ b/nixos/wayland.nix @@ -47,4 +47,6 @@ tessen wl-clipboard ]; + environment.systemPackages = [ + ]; }