diff --git a/.github/assets/screenshots/1.old.png b/.github/assets/screenshots/1.old.png
deleted file mode 100644
index 959b430..0000000
Binary files a/.github/assets/screenshots/1.old.png and /dev/null differ
diff --git a/.github/assets/screenshots/1.png b/.github/assets/screenshots/1.png
deleted file mode 100644
index f351474..0000000
Binary files a/.github/assets/screenshots/1.png and /dev/null differ
diff --git a/.github/assets/screenshots/2.old.png b/.github/assets/screenshots/2.old.png
deleted file mode 100644
index 85b2220..0000000
Binary files a/.github/assets/screenshots/2.old.png and /dev/null differ
diff --git a/.github/assets/screenshots/2.png b/.github/assets/screenshots/2.png
deleted file mode 100644
index bb85b1a..0000000
Binary files a/.github/assets/screenshots/2.png and /dev/null differ
diff --git a/.github/assets/screenshots/3.old.png b/.github/assets/screenshots/3.old.png
deleted file mode 100644
index 6d04830..0000000
Binary files a/.github/assets/screenshots/3.old.png and /dev/null differ
diff --git a/.github/assets/screenshots/3.png b/.github/assets/screenshots/3.png
deleted file mode 100644
index ed3fa03..0000000
Binary files a/.github/assets/screenshots/3.png and /dev/null differ
diff --git a/.github/assets/screenshots/sakura-desktop.png b/.github/assets/screenshots/sakura-desktop.png
new file mode 100644
index 0000000..fed81f4
Binary files /dev/null and b/.github/assets/screenshots/sakura-desktop.png differ
diff --git a/README.md b/README.md
index e702747..a52de66 100644
--- a/README.md
+++ b/README.md
@@ -26,14 +26,12 @@
-
+ 
+ Screenshots last updated 2024-09-04
+
# Overview
@@ -217,6 +215,7 @@ Other dotfiles that I learned / copy from:
- [Frost-Phoenix/nixos-config](https://github.com/Frost-Phoenix/nixos-config): This is the repository that I cloned and changed to my needs. Their credits are in their repository's readme.
- [notthebee/nix-config](https://github.com/notthebee/nix-config)
+- [Ruixi-rebirth/melted-flakes](https://github.com/Ruixi-rebirth/melted-flakes): Waybar configuration mostly
[Hyprland]: https://github.com/hyprwm/Hyprland
diff --git a/flake.lock b/flake.lock
index 390a11b..f8e9d96 100644
--- a/flake.lock
+++ b/flake.lock
@@ -41,11 +41,11 @@
]
},
"locked": {
- "lastModified": 1724006173,
- "narHash": "sha256-1ROh0buuxiMyc6eIb3CIbJsmYO7PhLqSYs55mOx1XTk=",
+ "lastModified": 1724850097,
+ "narHash": "sha256-3BHxvFb3NJzch1X8puRMkVZujOoarQ1llu3ZcwuvsKU=",
"owner": "hyprwm",
"repo": "aquamarine",
- "rev": "7f8df01d4297b9068a9592400f16044602844f86",
+ "rev": "23c7925dd31e79e8c06086ace3edb129a070ac01",
"type": "github"
},
"original": {
@@ -56,11 +56,11 @@
},
"catppuccin": {
"locked": {
- "lastModified": 1724156255,
- "narHash": "sha256-rpUCeS/QZwQdJmDrvCm0hRi8bFvQNQKAnIMK5ZDBfpM=",
+ "lastModified": 1724469296,
+ "narHash": "sha256-p3R4LUNk6gC+fTKRUm9ByXaoRIocnQMwVuJSIxECQ8o=",
"owner": "catppuccin",
"repo": "nix",
- "rev": "8886a68edadb1d93c7101337f995ffce4b410ff2",
+ "rev": "874e668ddaf3687e8d38ccd0188a641ffefe1cfb",
"type": "github"
},
"original": {
@@ -299,11 +299,11 @@
]
},
"locked": {
- "lastModified": 1723986931,
- "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
+ "lastModified": 1724435763,
+ "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
+ "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
"type": "github"
},
"original": {
@@ -395,11 +395,11 @@
"xdph": "xdph"
},
"locked": {
- "lastModified": 1724085862,
- "narHash": "sha256-qIPLv+MmTVZ0sjhx99EZhe/2aGzy5JOskmlqPd6DNFQ=",
+ "lastModified": 1724967012,
+ "narHash": "sha256-Zn5Eq6Elq0SRInPrEYGGoo972JzVxd5zExF7FSuTKlo=",
"ref": "refs/heads/main",
- "rev": "c86db7bbb0cf14d4955ee3a4d13c0ed9f8a0e0ae",
- "revCount": 5115,
+ "rev": "604eb21a7e55d85ec7f6cb8cba39fc4c20a07a9d",
+ "revCount": 5157,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@@ -453,11 +453,11 @@
]
},
"locked": {
- "lastModified": 1721324361,
- "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=",
+ "lastModified": 1724174162,
+ "narHash": "sha256-fOOBLwil6M9QWMCiSULwjMQzrXhHXUnEqmjHX5ZHeVI=",
"owner": "hyprwm",
"repo": "hyprlang",
- "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086",
+ "rev": "16e5c9465f04477d8a3dd48a0a26bf437986336c",
"type": "github"
},
"original": {
@@ -473,11 +473,11 @@
"systems": "systems_2"
},
"locked": {
- "lastModified": 1722957040,
- "narHash": "sha256-YSrWqhsc/lH2gnFpejCMTC6Bo0zdgYZJmq561SbJ/II=",
+ "lastModified": 1724326010,
+ "narHash": "sha256-84Zzoi6bWAnDKDxoqiv3DCIjQmP1Y8vynP6//Wtnpc4=",
"owner": "hyprwm",
"repo": "hyprpicker",
- "rev": "cbd963e1032552a7b195301de616c521c7d9f848",
+ "rev": "38fe668e58014c75cf28f7cb5fc136aa710e7039",
"type": "github"
},
"original": {
@@ -498,11 +498,11 @@
]
},
"locked": {
- "lastModified": 1722869141,
- "narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=",
+ "lastModified": 1724863980,
+ "narHash": "sha256-7Ke9wFRYPUIXwm5ZndGHkWBKj6BsFTkSEXUNXQRHE54=",
"owner": "hyprwm",
"repo": "hyprutils",
- "rev": "0252fd13e78e60fb0da512a212e56007515a49f7",
+ "rev": "aadf9a27dddd2272ca354ba5a22a0c2d1f919039",
"type": "github"
},
"original": {
@@ -590,11 +590,11 @@
"umu": "umu"
},
"locked": {
- "lastModified": 1723945279,
- "narHash": "sha256-3W+/u3v/e0dTOxht6wW6pL+kr44e8Amb8A1Z3Bx8BUE=",
+ "lastModified": 1724549799,
+ "narHash": "sha256-F4lN1qmMJpJALwZ2ENb6MDSXG40om7ktZyAt7yh/DS8=",
"owner": "fufexan",
"repo": "nix-gaming",
- "rev": "bcf8116981cc332c2734d4c82a034f115780853d",
+ "rev": "963803d3be8ed721b21326804513dec884e9d494",
"type": "github"
},
"original": {
@@ -677,11 +677,11 @@
},
"nixpkgs_4": {
"locked": {
- "lastModified": 1723856861,
- "narHash": "sha256-OTDg91+Zzs2SpU3csK4xVdSQFoG8cK1lNUwKmTqERyE=",
+ "lastModified": 1724395761,
+ "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "cd7b95ee3725af7113bacbce91dd6549cee58ca5",
+ "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c",
"type": "github"
},
"original": {
@@ -693,11 +693,11 @@
},
"nixpkgs_5": {
"locked": {
- "lastModified": 1723991338,
- "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=",
+ "lastModified": 1724819573,
+ "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "8a3354191c0d7144db9756a74755672387b702ba",
+ "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
"type": "github"
},
"original": {
@@ -786,11 +786,11 @@
},
"nur": {
"locked": {
- "lastModified": 1724159175,
- "narHash": "sha256-3z9wRL+h+gTVFtecCUGrRaW6nvPPAtBCIDE9KAmZj7c=",
+ "lastModified": 1725014731,
+ "narHash": "sha256-4Y3FY4JzZsKQ0FKfdoWCt2BJFWDrnCk+Fi3+oo2kb0M=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "0b86d5643d99e3982471f0d79e553871c6f35396",
+ "rev": "8a0c673833f8c455f54b1c4596fb19715c8d1101",
"type": "github"
},
"original": {
@@ -907,11 +907,11 @@
},
"locked": {
"dir": "packaging/nix",
- "lastModified": 1723697867,
- "narHash": "sha256-LTfbJXR8x35oZ8Mo3R0WTVEp9toWpVfzD21xCSr64IM=",
+ "lastModified": 1724179424,
+ "narHash": "sha256-2r2y1p9YQuaWCxuFj45MVRqJ/uWglhzY5O9BW1jRXcg=",
"ref": "refs/heads/main",
- "rev": "c71a45ad53036f4c668bcbe1be7a49f9d3460151",
- "revCount": 699,
+ "rev": "dd3105e4ceef83bdc9d7437139f9475325e2a66d",
+ "revCount": 700,
"submodules": true,
"type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
@@ -940,11 +940,11 @@
]
},
"locked": {
- "lastModified": 1722365976,
- "narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=",
+ "lastModified": 1724073926,
+ "narHash": "sha256-nWlUL43jOFHf+KW6Hqrx+W/r1XdXuDyb0wC/SrHsOu4=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
- "rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341",
+ "rev": "a08ecbbf33598924e93542f737fc6169a26b481e",
"type": "github"
},
"original": {
diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix
index b31e3c8..14bbaed 100644
--- a/modules/home/hyprland/config.nix
+++ b/modules/home/hyprland/config.nix
@@ -36,8 +36,8 @@
general = {
"$mainMod" = "ALT";
layout = "dwindle";
- gaps_in = 0;
- gaps_out = 0;
+ gaps_in = 5;
+ gaps_out = 10;
border_size = 2;
"col.active_border" = "rgb(cba6f7) rgb(94e2d5) 45deg";
"col.inactive_border" = "0x00000000";
@@ -56,7 +56,7 @@
};
dwindle = {
- no_gaps_when_only = true;
+ no_gaps_when_only = false; # Is ugly with current Waybar setup
force_split = 0;
special_scale_factor = 1.0;
split_width_multiplier = 1.0;
diff --git a/modules/home/kitty.nix b/modules/home/kitty.nix
index 00937cc..8b253a3 100644
--- a/modules/home/kitty.nix
+++ b/modules/home/kitty.nix
@@ -3,7 +3,7 @@
programs.kitty = {
enable = true;
- theme = "Catppuccin-Mocha";
+ theme = "Atelier Cave Dark";
font = {
name = "JetBrainsMono Nerd Font";
@@ -23,7 +23,7 @@
active_tab_font_style = "normal";
inactive_tab_font_style = "normal";
tab_bar_style = "powerline";
- tab_powerline_style = "round";
+ tab_powerline_style = "slanted";
active_tab_foreground = "#1e1e2e";
active_tab_background = "#cba6f7";
inactive_tab_foreground = "#bac2de";
diff --git a/modules/home/packages.nix b/modules/home/packages.nix
index f40c151..4c64f9f 100644
--- a/modules/home/packages.nix
+++ b/modules/home/packages.nix
@@ -1,6 +1,8 @@
{ inputs, pkgs, ... }:
{
home.packages = with pkgs; [
+ anki-bin # Learn languages
+ vimv # Bulk rename
audacity # Record audio stuff
obs-studio # Record video stuff
exiftool # Read exif data from CLI
diff --git a/modules/home/packages.violet.nix b/modules/home/packages.violet.nix
index 29ba916..6516855 100644
--- a/modules/home/packages.violet.nix
+++ b/modules/home/packages.violet.nix
@@ -1,6 +1,7 @@
{ inputs, pkgs, ... }:
{
home.packages = with pkgs; [
+ vimv
jq
wireguard-tools # VPN connections
openresolv # required for wireguard-tools
diff --git a/modules/home/waybar/default.nix b/modules/home/waybar/default.nix
index 9b8b240..9372046 100644
--- a/modules/home/waybar/default.nix
+++ b/modules/home/waybar/default.nix
@@ -1,6 +1,808 @@
-{ ... }:
+{ config, lib, pkgs, user, ... }:
+
{
- imports = [ (import ./waybar.nix) ]
- ++ [ (import ./settings.nix) ]
- ++ [ (import ./style.nix) ];
+ programs.waybar = {
+ enable = true;
+ package = pkgs.waybar.overrideAttrs (oa: {
+ mesonFlags = (oa.mesonFlags or [ ]) ++ [ "-Dexperimental=true" ];
+ });
+ systemd = {
+ enable = false;
+ target = "graphical-session.target";
+ };
+ style = ''
+ * {
+ font-family: "JetBrainsMono Nerd Font";
+ font-size: 12pt;
+ font-weight: bold;
+ border-radius: 0px;
+ 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: rgb(30, 30, 46);
+ }
+ #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);
+ }
+ #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: rgb(221, 182, 242);
+ }
+ #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);
+ }
+ #battery.charging, #battery.full, #battery.discharging {
+ color: rgb(250, 227, 176);
+ }
+ #battery.critical:not(.charging) {
+ color: rgb(242, 143, 173);
+ }
+ #custom-powermenu {
+ color: rgb(242, 143, 173);
+ }
+ #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" ;
+ }
+ '';
+ settings = [{
+ "layer" = "top";
+ "position" = "top";
+ modules-left = [
+ "hyprland/workspaces"
+ "temperature"
+ #"idle_inhibitor"
+ "mpd"
+ "custom/cava-internal"
+ ];
+ modules-center = [
+ "clock"
+ ];
+ modules-right = [
+ "pulseaudio"
+ "backlight"
+ "memory"
+ "cpu"
+ "network"
+ "battery"
+ "custom/powermenu"
+ "tray"
+ ];
+ "custom/cava-internal" = {
+ "exec" = "sleep 1s && cava-internal";
+ "tooltip" = false;
+ };
+ "hyprland/workspaces" = {
+ "format" = "{icon}";
+ "on-click" = "activate";
+ # "on-scroll-up" = "hyprctl dispatch workspace e+1";
+ # "on-scroll-down" = "hyprctl dispatch workspace e-1";
+ };
+ "idle_inhibitor" = {
+ "format" = "{icon}";
+ "format-icons" = {
+ "activated" = "";
+ "deactivated" = "";
+ };
+ "tooltip" = false;
+ };
+ "backlight" = {
+ "device" = "intel_backlight";
+ "on-scroll-up" = "light -A 5";
+ "on-scroll-down" = "light -U 5";
+ "format" = "{icon} {percent}%";
+ "format-icons" = [ "" "" "" "" ];
+ };
+ "pulseaudio" = {
+ "scroll-step" = 1;
+ "format" = "{icon} {volume}%";
+ "format-muted" = " Muted";
+ "format-icons" = {
+ "default" = [ "" "" "" ];
+ };
+ "on-click" = "pamixer -t";
+ "tooltip" = false;
+ };
+ "battery" = {
+ "interval" = 10;
+ "states" = {
+ "warning" = 20;
+ "critical" = 10;
+ };
+ "format" = "{icon} {capacity}%";
+ "format-icons" = [ "" "" "" "" "" "" "" "" "" "" ];
+ "format-full" = "{icon} {capacity}%";
+ "format-charging" = " {capacity}%";
+ "tooltip" = false;
+ };
+ "clock" = {
+ "interval" = 1;
+ "format" = "{:%I:%M %p %A %b %d}";
+ "tooltip" = true;
+ /* "tooltip-format"= "{=%A; %d %B %Y}\n{calendar}" */
+ "tooltip-format" = "上午：高数\n下午：Ps\n晚上：Golang\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='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" = " {ifname} ({ipaddr})";
+ "format-linked" = " {essid} (No IP)";
+ "format-wifi" = " {essid}";
+ "interval" = 1;
+ "tooltip" = false;
+ };
+ "temperature" = {
+ # "hwmon-path"= "${env:HWMON_PATH}";
+ #"critical-threshold"= 80;
+ "tooltip" = false;
+ "format" = " {temperatureC}°C";
+ };
+ "custom/powermenu" = {
+ "format" = "";
+ "on-click" = "pkill rofi || ~/.config/rofi/powermenu.sh";
+ "tooltip" = false;
+ };
+ "tray" = {
+ "icon-size" = 15;
+ "spacing" = 5;
+ };
+ }];
+ };
+ #other config & style
+ home.file = {
+ ".config/waybar/light_config".text = ''
+ [
+ {
+ "backlight": {
+ "device": "intel_backlight",
+ "format": "{icon} {percent}%",
+ "format-icons": [
+ "", "", "", ""
+ ],
+ "on-scroll-down": "light -U 5",
+ "on-scroll-up": "light -A 5"
+ },
+ "battery": {
+ "format": "{icon} {capacity}%",
+ "format-charging": " {capacity}%",
+ "format-full": "{icon} {capacity}%",
+ "format-icons": [
+ "", "", "", "", "", "", "", "", "", ""
+ ],
+ "interval": 10,
+ "states": {
+ "critical": 10,
+ "warning": 20
+ },
+ "tooltip": false
+ },
+ "clock": {
+ "format": "{:%I:%M %p %A %b %d}",
+ "interval": 1,
+ "tooltip": true,
+ "tooltip-format": "上午：高数\n下午：Ps\n晚上：Golang\n{calendar}"
+ },
+ "cpu": {
+ "format": " {usage}%",
+ "interval": 1
+ },
+ "custom/cava-internal": {
+ "exec": "sleep 1s && cava-internal",
+ "tooltip": false
+ },
+ "custom/powermenu": {
+ "format": "",
+ "on-click": "pkill rofi || ~/.config/rofi/powermenu.sh",
+ "tooltip": false
+ },
+ "idle_inhibitor": {
+ "format": "{icon}",
+ "format-icons": {
+ "activated": "",
+ "deactivated": ""
+ },
+ "tooltip": false
+ },
+ "layer": "top",
+ "memory": {
+ "format": " {percentage}%",
+ "interval": 1,
+ "states": {
+ "warning": 85
+ }
+ },
+ "modules-center": [
+ "clock"
+ ],
+ "modules-left": [
+ "hyprland/workspaces",
+ "temperature",
+ //"idle_inhibitor",
+ "mpd",
+ "custom/cava-internal"
+ ],
+ "modules-right": [
+ "pulseaudio",
+ "backlight",
+ "memory",
+ "cpu",
+ "network",
+ "battery",
+ "custom/powermenu",
+ "tray"
+ ],
+ "mpd": {
+ "format": " {title}",
+ "format-disconnected": "",
+ "format-paused": " {title}",
+ "format-stopped": "",
+ "max-length": 25,
+ "on-click": "mpc --quiet toggle",
+ "on-click-middle": "kitty --class='ncmpcpp' ncmpcpp ",
+ "on-click-right": "mpc update; mpc ls | mpc add",
+ "on-scroll-down": "mpc --quiet next",
+ "on-scroll-up": "mpc --quiet prev",
+ "smooth-scrolling-threshold": 5,
+ "tooltip-format": "{title} - {artist} ({elapsedTime:%M:%S}/{totalTime:%H:%M:%S})"
+ },
+ "network": {
+ "interval": 1,
+ "format-wifi": " {essid}",
+ "format-ethernet": " {ifname} ({ipaddr})",
+ "format-linked": " {essid} (No IP)",
+ "format-disconnected": " Disconnected",
+ "tooltip": false,
+ },
+ "position": "top",
+ "pulseaudio": {
+ "format": "{icon} {volume}%",
+ "format-icons": {
+ "default": [
+ "",
+ "",
+ ""
+ ]
+ },
+ "format-muted": " Muted",
+ "on-click": "pamixer -t",
+ "scroll-step": 1,
+ "tooltip": false
+ },
+ "temperature": {
+ "format": " {temperatureC}°C",
+ "tooltip": false
+ },
+ "tray": {
+ "icon-size": 15,
+ "spacing": 5
+ },
+ "hyprland/workspaces": {
+ "format": "{icon}",
+ "on-click": "activate",
+ "active-only": false,
+ }
+ }
+ ]
+ '';
+ ".config/waybar/light_style.css".text = ''
+ * {
+ font-family: "JetBrainsMono Nerd Font";
+ font-size: 12pt;
+ font-weight: bold;
+ border-radius: 0px;
+ 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: rgb(250, 244, 252);
+ }
+ #workspaces {
+ padding-left: 0px;
+ padding-right: 4px;
+ }
+ #workspaces button {
+ padding-top: 5px;
+ padding-bottom: 5px;
+ padding-left: 6px;
+ padding-right: 6px;
+ color:#99CCFF;
+ }
+ #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: #CCCCFF;
+ color: rgb(26, 24, 38);
+ }
+ tooltip {
+ /* background: rgb(250, 244, 252); */
+ background: rgb(250, 244, 252);
+ }
+ tooltip label {
+ color: rgb(65, 72, 104);
+ }
+ #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: #66CCFF;
+ }
+ #cpu {
+ color: #FF99FF;
+ }
+ #clock {
+ color: rgb(65, 72, 104);
+ }
+ /*
+ #idle_inhibitor {
+ color: #FF6699;
+ }*/
+ #custom-wall {
+ color: #FF6699;
+ }
+ #temperature {
+ color: #9933FF;
+ }
+ #backlight {
+ color: #6666FF;
+ }
+ #pulseaudio {
+ color: #FF9900;
+ }
+ #network {
+ color: #00CC66;
+ }
+
+ #network.disconnected {
+ color: #99CCCC;
+ }
+ #battery.charging, #battery.full, #battery.discharging {
+ color: #FF99CC;
+ }
+ #battery.critical:not(.charging) {
+ color: rgb(242, 143, 173);
+ }
+ #custom-powermenu {
+ color: #FF0066;
+ }
+ #tray {
+ padding-right: 8px;
+ padding-left: 10px;
+ }
+ #tray menu {
+ background: rgb(250, 244, 252);
+ color:rgb(192, 202, 245);
+ }
+ #mpd.paused {
+ color: rgb(192, 202, 245);
+ font-style: italic;
+ }
+ #mpd.stopped {
+ background: transparent;
+ }
+ #mpd {
+ color: rgb(65, 72, 104);
+
+ /* color: #c0caf5; */
+ }
+ #custom-cava-internal{
+ font-family: "Hack Nerd Font" ;
+ }
+ '';
+ };
+ home.file = {
+ ".config/waybar/nord_config".text = ''
+ [
+ {
+ "backlight": {
+ "device": "intel_backlight",
+ "format": "{icon} {percent}%",
+ "format-icons": [
+ "", "", "", ""
+ ],
+ "on-scroll-down": "light -U 5",
+ "on-scroll-up": "light -A 5"
+ },
+ "battery": {
+ "format": "{icon} {capacity}%",
+ "format-charging": " {capacity}%",
+ "format-full": "{icon} {capacity}%",
+ "format-icons": [
+ "", "", "", "", "", "", "", "", "", ""
+ ],
+ "interval": 10,
+ "states": {
+ "critical": 10,
+ "warning": 20
+ },
+ "tooltip": false
+ },
+ "clock": {
+ "format": "{:%I:%M %p %A %b %d}",
+ "interval": 1,
+ "tooltip": true,
+ "tooltip-format": "上午：高数\n下午：Ps\n晚上：Golang\n{calendar}"
+ },
+ "cpu": {
+ "format": " {usage}%",
+ "interval": 1
+ },
+ "custom/cava-internal": {
+ "exec": "sleep 1s && cava-internal",
+ "tooltip": false
+ },
+ "custom/powermenu": {
+ "format": "",
+ "on-click": "pkill rofi || ~/.config/rofi/powermenu.sh",
+ "tooltip": false
+ },
+ "idle_inhibitor": {
+ "format": "{icon}",
+ "format-icons": {
+ "activated": "",
+ "deactivated": ""
+ },
+ "tooltip": false
+ },
+ "layer": "top",
+ "memory": {
+ "format": " {percentage}%",
+ "interval": 1,
+ "states": {
+ "warning": 85
+ }
+ },
+ "modules-center": [
+ "clock"
+ ],
+ "modules-left": [
+ "hyprland/workspaces",
+ "temperature",
+ //"idle_inhibitor",
+ "mpd",
+ "custom/cava-internal"
+ ],
+ "modules-right": [
+ "pulseaudio",
+ "backlight",
+ "memory",
+ "cpu",
+ "network",
+ "battery",
+ "custom/powermenu",
+ "tray"
+ ],
+ "mpd": {
+ "format": " {title}",
+ "format-disconnected": "",
+ "format-paused": " {title}",
+ "format-stopped": "",
+ "max-length": 25,
+ "on-click": "mpc --quiet toggle",
+ "on-click-middle": "kitty --class='ncmpcpp' ncmpcpp ",
+ "on-click-right": "mpc update; mpc ls | mpc add",
+ "on-scroll-down": "mpc --quiet next",
+ "on-scroll-up": "mpc --quiet prev",
+ "smooth-scrolling-threshold": 5,
+ "tooltip-format": "{title} - {artist} ({elapsedTime:%M:%S}/{totalTime:%H:%M:%S})"
+ },
+ "network": {
+ "format-disconnected": " Disconnected",
+ "format-ethernet": " {ifname} ({ipaddr})",
+ "format-linked": " {essid} (No IP)",
+ "format-wifi": " {essid}",
+ "interval": 1,
+ "tooltip": false
+ },
+ "position": "top",
+ "pulseaudio": {
+ "format": "{icon} {volume}%",
+ "format-icons": {
+ "default": [
+ "",
+ "",
+ ""
+ ]
+ },
+ "format-muted": " Muted",
+ "on-click": "pamixer -t",
+ "scroll-step": 1,
+ "tooltip": false
+ },
+ "temperature": {
+ "format": " {temperatureC}°C",
+ "tooltip": false
+ },
+ "tray": {
+ "icon-size": 15,
+ "spacing": 5
+ },
+ "hyprland/workspaces": {
+ "format": "{icon}",
+ "on-click": "activate",
+ "active-only": false,
+ }
+ }
+ ]
+
+ '';
+ ".config/waybar/nord_style.css".text = ''
+ * {
+ font-family: "JetBrainsMono Nerd Font";
+ font-size: 12pt;
+ font-weight: bold;
+ border-radius: 0px;
+ 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: #3b4252;
+ }
+ #workspaces {
+ padding-left: 0px;
+ padding-right: 4px;
+ }
+ #workspaces button {
+ padding-top: 5px;
+ padding-bottom: 5px;
+ padding-left: 6px;
+ padding-right: 6px;
+ color:#D8DEE9;
+ }
+ #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: #B38DAC;
+ color: rgb(26, 24, 38);
+ }
+ tooltip {
+ /* background: rgb(250, 244, 252); */
+ background: #3b4253;
+ }
+ tooltip label {
+ color: #E4E8EF;
+ }
+ #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: #8EBBBA;
+ }
+ #cpu {
+ color: #B38DAC;
+ }
+ #clock {
+ color: #E4E8EF;
+ }
+ /*
+ #idle_inhibitor {
+ color: #FF6699;
+ }*/
+ #custom-wall {
+ color: #B38DAC;
+ }
+ #temperature {
+ color: #80A0C0;
+ }
+ #backlight {
+ color: #A2BD8B;
+ }
+ #pulseaudio {
+ color: #E9C98A;
+ }
+ #network {
+ color: #99CC99;
+ }
+
+ #network.disconnected {
+ color: #CCCCCC;
+ }
+ #battery.charging, #battery.full, #battery.discharging {
+ color: #CF876F;
+ }
+ #battery.critical:not(.charging) {
+ color: #D6DCE7;
+ }
+ #custom-powermenu {
+ color: #BD6069;
+ }
+ #tray {
+ padding-right: 8px;
+ padding-left: 10px;
+ }
+ #tray menu {
+ background: #3b4252;
+ color: #DEE2EA;
+ }
+ #mpd.paused {
+ color: rgb(192, 202, 245);
+ font-style: italic;
+ }
+ #mpd.stopped {
+ background: transparent;
+ }
+ #mpd {
+ color: #E4E8EF;
+
+ /* color: #c0caf5; */
+ }
+ #custom-cava-internal{
+ font-family: "Hack Nerd Font" ;
+ }
+ '';
+ };
}
+
diff --git a/modules/home/waybar/old/default.nix b/modules/home/waybar/old/default.nix
new file mode 100644
index 0000000..9b8b240
--- /dev/null
+++ b/modules/home/waybar/old/default.nix
@@ -0,0 +1,6 @@
+{ ... }:
+{
+ imports = [ (import ./waybar.nix) ]
+ ++ [ (import ./settings.nix) ]
+ ++ [ (import ./style.nix) ];
+}
diff --git a/modules/home/waybar/settings.nix b/modules/home/waybar/old/settings.nix
similarity index 100%
rename from modules/home/waybar/settings.nix
rename to modules/home/waybar/old/settings.nix
diff --git a/modules/home/waybar/style.nix b/modules/home/waybar/old/style.nix
similarity index 100%
rename from modules/home/waybar/style.nix
rename to modules/home/waybar/old/style.nix
diff --git a/modules/home/waybar/waybar.nix b/modules/home/waybar/old/waybar.nix
similarity index 100%
rename from modules/home/waybar/waybar.nix
rename to modules/home/waybar/old/waybar.nix