diff --git a/README.org b/README.org
index b2067b2..c5c1139 100644
--- a/README.org
+++ b/README.org
@@ -14,3 +14,4 @@ this is probably not that great of a reference.
- https://github.com/kaleocheng/nix-dots/tree/master
- https://gist.github.com/0atman/1a5133b842f929ba4c1e195ee67599d5
- https://github.com/woioeow/hyprland-dotfiles/tree/main
+- https://github.com/HeinzDev/Hyprland-dotfiles
diff --git a/home/hypr.nix b/home/hypr.nix
index c6c1226..9e237d4 100644
--- a/home/hypr.nix
+++ b/home/hypr.nix
@@ -3,233 +3,110 @@
pkgs,
...
}: {
+ catppuccin = {
+ waybar = {
+ enable = false;
+ # flavor = "mocha";
+ # mode = "createLink";
+ };
+ hyprland = {
+ enable = false;
+ };
+ };
+
programs.waybar = {
enable = true;
systemd = {
enable = true;
target = "hyprland-session.target";
};
- style = ''
- * {
- font-family: "JetBrainsMono Nerd Font";
- font-size: 12pt;
- font-weight: bold;
- border-radius: 8px;
- transition-property: background-color;
- transition-duration: 0.5s;
- }
- @keyframes blink_red {
- to {
- background-color: rgb(242, 143, 173);
- color: rgb(26, 24, 38);
- }
- }
- .warning, .critical, .urgent {
- animation-name: blink_red;
- animation-duration: 1s;
- animation-timing-function: linear;
- animation-iteration-count: infinite;
- animation-direction: alternate;
- }
- window#waybar {
- background-color: transparent;
- }
- window > box {
- margin-left: 5px;
- margin-right: 5px;
- margin-top: 5px;
- background-color: #1e1e2a;
- padding: 3px;
- padding-left:8px;
- border: 2px none #33ccff;
- }
- #workspaces {
- padding-left: 0px;
- padding-right: 4px;
- }
- #workspaces button {
- padding-top: 5px;
- padding-bottom: 5px;
- padding-left: 6px;
- padding-right: 6px;
- }
- #workspaces button.active {
- background-color: rgb(181, 232, 224);
- color: rgb(26, 24, 38);
- }
- #workspaces button.urgent {
- color: rgb(26, 24, 38);
- }
- #workspaces button:hover {
- background-color: rgb(248, 189, 150);
- color: rgb(26, 24, 38);
- }
- tooltip {
- background: rgb(48, 45, 65);
- }
- tooltip label {
- color: rgb(217, 224, 238);
- }
- #custom-launcher {
- font-size: 20px;
- padding-left: 8px;
- padding-right: 6px;
- color: #7ebae4;
- }
- #mode, #clock, #memory, #temperature,#cpu,#mpd, #custom-wall, #temperature, #backlight, #pulseaudio, #network, #battery, #custom-powermenu, #custom-cava-internal {
- padding-left: 10px;
- padding-right: 10px;
- }
- /* #mode { */
- /* margin-left: 10px; */
- /* background-color: rgb(248, 189, 150); */
- /* color: rgb(26, 24, 38); */
- /* } */
- #memory {
- color: rgb(181, 232, 224);
- }
- #cpu {
- color: rgb(245, 194, 231);
- }
- #clock {
- color: rgb(217, 224, 238);
- }
- /* #idle_inhibitor {
- color: rgb(221, 182, 242);
- }*/
- #custom-wall {
- color: #33ccff;
- }
- #temperature {
- color: rgb(150, 205, 251);
- }
- #backlight {
- color: rgb(248, 189, 150);
- }
- #pulseaudio {
- color: rgb(245, 224, 220);
- }
- #network {
- color: #ABE9B3;
- }
- #network.disconnected {
- color: rgb(255, 255, 255);
- }
- #custom-powermenu {
- color: rgb(242, 143, 173);
- padding-right: 8px;
- }
- #tray {
- padding-right: 8px;
- padding-left: 10px;
- }
- #mpd.paused {
- color: #414868;
- font-style: italic;
- }
- #mpd.stopped {
- background: transparent;
- }
- #mpd {
- color: #c0caf5;
- }
- #custom-cava-internal{
- font-family: "Hack Nerd Font" ;
- color: #33ccff;
- }
- '';
+ style = ./waybar.css;
settings = [{
- "layer" = "top";
- "position" = "top";
- modules-left = [
- "custom/launcher"
- "temperature"
- "mpd"
- "custom/cava-internal"
- ];
- modules-center = [
- "clock"
- ];
- modules-right = [
- "pulseaudio"
- "backlight"
- "memory"
- "cpu"
- "network"
- "custom/powermenu"
- "tray"
- ];
- "custom/launcher" = {
- "format" = " ";
- "on-click" = "pkill rofi || rofi2";
- "on-click-middle" = "exec default_wall";
- "on-click-right" = "exec wallpaper_random";
- "tooltip" = false;
- };
- "custom/cava-internal" = {
- "exec" = "sleep 1s && cava-internal";
- "tooltip" = false;
- };
- "pulseaudio" = {
- "scroll-step" = 1;
- "format" = "{icon} {volume}%";
- "format-muted" = " Muted";
- "format-icons" = {
- "default" = [ "" "" "" ];
+ "layer" = "top";
+ "position" = "top";
+ modules-left = [
+ "custom/launcher"
+ "temperature"
+ "mpd"
+ ];
+ modules-center = [
+ "clock"
+ ];
+ modules-right = [
+ "pulseaudio"
+ "backlight"
+ "memory"
+ "cpu"
+ "network"
+ "custom/powermenu"
+ "tray"
+ ];
+ "custom/launcher" = {
+ "format" = " ";
+ "on-click" = "pkill rofi || rofi2";
+ "on-click-middle" = "exec default_wall";
+ "on-click-right" = "exec wallpaper_random";
+ "tooltip" = false;
};
- "on-click" = "pamixer -t";
- "tooltip" = false;
- };
- "clock" = {
- "interval" = 1;
- "format" = "{:%I:%M %p %A %b %d}";
- "tooltip" = true;
- "tooltip-format"= "{=%A; %d %B %Y}\n{calendar}";
- };
- "memory" = {
- "interval" = 1;
- "format" = " {percentage}%";
- "states" = {
- "warning" = 85;
+ "pulseaudio" = {
+ "scroll-step" = 1;
+ "format" = "{icon} {volume}%";
+ "format-muted" = " Muted";
+ "format-icons" = {
+ "default" = [ "" "" "" ];
+ };
+ "on-click" = "pamixer -t";
+ "tooltip" = false;
+ };
+ "clock" = {
+ "interval" = 1;
+ "format" = "{:%H:%M}";
+ "tooltip" = true;
+ "tooltip-format"= "{:%Y-%m-%d}\n{calendar}";
+ };
+ "memory" = {
+ "interval" = 1;
+ "format" = " {percentage}%";
+ "states" = {
+ "warning" = 85;
+ };
+ };
+ "cpu" = {
+ "interval" = 1;
+ "format" = " {usage}%";
+ };
+ "mpd" = {
+ "max-length" = 25;
+ "format" = " {title}";
+ "format-paused" = " {title}";
+ "format-stopped" = "";
+ "format-disconnected" = "";
+ "on-click" = "mpc --quiet toggle";
+ "on-click-right" = "mpc update; mpc ls | mpc add";
+ "on-click-middle" = "kitty --class='rmpc' rmpc ";
+ "on-scroll-up" = "mpc --quiet prev";
+ "on-scroll-down" = "mpc --quiet next";
+ "smooth-scrolling-threshold" = 5;
+ "tooltip-format" = "{title} - {artist} ({elapsedTime:%M:%S}/{totalTime:%H:%M:%S})";
+ };
+ "network" = {
+ "format-disconnected" = "";
+ "format-ethernet" = "";
+ "format-linked" = " {essid} (No IP)";
+ "format-wifi" = " {essid}";
+ "interval" = 1;
+ "tooltip" = false;
+ };
+ "custom/powermenu" = {
+ "format" = "";
+ "on-click" = "pkill rofi || ~/.config/rofi/powermenu/type-3/powermenu.sh";
+ "tooltip" = false;
+ };
+ "tray" = {
+ "icon-size" = 15;
+ "spacing" = 5;
};
- };
- "cpu" = {
- "interval" = 1;
- "format" = " {usage}%";
- };
- "mpd" = {
- "max-length" = 25;
- "format" = " {title}";
- "format-paused" = " {title}";
- "format-stopped" = "";
- "format-disconnected" = "";
- "on-click" = "mpc --quiet toggle";
- "on-click-right" = "mpc update; mpc ls | mpc add";
- "on-click-middle" = "kitty --class='ncmpcpp' ncmpcpp ";
- "on-scroll-up" = "mpc --quiet prev";
- "on-scroll-down" = "mpc --quiet next";
- "smooth-scrolling-threshold" = 5;
- "tooltip-format" = "{title} - {artist} ({elapsedTime:%M:%S}/{totalTime:%H:%M:%S})";
- };
- "network" = {
- "format-disconnected" = " Disconnected";
- "format-ethernet" = " Connected!";
- "format-linked" = " {essid} (No IP)";
- "format-wifi" = " {essid}";
- "interval" = 1;
- "tooltip" = false;
- };
- "custom/powermenu" = {
- "format" = "";
- "on-click" = "pkill rofi || ~/.config/rofi/powermenu/type-3/powermenu.sh";
- "tooltip" = false;
- };
- "tray" = {
- "icon-size" = 15;
- "spacing" = 5;
- };
}];
-
};
programs.hyprlock = {
diff --git a/home/waybar.css b/home/waybar.css
new file mode 100644
index 0000000..49b687d
--- /dev/null
+++ b/home/waybar.css
@@ -0,0 +1,123 @@
+* {
+ font-family: "JetBrainsMono Nerd Font";
+ font-size: 12pt;
+ font-weight: bold;
+ border-radius: 8px;
+ transition-property: background-color;
+ transition-duration: 0.5s;
+}
+@keyframes blink_red {
+ to {
+ background-color: rgb(242, 143, 173);
+ color: rgb(26, 24, 38);
+ }
+}
+.warning, .critical, .urgent {
+ animation-name: blink_red;
+ animation-duration: 1s;
+ animation-timing-function: linear;
+ animation-iteration-count: infinite;
+ animation-direction: alternate;
+}
+window#waybar {
+ background-color: transparent;
+}
+window > box {
+ margin-left: 5px;
+ margin-right: 5px;
+ margin-top: 5px;
+ background-color: #1e1e2a;
+ padding: 3px;
+ padding-left:8px;
+ border: 2px none #33ccff;
+}
+#workspaces {
+ padding-left: 0px;
+ padding-right: 4px;
+}
+#workspaces button {
+ padding-top: 5px;
+ padding-bottom: 5px;
+ padding-left: 6px;
+ padding-right: 6px;
+}
+#workspaces button.active {
+ background-color: rgb(181, 232, 224);
+ color: rgb(26, 24, 38);
+}
+#workspaces button.urgent {
+ color: rgb(26, 24, 38);
+}
+#workspaces button:hover {
+ background-color: rgb(248, 189, 150);
+ color: rgb(26, 24, 38);
+}
+tooltip {
+ background: rgb(48, 45, 65);
+}
+tooltip label {
+ color: rgb(217, 224, 238);
+}
+#custom-launcher {
+ font-size: 20px;
+ padding-left: 8px;
+ padding-right: 6px;
+ color: #7ebae4;
+}
+#mode, #clock, #memory, #temperature,#cpu,#mpd, #custom-wall, #temperature, #backlight, #pulseaudio, #network, #battery, #custom-powermenu, #custom-cava-internal {
+ padding-left: 10px;
+ padding-right: 10px;
+}
+/* #mode { */
+/* margin-left: 10px; */
+/* background-color: rgb(248, 189, 150); */
+/* color: rgb(26, 24, 38); */
+/* } */
+#memory {
+ color: rgb(181, 232, 224);
+}
+#cpu {
+ color: rgb(245, 194, 231);
+}
+#clock {
+ color: rgb(217, 224, 238);
+}
+/* #idle_inhibitor {
+color: rgb(221, 182, 242);
+}*/
+#custom-wall {
+ color: #33ccff;
+}
+#temperature {
+ color: rgb(150, 205, 251);
+}
+#backlight {
+ color: rgb(248, 189, 150);
+}
+#pulseaudio {
+ color: rgb(245, 224, 220);
+}
+#network {
+ color: #ABE9B3;
+}
+#network.disconnected {
+ color: rgb(255, 255, 255);
+}
+#custom-powermenu {
+ color: rgb(242, 143, 173);
+ padding-right: 8px;
+}
+#tray {
+ padding-right: 8px;
+ padding-left: 10px;
+}
+#mpd.paused {
+ color: #414868;
+ font-style: italic;
+}
+#mpd.stopped {
+ background: transparent;
+}
+#mpd {
+ color: #c0caf5;
+}
diff --git a/nixos/base.nix b/nixos/base.nix
index c04e2f0..a74d1b1 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -47,7 +47,7 @@
LC_NUMERIC = "en_US.UTF-8";
LC_PAPER = "en_US.UTF-8";
LC_TELEPHONE = "en_US.UTF-8";
- LC_TIME = "C.UTF-8";
+ LC_TIME = "en_GB.UTF-8";
};
# Configure keymap