diff --git a/modules/home/home.nix b/modules/home/home.nix
index d42fd33..dda3199 100644
--- a/modules/home/home.nix
+++ b/modules/home/home.nix
@@ -23,6 +23,8 @@
".wp/wolf.png".source = ./raw/wp/wolf.png;
".wp/nixos_dark.png".source = ./raw/wp/nixos_dark.png;
".wp/GABE_Windows.png".source = ./raw/wp/GABE_Windows.png;
+ ".wp/skulls.png".source = ./raw/wp/skulls.png;
+ ".wp/soyuz.png".source = ./raw/wp/soyuz.png;
};
};
}
diff --git a/modules/home/nix/sway/default.nix b/modules/home/nix/sway/default.nix
index 74ea188..8667e9f 100644
--- a/modules/home/nix/sway/default.nix
+++ b/modules/home/nix/sway/default.nix
@@ -10,5 +10,10 @@
slurp
grim
];
+ file = {
+ ".config/rofi/config.rasi".source = ./raw/config.rasi;
+ ".config/waybar/style.css".source = ./raw/style.css;
+ ".config/waybar/config".source = ./raw/config;
+ };
};
}
diff --git a/modules/home/nix/sway/raw/config b/modules/home/nix/sway/raw/config
new file mode 100644
index 0000000..7b1b733
--- /dev/null
+++ b/modules/home/nix/sway/raw/config
@@ -0,0 +1,189 @@
+[
+ {
+ "battery": {
+ "format": "{icon} {capacity}%",
+ "format-alt": "{icon} {time}",
+ "format-charging": " {capacity}%",
+ "format-icons": [
+ "",
+ "",
+ "",
+ "",
+ ""
+ ],
+ "format-plugged": " {capacity}% ",
+ "states": {
+ "critical": 15,
+ "good": 95,
+ "warning": 30
+ }
+ },
+ "cava#left": {
+ "autosens": 1,
+ "bar_delimiter": 0,
+ "bars": 18,
+ "format-icons": [
+ "▁",
+ "▂",
+ "▃",
+ "▄",
+ "▅",
+ "▆",
+ "▇",
+ "█"
+ ],
+ "framerate": 60,
+ "higher_cutoff_freq": 10000,
+ "input_delay": 2,
+ "lower_cutoff_freq": 50,
+ "method": "pulse",
+ "monstercat": false,
+ "reverse": false,
+ "source": "auto",
+ "stereo": true,
+ "waves": false
+ },
+ "cava#right": {
+ "autosens": 1,
+ "bar_delimiter": 0,
+ "bars": 18,
+ "format-icons": [
+ "▁",
+ "▂",
+ "▃",
+ "▄",
+ "▅",
+ "▆",
+ "▇",
+ "█"
+ ],
+ "framerate": 60,
+ "higher_cutoff_freq": 10000,
+ "input_delay": 2,
+ "lower_cutoff_freq": 50,
+ "method": "pulse",
+ "monstercat": false,
+ "reverse": false,
+ "source": "auto",
+ "stereo": true,
+ "waves": false
+ },
+ "clock": {
+ "format": " {:%a, %d %b, %I:%M %p}",
+ "format-alt": " {:%d/%m}",
+ "tooltip": "true",
+ "tooltip-format": "{:%Y %B}\n{calendar}"
+ },
+ "cpu": {
+ "format": " {usage}%",
+ "format-alt": " {avg_frequency} GHz",
+ "interval": 5
+ },
+ "custom/launcher": {
+ "format": "",
+ "tooltip": "false"
+ },
+ "custom/playerctl#backward": {
+ "format": " ",
+ "on-click": "playerctl previous",
+ "on-scroll-down": "playerctl volume .05-",
+ "on-scroll-up": "playerctl volume .05+"
+ },
+ "custom/playerctl#foward": {
+ "format": " ",
+ "on-click": "playerctl next",
+ "on-scroll-down": "playerctl volume .05-",
+ "on-scroll-up": "playerctl volume .05+"
+ },
+ "custom/playerctl#play": {
+ "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F",
+ "format": "{icon}",
+ "format-icons": {
+ "Paused": " ",
+ "Playing": " ",
+ "Stopped": " "
+ },
+ "on-click": "playerctl play-pause",
+ "on-scroll-down": "playerctl volume .05-",
+ "on-scroll-up": "playerctl volume .05+",
+ "return-type": "json"
+ },
+ "custom/playerlabel": {
+ "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F",
+ "format": " {} ",
+ "max-length": 40,
+ "on-click": "",
+ "return-type": "json"
+ },
+ "custom/randwall": {
+ "format": ""
+ },
+ "height": 35,
+ "layer": "top",
+ "margin-bottom": 0,
+ "margin-left": 0,
+ "margin-right": 0,
+ "margin-top": 0,
+ "memory": {
+ "format": " {}%",
+ "format-alt": " {used}/{total} GiB",
+ "interval": 5
+ },
+ "modules-center": [
+ "custom/playerlabel",
+ ],
+ "modules-left": [
+ "cava#left",
+ "custom/playerctl#backward",
+ "custom/playerctl#play",
+ "custom/playerctl#foward",
+ ],
+ "modules-right": [
+ "tray",
+ "battery",
+ "pulseaudio",
+ "network",
+ ],
+
+ "network": {
+ "format-disconnected": " 0% ",
+ "format-ethernet": " 100% ",
+ "format-linked": "{ifname} (No IP)",
+ "format-wifi": " {signalStrength}%",
+ "tooltip-format": "Connected to {essid} {ifname} via {gwaddr}"
+ },
+ "position": "top",
+ "pulseaudio": {
+ "format": "{icon} {volume}%",
+ "format-icons": {
+ "default": [
+ "",
+ "",
+ ""
+ ]
+ },
+ "format-muted": "",
+ "on-click": "pavucontrol",
+ "scroll-step": 5
+ },
+ "tray": {
+ "icon-size": 20,
+ "spacing": 8
+ },
+ "wlr/workspaces": {
+ "active-only": false,
+ "all-outputs": false,
+ "disable-scroll": false,
+ "format": "{name}",
+ "format-icons": {
+ "active": "",
+ "default": "",
+ "sort-by-number": true,
+ "urgent": ""
+ },
+ "on-click": "activate",
+ "on-scroll-down": "hyprctl dispatch workspace e+1",
+ "on-scroll-up": "hyprctl dispatch workspace e-1"
+ }
+ }
+]
diff --git a/modules/home/nix/sway/raw/config.rasi b/modules/home/nix/sway/raw/config.rasi
new file mode 100644
index 0000000..f1ab9c7
--- /dev/null
+++ b/modules/home/nix/sway/raw/config.rasi
@@ -0,0 +1,76 @@
+configuration {
+ display-drun: "Applications:";
+ drun-display-format: "{icon} {name}";
+ font: "JetBrainsMono Nerd Font Medium 10";
+ show-icons: true;
+ modi: "drun";
+}
+
+@theme "/dev/null"
+
+* {
+
+ opacity: 0.5;
+ color0: #39305320;
+ color1: #494d6420;
+ color3: #d8dee9;
+ color4: #7b68ee;
+ color5: #cbe3e7;
+
+
+ background-color: transparent;
+ text-color: @color3;
+ accent-color: @color5;
+
+ margin: 0px;
+ border: 0px;
+ padding: 0px;
+ spacing: 0px;
+}
+
+window {
+ background-color: @color0;
+ border-color: @accent-color;
+
+ width: 50%;
+ border: 2px;
+}
+
+inputbar {
+ padding: 10px 12px;
+ spacing: 12px;
+ children: [ prompt, entry ];
+}
+
+prompt, entry, element-text, element-icon {
+ vertical-align: 0.5;
+}
+
+prompt {
+ text-color: @accent-color;
+ enabled: true;
+ text-color: @color4;
+}
+
+listview {
+ lines: 8;
+ columns: 2;
+
+}
+
+element {
+ padding: 8px;
+ spacing: 8px;
+}
+
+element selected {
+ text-color: @color4;
+}
+
+element-icon {
+ size: 20;
+}
+
+element-text {
+ text-color: inherit;
+}
diff --git a/modules/home/nix/sway/raw/style.css b/modules/home/nix/sway/raw/style.css
new file mode 100644
index 0000000..a1f056e
--- /dev/null
+++ b/modules/home/nix/sway/raw/style.css
@@ -0,0 +1,134 @@
+* {
+ border: none;
+ border-radius: 0px;
+ font-family: RobotoMono Nerd Font;
+ font-size: 14px;
+ min-height: 0;
+}
+
+window#waybar {
+ /* background: rgba(17,17,27,1); */
+ background: transparent;
+}
+
+#cava.left, #cava.right {
+ /* background: #25253a; */
+
+ /*background: #25253a;*/
+ background: #010101;
+ margin: 5px;
+ padding: 8px 16px;
+ color: #cba6f7;
+}
+#cava.left {
+ border-radius: 24px 24px 24px 24px;
+}
+#cava.right {
+ border-radius: 10px 24px 10px 24px;
+}
+#workspaces {
+ background: #11111b;
+ margin: 5px 5px;
+ padding: 8px 5px;
+ border-radius: 16px;
+ color: #cba6f7
+}
+#workspaces button {
+ padding: 0px 5px;
+ margin: 0px 3px;
+ border-radius: 16px;
+ color: transparent;
+ background: rgba(17,17,27,1);
+ transition: all 0.3s ease-in-out;
+}
+
+#workspaces button.active {
+ background-color: #89b4fa;
+ color: #11111B;
+ border-radius: 16px;
+ min-width: 50px;
+ background-size: 400% 400%;
+ transition: all 0.3s ease-in-out;
+}
+
+#workspaces button:hover {
+ background-color: #f5f5f5;
+ color: #11111B;
+ border-radius: 16px;
+ min-width: 50px;
+ background-size: 400% 400%;
+}
+
+#tray, #pulseaudio, #network, #battery,
+#custom-playerctl.backward, #custom-playerctl.play, #custom-playerctl.foward{
+ background: #010101;
+ font-weight: bold;
+ margin: 5px 0px;
+ opacity: 1;
+}
+#tray, #pulseaudio, #network, #battery{
+ color: #f5f5f5;
+ border-radius: 24px 24px 24px 24px;
+ padding: 0 20px;
+ margin-left: 7px;
+}
+#clock {
+ color: #f5f5f5;
+ background: #010101;
+ border-radius: 0px 0px 0px 40px;
+ padding: 10px 10px 15px 25px;
+ margin-left: 7px;
+ font-weight: bold;
+ font-size: 16px;
+}
+#custom-launcher {
+ color: #89b4fa;
+ background: #010101;
+ border-radius: 0px 0px 40px 0px;
+ margin: 0px;
+ padding: 0px 35px 0px 15px;
+ font-size: 28px;
+}
+
+#custom-playerctl.backward, #custom-playerctl.play, #custom-playerctl.foward {
+ background: #010101;
+ font-size: 22px;
+}
+#custom-playerctl.backward:hover, #custom-playerctl.play:hover, #custom-playerctl.foward:hover{
+ color: #f5f5f5;
+}
+#custom-playerctl.backward {
+ color: #cba6f7;
+ border-radius: 24px 0px 0px 24px;
+ padding-left: 16px;
+ margin-left: 7px;
+}
+#custom-playerctl.play {
+ color: #89b4fa;
+ padding: 0 5px;
+}
+#custom-playerctl.foward {
+ color: #cba6f7;
+ border-radius: 0px 24px 24px 0px;
+ padding-right: 12px;
+ margin-right: 7px
+}
+#custom-playerlabel {
+ background: #010101;
+ color: #f5f5f5;
+ padding: 0 20px;
+ border-radius: 24px 24px 24px 24px;
+ margin: 5px 0;
+ font-weight: bold;
+}
+#window{
+ /*background: #25253a; */
+ padding-left: 15px;
+ padding-right: 15px;
+ border-radius: 16px;
+ margin-top: 5px;
+ margin-bottom: 5px;
+ font-weight: normal;
+ font-style: normal;
+ opacity: 0.1;
+}
diff --git a/modules/home/nix/sway/sway.nix b/modules/home/nix/sway/sway.nix
index 8b592aa..837b3e9 100644
--- a/modules/home/nix/sway/sway.nix
+++ b/modules/home/nix/sway/sway.nix
@@ -5,7 +5,7 @@
xwayland = true;
package = pkgs.swayfx-unwrapped;
wrapperFeatures.gtk = true;
-
+ checkConfig = false;
extraSessionCommands = ''
export _JAVA_AWT_WM_NONREPARENTING=1
export QT_QPA_PLATFORM=wayland
@@ -14,10 +14,10 @@
config = rec {
modifier = "Mod4";
- terminal = "wezterm";
- menu = "${pkgs.rofi}/bin/rofi -show drun -c .config/rofi/config.rasi";
+ terminal = "alacritty";
+ menu = "${pkgs.rofi}/bin/rofi -show run -c .config/rofi/config.rasi";
startup = [
- {command = "swaybg -i $HOME/.wp/skull_purple.png";}
+ {command = "swaybg -i $HOME/.wp/soyuz.png";}
];
bars = [{ command = "waybar"; }];
gaps = {
diff --git a/modules/home/raw/wp/skulls.png b/modules/home/raw/wp/skulls.png
new file mode 100644
index 0000000..7d0233d
Binary files /dev/null and b/modules/home/raw/wp/skulls.png differ
diff --git a/modules/home/raw/wp/soyuz.png b/modules/home/raw/wp/soyuz.png
new file mode 100644
index 0000000..ed594e8
Binary files /dev/null and b/modules/home/raw/wp/soyuz.png differ
diff --git a/modules/system/nix/x/slstatus/default.nix b/modules/system/nix/x/slstatus/default.nix
deleted file mode 100644
index e64a1ac..0000000
--- a/modules/system/nix/x/slstatus/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ config, pkgs, ... }:
-{
- environment.systemPackages = with pkgs; [
- (slstatus.overrideAttrs (_: { src = ./source/slstatus; }))
- ];
-}
diff --git a/modules/system/nix/x/slstatus/source/slstatus b/modules/system/nix/x/slstatus/source/slstatus
deleted file mode 160000
index 142f761..0000000
--- a/modules/system/nix/x/slstatus/source/slstatus
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 142f761930f7ba02511a272a5e1f62420330cf3b
diff --git a/modules/wp/GABE_Windows.png b/modules/wp/GABE_Windows.png
new file mode 100644
index 0000000..babfabd
Binary files /dev/null and b/modules/wp/GABE_Windows.png differ
diff --git a/modules/wp/anime_blue.png b/modules/wp/anime_blue.png
new file mode 100644
index 0000000..6bb7229
Binary files /dev/null and b/modules/wp/anime_blue.png differ
diff --git a/modules/wp/bg.png b/modules/wp/bg.png
new file mode 100755
index 0000000..78436a9
Binary files /dev/null and b/modules/wp/bg.png differ
diff --git a/modules/wp/fuji.png b/modules/wp/fuji.png
new file mode 100644
index 0000000..3c4f212
Binary files /dev/null and b/modules/wp/fuji.png differ
diff --git a/modules/wp/gruvbox-dark-blue.png b/modules/wp/gruvbox-dark-blue.png
new file mode 100644
index 0000000..fcb1f8a
Binary files /dev/null and b/modules/wp/gruvbox-dark-blue.png differ
diff --git a/modules/wp/hollow_knight.png b/modules/wp/hollow_knight.png
new file mode 100644
index 0000000..2ee2c56
Binary files /dev/null and b/modules/wp/hollow_knight.png differ
diff --git a/modules/wp/ios.png b/modules/wp/ios.png
new file mode 100755
index 0000000..9bd609b
Binary files /dev/null and b/modules/wp/ios.png differ
diff --git a/modules/wp/manga.png b/modules/wp/manga.png
new file mode 100755
index 0000000..0e78feb
Binary files /dev/null and b/modules/wp/manga.png differ
diff --git a/modules/wp/nixos_dark.png b/modules/wp/nixos_dark.png
new file mode 100644
index 0000000..879b65a
Binary files /dev/null and b/modules/wp/nixos_dark.png differ
diff --git a/modules/wp/orbit.png b/modules/wp/orbit.png
new file mode 100644
index 0000000..8530671
Binary files /dev/null and b/modules/wp/orbit.png differ
diff --git a/modules/wp/skull_purple.png b/modules/wp/skull_purple.png
new file mode 100644
index 0000000..284a53c
Binary files /dev/null and b/modules/wp/skull_purple.png differ
diff --git a/modules/wp/skulls.png b/modules/wp/skulls.png
new file mode 100644
index 0000000..7d0233d
Binary files /dev/null and b/modules/wp/skulls.png differ
diff --git a/modules/wp/soyuz.png b/modules/wp/soyuz.png
new file mode 100644
index 0000000..ed594e8
Binary files /dev/null and b/modules/wp/soyuz.png differ
diff --git a/modules/wp/temple.png b/modules/wp/temple.png
new file mode 100644
index 0000000..46da4a8
Binary files /dev/null and b/modules/wp/temple.png differ
diff --git a/modules/wp/wolf.png b/modules/wp/wolf.png
new file mode 100755
index 0000000..cdaf39a
Binary files /dev/null and b/modules/wp/wolf.png differ