Removed river-bsp-layout flake addition for Wayland merge and push. I will create a new branch for flake package integrations

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"
       }
     }
   },

home-manager/dots/waybar/colors.css

@@ -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;

home-manager/dots/waybar/config

@@ -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": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-		"interval": 1
-  }
-}

home-manager/dots/waybar/now_playing.sh

@@ -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

home-manager/dots/waybar/style.css

@@ -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;
-}

home-manager/dots/waybar/wittr.sh

@@ -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\"}"

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";

nixos/wayland.nix

@@ -47,4 +47,6 @@
     tessen
     wl-clipboard
   ];
+  environment.systemPackages = [
+  ];
 }