From b5b3407ad836ebe7225646da82c0bc77f3559d19 Mon Sep 17 00:00:00 2001 From: Nickolaj Jepsen Date: Fri, 12 Dec 2025 23:46:43 +0100 Subject: [PATCH] fix: disable waybar --- flake.lock | 24 ++++----- modules/desktop/dms/default.nix | 3 +- modules/desktop/niri.nix | 90 --------------------------------- 3 files changed, 14 insertions(+), 103 deletions(-) diff --git a/flake.lock b/flake.lock index 3ebca5e..b185042 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1765493842, - "narHash": "sha256-KwubAPYQBVsQApkiKLfNp0K4HVkW02pu3GhaDU/78ZI=", + "lastModified": 1765576432, + "narHash": "sha256-cP9fIrEe6UXG3vpSjHMvl9i4717DA2AmUZEdiwQro5w=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "89dcd72d703d525d2034f616ecf19823d5f50457", + "rev": "6c3c722674ae2df8a74fc2dc4329c722165b9512", "type": "github" }, "original": { @@ -308,11 +308,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1765386897, - "narHash": "sha256-wmHtBM2Iuthw9DsTD9RUkkZqrmsSJYGgflSaskE+Rrc=", + "lastModified": 1765528203, + "narHash": "sha256-DTs3VkvRjW/Quu7y9hzNUrddysBXbcqv5Rpo4rtQYQI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "be7806f4fe2ead48eaf22e125f535d70a5ff2e3b", + "rev": "8f74fd85c7b42f2d06347a9c9eaff6d4904854f3", "type": "github" }, "original": { @@ -341,11 +341,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1765306956, - "narHash": "sha256-dAnL/EFft88xvKBLSE4pxSD5D945Cjm3E59bSl0feSE=", + "lastModified": 1765524373, + "narHash": "sha256-gi38XWhkb+H8iHhlXgv7MgUaQCuhmaTzKmq3yzYOg9g=", "owner": "YaLTeR", "repo": "niri", - "rev": "4d058e611147803f5188e417943c6653d846542f", + "rev": "c22d8358c293f5e66748d8ac20600e6b114f9743", "type": "github" }, "original": { @@ -531,11 +531,11 @@ ] }, "locked": { - "lastModified": 1765506555, - "narHash": "sha256-v18RWNPmHOEhvnvcZEtsZ+3xpFaEQqhW8HIUVg4n+fM=", + "lastModified": 1765572306, + "narHash": "sha256-WqVMKEwdxC5LBRZMiKA9pxJ/vtKtl3HmdJzqMDd+1bg=", "owner": "nix-community", "repo": "NUR", - "rev": "2f636cb9dfbfc27d6b4a84ff1f360b79103ef980", + "rev": "a038d2f292138ba982e1df3ce8e69a12570bd5d7", "type": "github" }, "original": { diff --git a/modules/desktop/dms/default.nix b/modules/desktop/dms/default.nix index bb72843..4fa623d 100644 --- a/modules/desktop/dms/default.nix +++ b/modules/desktop/dms/default.nix @@ -23,10 +23,11 @@ enable = true; enableDynamicTheming = false; - enableClipboard = false; enableVPN = false; enableCalendarEvents = false; + systemd.enable = true; + default.settings = { # General Settings weatherCoordinates = "56.1496278,10.2134046"; diff --git a/modules/desktop/niri.nix b/modules/desktop/niri.nix index a3352ae..5354a29 100644 --- a/modules/desktop/niri.nix +++ b/modules/desktop/niri.nix @@ -11,96 +11,6 @@ in { # TODO: Move these to a separate module programs.xwayland.enable = true; - fireproof.home-manager.programs.waybar = { - enable = true; - systemd.enable = true; - systemd.target = "niri.target"; - settings = { - bar = { - layer = "top"; - position = "top"; - modules-left = ["clock" "niri/workspaces"]; - modules-center = ["niri/window"]; - modules-right = ["backlight" "battery" "pulseaudio" "tray"]; - - pulseaudio = { - format = "{volume}% {icon}"; - format-muted = "󰝟 "; - format-icons = { - default = ["󰕿 " "󰖀 " "󰕾 "]; - headphone = "󰋋 "; - }; - on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; - }; - }; - }; - style = '' - * { - font-family: Hack Nerd Font Mono; - font-size: 14px; - } - window#waybar, #clock, #pulseaudio, #battery, #backlight, #tray { - background: #1C1B1A; - color: #DAD8CE; - border-bottom: 2px solid #CF6A4C; - } - - #workspaces button.focused { - background: #CF6A4C; - color: #1C1B1A; - box-shadow: 0 0 0 #CF6A4C; - } - - /* Default */ - 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; - box-shadow: inset 0 -3px #ffffff; - } - - /* you can set a style on hover for any module like this */ - #pulseaudio:hover { - background-color: #a37800; - } - - #workspaces button { - padding: 0 5px; - background-color: transparent; - color: #ffffff; - } - - #workspaces button:hover { - background: rgba(0, 0, 0, 0.2); - } - - #workspaces button.urgent { - background-color: #eb4d4b; - } - - #window, - #workspaces { - margin: 0 4px; - } - - - #tray > .passive { - -gtk-icon-effect: dim; - } - - #tray > .needs-attention { - -gtk-icon-effect: highlight; - background-color: #eb4d4b; - }''; - }; - xdg.portal = { enable = true; extraPortals = [pkgs.xdg-desktop-portal-gtk];