diff --git a/flake.lock b/flake.lock
index 2d7f9ff..e16982c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
]
},
"locked": {
- "lastModified": 1725199881,
- "narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=",
+ "lastModified": 1725753098,
+ "narHash": "sha256-/NO/h/qD/eJXAQr/fHA4mdDgYsNT9thHQ+oT6KPi2ac=",
"owner": "hyprwm",
"repo": "aquamarine",
- "rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b",
+ "rev": "e4a13203112a036fc7f437d391c7810f3dd5ab52",
"type": "github"
},
"original": {
@@ -41,11 +41,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
- "lastModified": 1726036322,
- "narHash": "sha256-9Hwl4lzB5yFah00OaXSMDPDubCy99wtLgsYxMVpMwlM=",
+ "lastModified": 1726357397,
+ "narHash": "sha256-W68/drb51fBhOl/BMOoRlI+7qxeoNWGmCZwAyuXVlQY=",
"owner": "nix-community",
"repo": "fenix",
- "rev": "3e50a3c915882f07cb3f6c246f09febc4ad36c3e",
+ "rev": "8f14b37d4ad9eafd33315ba67faded5c1e1a1044",
"type": "github"
},
"original": {
@@ -71,22 +71,6 @@
}
},
"flake-compat_2": {
- "flake": false,
- "locked": {
- "lastModified": 1696426674,
- "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
- "flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1696426674,
@@ -103,7 +87,7 @@
"type": "github"
}
},
- "flake-compat_4": {
+ "flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1650374568,
@@ -119,7 +103,7 @@
"type": "github"
}
},
- "flake-compat_5": {
+ "flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1650374568,
@@ -173,7 +157,7 @@
},
"flake-utils-plus": {
"inputs": {
- "flake-utils": "flake-utils_4"
+ "flake-utils": "flake-utils_3"
},
"locked": {
"lastModified": 1715533576,
@@ -192,7 +176,7 @@
},
"flake-utils-plus_2": {
"inputs": {
- "flake-utils": "flake-utils_5"
+ "flake-utils": "flake-utils_4"
},
"locked": {
"lastModified": 1715533576,
@@ -228,24 +212,6 @@
}
},
"flake-utils_3": {
- "inputs": {
- "systems": "systems_4"
- },
- "locked": {
- "lastModified": 1710146030,
- "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "flake-utils_4": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@@ -260,9 +226,9 @@
"type": "github"
}
},
- "flake-utils_5": {
+ "flake-utils_4": {
"inputs": {
- "systems": "systems_5"
+ "systems": "systems_4"
},
"locked": {
"lastModified": 1694529238,
@@ -320,11 +286,11 @@
]
},
"locked": {
- "lastModified": 1726036828,
- "narHash": "sha256-ZQHbpyti0jcAKnwQY1lwmooecLmSG6wX1JakQ/eZNeM=",
+ "lastModified": 1726357542,
+ "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "8a1671642826633586d12ac3158e463c7a50a112",
+ "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f",
"type": "github"
},
"original": {
@@ -395,11 +361,11 @@
"xdph": "xdph"
},
"locked": {
- "lastModified": 1725976150,
- "narHash": "sha256-Dv4XEWRcVFZhBDbj11/zuuXyf7TGHFVU1IGH9W/yPX8=",
+ "lastModified": 1726353438,
+ "narHash": "sha256-DLSpQXNt6LLkhREYrnhU+/XrfDNiSN41iD575ua9+yA=",
"ref": "refs/heads/main",
- "rev": "155d44016d0cb11332c454db73d59030cdbd7b13",
- "revCount": 5209,
+ "rev": "e74efd87e5aa38f9cf84cb3848ee1ab26e5e4bcb",
+ "revCount": 5221,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@@ -483,11 +449,11 @@
]
},
"locked": {
- "lastModified": 1725188252,
- "narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=",
+ "lastModified": 1725997860,
+ "narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=",
"owner": "hyprwm",
"repo": "hyprlang",
- "rev": "c12ab785ce1982f82594aff03b3104c598186ddd",
+ "rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876",
"type": "github"
},
"original": {
@@ -570,18 +536,16 @@
},
"nix-ld": {
"inputs": {
- "flake-compat": "flake-compat",
- "flake-utils": "flake-utils_2",
"nixpkgs": [
"unstable"
]
},
"locked": {
- "lastModified": 1721411691,
- "narHash": "sha256-fN0NjkYcQrdVSvWlSnvdu8XD34q8tl84SEz5BOJYROA=",
+ "lastModified": 1726227680,
+ "narHash": "sha256-pcqHXle7uHQTUESc40Yu0k05cFMRVpm3D8ZHPH6scOY=",
"owner": "Mic92",
"repo": "nix-ld",
- "rev": "7a990656e51465a18ba70f49c2cf9c8d0947b4c9",
+ "rev": "5ee22be69d8bd66da100157fab54d8dde37c775b",
"type": "github"
},
"original": {
@@ -607,8 +571,8 @@
},
"nixos-wsl": {
"inputs": {
- "flake-compat": "flake-compat_2",
- "flake-utils": "flake-utils_3",
+ "flake-compat": "flake-compat",
+ "flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
]
@@ -629,11 +593,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1725103162,
- "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
+ "lastModified": 1725983898,
+ "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
+ "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43",
"type": "github"
},
"original": {
@@ -689,11 +653,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1725634671,
- "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
+ "lastModified": 1726062873,
+ "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
+ "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
"type": "github"
},
"original": {
@@ -758,11 +722,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
- "lastModified": 1725985110,
- "narHash": "sha256-0HKj+JI6rtxaE6Kzcd6HyFNbEFJRsLy5DoNgVF1pyRM=",
+ "lastModified": 1726220668,
+ "narHash": "sha256-0Cb2bK2eyZ1njSX3593USMlcrj94VZprNN1/HllIfgw=",
"owner": "rust-lang",
"repo": "rust-analyzer",
- "rev": "bcc708992104c2059f310fbc3ac00bfc377f9ea8",
+ "rev": "4221354a8fe90ea8218d3757d14735eac08d3e81",
"type": "github"
},
"original": {
@@ -774,7 +738,7 @@
},
"snowfall-flake": {
"inputs": {
- "flake-compat": "flake-compat_3",
+ "flake-compat": "flake-compat_2",
"nixpkgs": [
"unstable"
],
@@ -796,7 +760,7 @@
},
"snowfall-lib": {
"inputs": {
- "flake-compat": "flake-compat_4",
+ "flake-compat": "flake-compat_3",
"flake-utils-plus": "flake-utils-plus",
"nixpkgs": [
"snowfall-flake",
@@ -820,7 +784,7 @@
},
"snowfall-lib_2": {
"inputs": {
- "flake-compat": "flake-compat_5",
+ "flake-compat": "flake-compat_4",
"flake-utils-plus": "flake-utils-plus_2",
"nixpkgs": [
"nixpkgs"
@@ -846,11 +810,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1725922448,
- "narHash": "sha256-ruvh8tlEflRPifs5tlpa0gkttzq4UtgXkJQS7FusgFE=",
+ "lastModified": 1726218807,
+ "narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "cede1a08039178ac12957733e97ab1006c6b6892",
+ "rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e",
"type": "github"
},
"original": {
@@ -919,28 +883,13 @@
"type": "github"
}
},
- "systems_5": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
"unstable": {
"locked": {
- "lastModified": 1725634671,
- "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
+ "lastModified": 1726062873,
+ "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
+ "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
"type": "github"
},
"original": {
@@ -967,11 +916,11 @@
]
},
"locked": {
- "lastModified": 1725228143,
- "narHash": "sha256-kbSiPA5oXiz1+1eVoRslMi5wylHD6SDT8dS9eZAxXAM=",
+ "lastModified": 1726046979,
+ "narHash": "sha256-6SEsjurq9cdTkITA6d49ncAJe4O/8CgRG5/F//s6Xh8=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
- "rev": "11e15b437e7efc39e452f36e15a183225d6bfa39",
+ "rev": "e695669fd8e1d1be9eaae40f35e00f8bd8b64c18",
"type": "github"
},
"original": {
diff --git a/modules/nixos/desktop/addons/waybar/config b/modules/nixos/desktop/addons/waybar/config
deleted file mode 100644
index e41ba2f..0000000
--- a/modules/nixos/desktop/addons/waybar/config
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "height": 24, // Waybar height (to be removed for auto height)
- "modules-left": ["hyprland/workspaces"],
- "modules-center": ["hyprland/window"],
- "modules-right": ["tray", "idle_inhibitor", "pulseaudio", "clock"],
- "hyprland/window": {
- "separate-outputs": true
- },
- "idle_inhibitor": {
- "format": "{icon}",
- "format-icons": {
- "activated": "",
- "deactivated": ""
- }
- },
- "tray": {
- // "icon-size": 21,
- "spacing": 10
- },
- "clock": {
- "timezone": "Europe/Berlin",
- "tooltip-format": "{:%Y %B}\n{calendar}",
- "format": "{:L%Y-%m-%d [%a] %H:%M}"
- },
- "pulseaudio": {
- "scroll-step": 5, // %, can be a float
- "format": "{icon} {volume}% {format_source}",
- "format-bluetooth": " {icon} {volume}% {format_source}",
- "format-bluetooth-muted": " {icon} {format_source}",
- "format-muted": "{format_source}",
- "format-source": " {volume}%",
- "format-source-muted": "",
- "format-icons": {
- "default": ["", "", ""]
- },
- "on-click": "pavucontrol",
- "on-click-right": "foot -a pw-top pw-top"
- },
-}
diff --git a/modules/nixos/desktop/addons/waybar/config.jsonc b/modules/nixos/desktop/addons/waybar/config.jsonc
new file mode 100644
index 0000000..e7b2469
--- /dev/null
+++ b/modules/nixos/desktop/addons/waybar/config.jsonc
@@ -0,0 +1,208 @@
+{
+ "layer":"top",
+ "position":"top",
+ "mod":"dock",
+ "margin-left":10,
+ "margin-right":10,
+ "margin-top":7,
+ "margin-bottom":0,
+ "exclusive":true,
+ "passthrough":false,
+ "gtk-layer-shell":true,
+ "reload_style_on_change":true,
+ "modules-left":[
+ "custom/smallspacer",
+ "hyprland/workspaces",
+ "custom/spacer"
+ ],
+ "modules-center":[
+ "custom/padd",
+ "custom/l_end",
+ "custom/r_end",
+ "hyprland/window",
+ "custom/padd"
+ ],
+ "modules-right":[
+ "custom/padd",
+ "custom/l_end",
+ "tray",
+ "custom/smallspacer",
+ "pulseaudio",
+ "pulseaudio/slider",
+ "memory",
+ "cpu",
+ "clock",
+ "custom/padd"
+ ],
+ "custom/smallspacer":{
+ "format":" "
+ },
+ "memory":{
+ "interval":1,
+ "rotate":270,
+ "format":"{icon}",
+ "format-icons":[
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ ""
+ ],
+ "max-length":10
+ },
+ "cpu":{
+ "interval":1,
+ "format":"{icon}",
+ "rotate":270,
+ "format-icons":[
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ ""
+ ]
+ },
+ "tray":{
+ "icon-size":15,
+ "rotate":0,
+ "spacing":3
+ },
+ "custom/menu":{
+ "format":" ",
+ "rotate":90
+ },
+ "hyprland/window":{
+ "format":"{initialTitle}",
+ "max-length":120,
+ "separate-outputs":true,
+ "icon":false,
+ "icon-size":13
+ },
+ "custom/spacer":{
+ "format":"|"
+ },
+ "hyprland/workspaces":{
+ "format":"{icon}",
+ "format-icons":{
+ "default":"○",
+ "active":"",
+ }
+ },
+ "wlr/workspaces":{
+ "persistent-workspaces":{
+ "1":[
+ "DP-2"
+ ],
+ "2":[
+ "HDMI-A-1"
+ ],
+ "3":[
+ "DP-2"
+ ],
+ "4":[
+ "HDMI-A-1"
+ ]
+ }
+ },
+ "idle_inhibitor":{
+ "format":"{icon}",
+ "rotate":0,
+ "format-icons":{
+ "activated":"",
+ "deactivated":""
+ }
+ },
+ "clock":{
+ "format":"{:%H:%M}",
+ "rotate":0,
+ "tooltip-format":"{calendar}",
+ "calendar":{
+ "mode":"month",
+ "mode-mon-col":3,
+ "on-scroll":1,
+ "on-click-right":"mode",
+ "format":{
+ "months":"{}",
+ "weekdays":"{}",
+ "today":"{}"
+ }
+ },
+ "actions":{
+ "on-click-right":"mode",
+ "on-click-forward":"tz_up",
+ "on-click-backward":"tz_down",
+ "on-scroll-up":"shift_up",
+ "on-scroll-down":"shift_down"
+ }
+ },
+ "pulseaudio":{
+ "format":" {icon}",
+ "rotate":0,
+ "format-muted":"婢",
+ "tooltip-format":"{icon} {desc} // {volume}%",
+ "scroll-step":5,
+ "format-icons":{
+ "headphone":"",
+ "hands-free":"",
+ "headset":"",
+ "phone":"",
+ "portable":"",
+ "car":"",
+ "default":[
+ "",
+ "",
+ ""
+ ]
+ }
+ },
+ "custom/l_end":{
+ "format":" ",
+ "interval":"once",
+ "tooltip":false
+ },
+ "custom/r_end":{
+ "format":" ",
+ "interval":"once",
+ "tooltip":false
+ },
+ "custom/sl_end":{
+ "format":" ",
+ "interval":"once",
+ "tooltip":false
+ },
+ "custom/sr_end":{
+ "format":" ",
+ "interval":"once",
+ "tooltip":false
+ },
+ "custom/rl_end":{
+ "format":" ",
+ "interval":"once",
+ "tooltip":false
+ },
+ "custom/rr_end":{
+ "format":" ",
+ "interval":"once",
+ "tooltip":false
+ },
+ "custom/padd":{
+ "format":" ",
+ "interval":"once",
+ "tooltip":false
+ },
+ "pulseaudio/slider":{
+ "min":5,
+ "max":100,
+ "rotate":0,
+ "device":"pulseaudio",
+ "scroll-step":1
+ }
+}
diff --git a/modules/nixos/desktop/addons/waybar/default.nix b/modules/nixos/desktop/addons/waybar/default.nix
index fe0204f..6a49dde 100644
--- a/modules/nixos/desktop/addons/waybar/default.nix
+++ b/modules/nixos/desktop/addons/waybar/default.nix
@@ -15,6 +15,7 @@ let
mkIf
types
;
+ inherit (lib.wyrdgard) enabled;
in
{
options.${namespace}.desktop.addons.waybar = {
@@ -29,8 +30,17 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
+ services.upower = enabled;
+ fonts.packages = with pkgs; [
+ cascadia-code
+ jetbrains-mono
+ maple-mono-NF
+ material-design-icons
+ noto-fonts-cjk-sans
+ ];
+
wyrdgard.home.file = {
- ".config/waybar/config".source = ./config;
+ ".config/waybar/config.jsonc".source = ./config.jsonc;
".config/waybar/style.css".source = ./style.css;
};
};
diff --git a/modules/nixos/desktop/addons/waybar/style.css b/modules/nixos/desktop/addons/waybar/style.css
index 16e5762..4ac9e9c 100644
--- a/modules/nixos/desktop/addons/waybar/style.css
+++ b/modules/nixos/desktop/addons/waybar/style.css
@@ -1,182 +1,391 @@
+* {
+ font-family: "JetBrains Mono Nerd Font";
+ /*font-family: "JetBrainsMono Nerd Font";*/
+ font-weight: bold;
+ font-size: 15px;
+}
+
+#custom-notification {
+ font-family: "JetBrains Mono Nerd Font";
+ font-size: 17px;
+ color: #A1BDCE;
+ margin: 2px 0px 0px 0px;
+}
+
window#waybar {
- background: transparent;
- /* background-color: rgba(43, 48, 59, 0.5); */
- /* border-bottom: 3px solid rgba(100, 114, 125, 0.5); */
- color: #ffffff;
- transition-property: background-color;
- transition-duration: .5s;
+ background: #0F0F17;
+ /* border-radius: 15px; */
+ /* border: 2px solid #124323; */
+/* border: 0px solid #A1BDCE; */
+ border: 3px solid rgba(255, 255, 255, 0.1);
+ border-radius: 10px;
}
-window#waybar.hidden {
- opacity: 0.2;
+
+tooltip {
+ background: #171717;
+ color: #A1BDCE;
+ font-size: 13px;
+ border-radius: 7px;
+ border: 2px solid #101a24;
+
+
+ }
+#workspaces{
+background: rgba(23, 23, 23, 0.0);
+ color: #888789;
+ box-shadow: none;
+ text-shadow: none;
+ border-radius: 9px;
+ transition: 0.2s ease;
+ padding-left: 4px;
+ padding-right: 4px;
+ padding-top: 1px;
}
-#waybar.empty #window {
- background-color: transparent;
-}
-
-#workspaces {
-}
-
-#window {
- margin: 2px;
- padding-left: 8px;
- padding-right: 8px;
- background-color: rgba(0,0,0,0.3);
- font-size:14px;
- font-weight: bold;
-}
-
-button {
- /* Use box-shadow instead of border so the text isn't offset */
- box-shadow: inset 0 -3px transparent;
- /* Avoid rounded borders under each button name */
- border: none;
- border-radius: 0;
-}
-
-/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
-button:hover {
- background: inherit;
- border-top: 2px solid #c9545d;
-}
#workspaces button {
- padding: 0 4px;
- /* background-color: rgba(0,0,0,0.3); */
+background: rgba(23, 23, 23, 0.0);
+ color: #A1BDCE;
+ box-shadow: none;
+ text-shadow: none;
+ border-radius: 9px;
+ transition: 0.2s ease;
+ padding-left: 4px;
+ padding-right: 4px;
+ /* animation: ws_normal 20s ease-in-out 1; */
+}
+
+
+
+#workspaces button.active {
+
+
+ /* background-image: url("/home/anik/Documents/bar1.png");*/
+ color: #A1BDCE;
+ transition: all 0.3s ease;
+ padding-left: 4px;
+ padding-right: 4px;
+ /* transition: all 0.4s cubic-bezier(.55,0.68,.48,1.682); */
}
#workspaces button:hover {
+ background: none;
+ color: #72D792;
+ animation: ws_hover 20s ease-in-out 1;
+ transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
}
-#workspaces button.focused {
- /* box-shadow: inset 0 -2px #c9545d; */
- background-color: rgba(0,0,0,0.3);
- color:#c9545d;
- border-top: 2px solid #c9545d;
+#taskbar button {
+ box-shadow: none;
+ text-shadow: none;
+ font-size: 4px;
+ padding: 0px;
+ border-radius: 9px;
+ margin-bottom: 3px;
+ margin-left: 0px;
+ padding-left: 3px;
+ padding-right: 3px;
+ margin-right: 0px;
+ color: @wb-color;
+ animation: tb_normal 20s ease-in-out 1;
}
-#workspaces button.urgent {
- background-color: #eb4d4b;
+#taskbar button.active {
+ background: @wb-act-bg;
+ color: @wb-act-color;
+ margin-left: 3px;
+ padding-left: 12px;
+ padding-right: 12px;
+ margin-right: 3px;
+ animation: tb_active 20s ease-in-out 1;
+ transition: all 0.4s cubic-bezier(.55,-0.68,.48,1.682);
+ min-height: 9px;
}
-#mode {
- background-color: #64727D;
- border-bottom: 3px solid #ffffff;
+#taskbar button:hover {
+ background: @wb-hvr-bg;
+ color: @wb-hvr-color;
+ animation: tb_hover 20s ease-in-out 1;
+ transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
}
-#clock,
-#battery,
-#cpu,
-#memory,
-#disk,
-#temperature,
-#backlight,
-#network,
-#pulseaudio,
-#wireplumber,
-#custom-media,
-#tray,
-#mode,
-#idle_inhibitor,
-#scratchpad,
-#mpd {
- margin: 2px;
- padding-left: 4px;
- padding-right: 4px;
- background-color: rgba(0,0,0,0.3);
- color: #ffffff;
+#tray menu * {
+ min-height: 16px;
+ font-weight: bold;
+ font-size: 13px;
+ color: #9488e3;
}
-/* If workspaces is the leftmost module, omit left margin */
-.modules-left > widget:first-child > #workspaces {
- margin-left: 0;
+#tray menu separator {
+ min-height: 10px
}
-/* If workspaces is the rightmost module, omit right margin */
-.modules-right > widget:last-child > #workspaces {
- margin-right: 0;
+
+#custom-spacer{
+opacity: 0.0;
+}
+#custom-smallspacer{
+opacity: 0.0;
}
-#clock {
- font-size:14px;
- font-weight: bold;
+
+#custom-mouse{
+font-size: 14px;
+margin-bottom: 6px;
+background: #161320;
}
-#battery icon {
- color: red;
+
+#custom-power{
+ font-size: 15px;
+ color: #FFFFFF;
+ background: rgba(22, 19, 32, 0.9);
+ margin: 6px 0px 6px 0px;
+ padding-left: 4px;
+ padding-right: 4px;
+ }
+
+#backlight{
+ color: #2096C0;
+ background: rgba(23, 23, 23, 0.0);
+ font-weight: normal;
+ font-size: 19px;
+ margin: 1px 0px 0px 0px;
+ padding-left: 0px;
+ padding-right: 2px;
+
+}
+#bluetooth,
+#custom-cliphist{
+ color: #E6E7E7;
+ background: #161320;
+ opacity: 1;
+ margin: 4px 0px 4px 0px;
+ padding-left: 4px;
+ padding-right: 4px;
+
+}
+#battery{
+ font-weight: normal;
+ font-size: 22px;
+ color: #a6d189;
+ background: rgba(23, 23, 23, 0.0);
+ opacity: 1;
+ margin: 0px 0px 0px 0px;
+ padding-left: 0px;
+ padding-right: 0px;
+
}
-#battery.charging, #battery.plugged {
- color: #ffffff;
- background-color: #26A65B;
+#idle_inhibitor{
+color: #24966e;
+background: @bar-bg;
+ opacity: 1;
+ margin: 4px 0px 4px 0px;
+ padding-left: 4px;
+ padding-right: 4px;
+
+}
+#clock{
+ color: #A1BDCE;
+ font-size: 15px;
+ font-weight: 900;
+ font-family: "JetBrains Mono Nerd Font";
+ background: rgba(23, 23, 23, 0.0);
+ opacity: 1;
+ margin: 3px 0px 0px 0px;
+ padding-left: 10px;
+ padding-right: 10px;
+ border: none;
+
+}
+#pulseaudio{
+font-weight: normal;
+font-size: 18px;
+color: #6F8FDB;
+ background: rgba(22, 19, 32, 0.0);
+ opacity: 1;
+ margin: 0px 0px 0px 0px;
+ padding-left: 3px;
+ padding-right: 3px;
+}
+#cpu{
+font-weight: normal;
+font-size: 22px;
+color: #915CAF;
+}
+#custom-led{
+background: #427287;
+color: #FFFFFF;
+margin-top: 7px;
+margin-bottom: 7px;
+padding-left: 6px;
+border-radius: 7px;
+margin-right: 6px;
+}
+#custom-gpuinfo,
+#custom-keybindhint,
+#language,
+#memory{
+font-weight: normal;
+font-size: 22px;
+color: #E4C9AF;
+}
+#mpris{
+color: white;
+animation: repeat;
+ animation-name: blink;
+ animation-duration: 3s;
+ animation-timing-function: linear;
+ animation-iteration-count: infinite;
+ animation-direction: alternate;
}
@keyframes blink {
- to {
- background-color: #ffffff;
- color: #000000;
- }
+ to {
+ color: #4a4a4a;
+
+ }
+}
+#network{
+color: #A1BDCE;
+font-weight: normal;
+font-size: 19px;
+padding-right: 0px;
+padding-left: 4px
+}
+#custom-notifications,
+#custom-spotify,
+#taskbar,
+#custom-theme,
+#custom-menu{
+color: #E8EDF0;
+background: rgba(23, 23, 23, 0.0);
+margin: 0px 0px 0px 0px;
+ padding-left: 1px;
+ padding-right: 1px;
+ opacity: 0.1
+}
+#tray,
+#custom-updates,
+#custom-wallchange,
+#custom-wbar,
+#window{
+color: #A1BDCE;
+font-family: "Martian Mono";
+}
+#custom-l_end,
+#custom-r_end,
+#custom-sl_end,
+#custom-sr_end,
+#custom-rl_end,
+#cava,
+#upower#headset,
+#upower{
+color: #a6d189;
+}
+#mpris{
+font-size: 15px;
+font-weight: bold
+}
+#custom-rr_end {
+font-weight: normal;
+ color: #E8EDF0;
+ background: rgba(23, 23, 23, 0.0);
+ opacity: 1;
+ margin: 0px 0px 0px 0px;
+ padding-left: 4px;
+ padding-right: 4px;
+ ;
+
}
-#battery.warning:not(.charging) {
- background-color: #f53c3c;
- color: #ffffff;
- animation-name: blink;
- animation-duration: 0.5s;
- animation-timing-function: linear;
- animation-iteration-count: infinite;
- animation-direction: alternate;
+#backlight-slider slider,
+#pulseaudio-slider slider {
+ background: #A1BDCE;
+ background-color: transparent;
+ box-shadow: none;
+ margin-right: 7px;
}
+#backlight-slider trough,
+#pulseaudio-slider trough {
+ margin-top: -3px;
+ min-width: 90px;
+ min-height: 10px;
+ margin-bottom: -4px;
+ border-radius: 8px;
+ background: #343434;
+}
+
+#backlight-slider highlight,
+#pulseaudio-slider highlight {
+ border-radius: 8px;
+ background-color: #2096C0;
+}
+
+#battery.charging, #battery.plugged {
+ color: #E8EDF0;
+
+}
+
+
#battery.critical:not(.charging) {
- background-color: #f53c3c;
- color: #ffffff;
- animation-name: blink;
- animation-duration: 0.5s;
- animation-timing-function: linear;
- animation-iteration-count: infinite;
- animation-direction: alternate;
+ color: red;
}
-label:focus {
- background-color: #000000;
+
+#taskbar {
+ padding: 1px;
}
-#network.disconnected {
- background-color: #f53c3c;
+#custom-r_end {
+ border-radius: 0px 7px 7px 0px;
+ margin-right: 1px;
+ padding-right: 3px;
}
-#temperature.critical {
- background-color: #eb4d4b;
+#custom-l_end {
+ border-radius: 7px 0px 0px 7px;
+ margin-left: 1px;
+ padding-left: 3px;
}
-#idle_inhibitor.activated {
- background-color: #ecf0f1;
- color: #2d3436;
+#custom-sr_end {
+ border-radius: 0px;
+ margin-right: 1px;
+ padding-right: 3px;
}
-#tray > .passive {
- -gtk-icon-effect: dim;
+#custom-sl_end {
+ border-radius: 0px;
+ margin-left: 1px;
+ padding-left: 3px;
}
-#tray > .needs-attention {
- -gtk-icon-effect: highlight;
- background-color: #eb4d4b;
+#custom-rr_end {
+ border-radius: 0px 7px 7px 0px;
+ margin-right: 1px;
+ padding-right: 3px;
}
-/*
-
-window#waybar.solo {
-background-color: #FFFFFF;
+#custom-rl_end {
+ border-radius: 7px 0px 0px 7px;
+ margin-left: 1px;
+ padding-left: 3px;
}
-window#waybar.termite {
-background-color: #3F3F3F;
+
+/* Style for launchers */
+
+#custom-expand {
+ min-width: 25px;
+ color: #A1BDCE;
+ font-size: 16px;
}
-window#waybar.chromium {
-background-color: #000000;
-border: none;
+#group-minimized {
+ border-left: solid;
+ border-left-width: 0.5;
}
- */
diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
new file mode 100644
index 0000000..d398097
--- /dev/null
+++ b/modules/nixos/desktop/default.nix
@@ -0,0 +1,37 @@
+{
+ lib,
+ config,
+ pkgs,
+ ...
+}:
+let
+ user = config.wyrdgard.user.name;
+in
+{
+ config = {
+ wyrdgard.home.extraOptions = {
+ dconf.settings = {
+ "org/gnome/desktop/interface" = {
+ color-scheme = "prefer-dark";
+ };
+ };
+
+ gtk = {
+ enable = true;
+ theme = {
+ name = "Adwaita-dark";
+ package = pkgs.gnome-themes-extra;
+ };
+ };
+
+ systemd.user.sessionVariables = config.home-manager.users.${user}.home.sessionVariables;
+ };
+
+ qt = {
+ enable = true;
+ platformTheme = "gnome";
+ style = "adwaita-dark";
+ };
+
+ };
+}
diff --git a/modules/nixos/security/keyring/default.nix b/modules/nixos/security/keyring/default.nix
index 6fef051..52ce51a 100644
--- a/modules/nixos/security/keyring/default.nix
+++ b/modules/nixos/security/keyring/default.nix
@@ -5,17 +5,17 @@
namespace,
...
}:
-with lib;
-with lib.${namespace};
let
+ inherit (lib) mkIf types;
+ inherit (lib.wyrdgard) mkBoolOpt;
cfg = config.${namespace}.security.keyring;
in
{
- options.${namespace}.security.keyring = with types; {
+ options.${namespace}.security.keyring = {
enable = mkBoolOpt true "Whether to enable gnome keyring.";
};
config = mkIf cfg.enable {
- services.gnome.gnome-keyring.enable = true;
+ services.gnome.gnome-keyring.enable = true;
};
}