From e2912337ab09cc03a409bdd2a0715ac0f121ffc3 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Wed, 17 Dec 2025 11:08:25 -0500 Subject: [PATCH] remove old tiling configs --- home/tiling/niri/niri.nix | 24 ++-- home/tiling/quickshell/config/shell.qml | 42 ------- home/tiling/quickshell/default.nix | 14 --- home/tiling/waybar/config/config.jsonc | 94 --------------- .../waybar/config/scripts/brightness.sh | 16 --- home/tiling/waybar/config/scripts/clock.sh | 13 -- .../waybar/config/scripts/niri-window.sh | 25 ---- home/tiling/waybar/config/style.css | 114 ------------------ home/tiling/waybar/default.nix | 27 ----- system/all.nix | 2 - 10 files changed, 16 insertions(+), 355 deletions(-) delete mode 100644 home/tiling/quickshell/config/shell.qml delete mode 100644 home/tiling/quickshell/default.nix delete mode 100644 home/tiling/waybar/config/config.jsonc delete mode 100755 home/tiling/waybar/config/scripts/brightness.sh delete mode 100755 home/tiling/waybar/config/scripts/clock.sh delete mode 100755 home/tiling/waybar/config/scripts/niri-window.sh delete mode 100644 home/tiling/waybar/config/style.css delete mode 100644 home/tiling/waybar/default.nix diff --git a/home/tiling/niri/niri.nix b/home/tiling/niri/niri.nix index fa76028..01faf21 100644 --- a/home/tiling/niri/niri.nix +++ b/home/tiling/niri/niri.nix @@ -193,29 +193,37 @@ "XF86MonBrightnessUp" = { action.spawn = [ - "/home/${config.userOptions.username}/.config/niri/scripts/brightness.sh" - "5" + "brightnessctl" + "--class=backlight" + "set" + "+5%" ]; allow-when-locked = true; }; "XF86MonBrightnessDown" = { action.spawn = [ - "/home/${config.userOptions.username}/.config/niri/scripts/brightness.sh" - "-5" + "brightnessctl" + "--class=backlight" + "set" + "5%-" ]; allow-when-locked = true; }; "Shift+XF86MonBrightnessUp" = { action.spawn = [ - "/home/${config.userOptions.username}/.config/niri/scripts/brightness.sh" - "1" + "brightnessctl" + "--class=backlight" + "set" + "+1%" ]; allow-when-locked = true; }; "Shift+XF86MonBrightnessDown" = { action.spawn = [ - "/home/${config.userOptions.username}/.config/niri/scripts/brightness.sh" - "-1" + "brightnessctl" + "--class=backlight" + "set" + "1%-" ]; allow-when-locked = true; }; diff --git a/home/tiling/quickshell/config/shell.qml b/home/tiling/quickshell/config/shell.qml deleted file mode 100644 index d250648..0000000 --- a/home/tiling/quickshell/config/shell.qml +++ /dev/null @@ -1,42 +0,0 @@ -import Quickshell // for PanelWindow -import Quickshell.Io // for Process -import QtQuick // for Text - -PanelWindow { - anchors { - top: true - left: true - right: true - } - - implicitHeight: 37 - - color: "transparent" - - Rectangle { - anchors.fill: parent - color: "#000000" - Text { - id: clock - anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - anchors.rightMargin: 10 - color: "#cdd6f4" - - Process { - id: dateProc - command: ["date", "+%a, %b %d @ %I:%M%P"] - running: true - stdout: StdioCollector { - onStreamFinished: clock.text = this.text - } - } - Timer { - interval: 1000 - running: true - repeat: true - onTriggered: dateProc.running = true - } - } - } -} diff --git a/home/tiling/quickshell/default.nix b/home/tiling/quickshell/default.nix deleted file mode 100644 index 1463fe2..0000000 --- a/home/tiling/quickshell/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, pkgs, ... }: - -{ - home = { - # packages = with pkgs; [ quickshell ]; - file.".config/quickshell" = { - source = ./config; - recursive = true; - }; - }; - programs.quickshell = { - enable = true; - }; -} diff --git a/home/tiling/waybar/config/config.jsonc b/home/tiling/waybar/config/config.jsonc deleted file mode 100644 index de2e1e0..0000000 --- a/home/tiling/waybar/config/config.jsonc +++ /dev/null @@ -1,94 +0,0 @@ -{ - "layer": "top", - "spacing": 0, - "height": 42, - - "margin-top": 0, - "margin-right": 0, - "margin-bottom": 0, - "margin-left": 0, - - "modules-left": ["custom/niri-window"], - - "modules-center": [], - - "modules-right": [ - "tray", - "cpu", - "memory", - "battery", - "network", - "custom/brightness", - "pulseaudio", - "custom/clock", - ], - - "custom/niri-window": { - "exec": "/home/sckova/.config/waybar/scripts/niri-window.sh", - "restart-interval": 1, - "tooltip": false, - }, - - "tray": { - "spacing": 10, - "tooltip": false, - }, - - "custom/clock": { - "exec": "/home/sckova/.config/waybar/scripts/clock.sh", - "restart-interval": 1, - "tooltip": false, - }, - - "cpu": { - "format": "cpu {usage}%", - "interval": 2, - - "states": { - "critical": 90, - }, - }, - - "memory": { - "format": "mem {percentage}%", - "interval": 2, - - "states": { - "critical": 80, - }, - }, - - "battery": { - "format": "bat {capacity}%", - "interval": 5, - "states": { - "warning": 20, - "critical": 10, - }, - "tooltip": false, - }, - - "network": { - "format-wifi": "wifi up", - "format-ethernet": "enth up", - "format-disconnected": "no network", - "tooltip": false, - }, - - "custom/brightness": { - "exec": "/home/sckova/.config/waybar/scripts/brightness.sh", - "restart-interval": 10, - "signal": 8, - "tooltip": false, - }, - - "pulseaudio": { - "scroll-step": 5, - "max-volume": 150, - "format": "vol {volume}%", - "format-bluetooth": "vol {volume}%", - "nospacing": 1, - "on-click": "pavucontrol", - "tooltip": false, - }, -} diff --git a/home/tiling/waybar/config/scripts/brightness.sh b/home/tiling/waybar/config/scripts/brightness.sh deleted file mode 100755 index d6a0ca9..0000000 --- a/home/tiling/waybar/config/scripts/brightness.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -MAX=500 - -current=$(brightnessctl g) - -# Guard against empty or non-numeric output -if ! [[ "$current" =~ ^[0-9]+$ ]]; then - echo "brightnessctl returned invalid value" >&2 - exit 1 -fi - -percentage=$(( current * 100 / MAX )) - -echo "bright ${percentage}%" - diff --git a/home/tiling/waybar/config/scripts/clock.sh b/home/tiling/waybar/config/scripts/clock.sh deleted file mode 100755 index 9876ef6..0000000 --- a/home/tiling/waybar/config/scripts/clock.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -day=$(date +%-d) - -case "$day" in - 11|12|13) suffix="th" ;; - *1) suffix="st" ;; - *2) suffix="nd" ;; - *3) suffix="rd" ;; - *) suffix="th" ;; -esac - -date +"%a, %b $day$suffix %Y @ %I:%M%P" diff --git a/home/tiling/waybar/config/scripts/niri-window.sh b/home/tiling/waybar/config/scripts/niri-window.sh deleted file mode 100755 index a27d14c..0000000 --- a/home/tiling/waybar/config/scripts/niri-window.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -last="" - -while :; do - current=$( - niri msg focused-window | awk -F'"' ' - /App ID:/ { app = $2 } - /Title:/ { title = $2 } - END { - if (app && title) { - print app " - " title - } - } - ' - ) - - if [[ -n "$current" && "$current" != "$last" ]]; then - printf '%s\n' "$current" - last="$current" - fi - - sleep 0.01 -done - diff --git a/home/tiling/waybar/config/style.css b/home/tiling/waybar/config/style.css deleted file mode 100644 index bca63ed..0000000 --- a/home/tiling/waybar/config/style.css +++ /dev/null @@ -1,114 +0,0 @@ -@import "./colors.css"; -* { - border: none; - border-radius: 0; - min-height: 0; - font-family: "Noto Sans"; - font-size: 12px; - padding: 0; -} - -window#waybar { - background: black; - border: 2px solid @base; - border-top-width: 0px; - border-left-width: 0px; - border-right-width: 0px; -} - -tooltip { - background-color: @crust; - border-color: @peach; -} - -#custom-niri-window, -#custom-clock, -#tray, -#cpu, -#memory, -#battery, -#network, -#custom-brightness, -#pulseaudio { - background-color: @base; - color: @text; - border: 2px solid @text; - margin: 8px 6px 8px 0px; - padding: 2px 8px; - border-radius: 8px; -} - -#workspaces { - margin: 6px 0px 6px 6px; - border-color: #625343; -} - -#workspaces button { - all: initial; - min-width: 0; - box-shadow: inset 0 -3px transparent; - padding: 2px 4px; - color: #917a53; -} - -#workspaces button.focused { - color: #ddc7a1; -} - -#workspaces button.urgent { - background-color: #e78a4e; - color: #1d2021; -} - -#custom-niri-window { - margin-left: 6px; - border-color: @yellow; -} - -#cpu { - border-color: @maroon; -} - -#memory { - border-color: @peach; -} - -#battery { - border-color: @green; -} - -#network { - border-color: @teal; -} - -#custom-brightness { - border-color: @sky; -} - -#pulseaudio { - border-color: @blue; -} - -#custom-clock { - border-color: @lavender; -} - -#tray { - border-color: @blue; - color: @subtext0; -} - -#cpu.critical, -#memory.critical { - background-color: @base; - border-color: @red; - color: @subtext0; -} - -#battery.warning, -#battery.critical, -#battery.urgent { - background-color: #c9af82; - border-color: #917a53; - color: #ae6330; -} diff --git a/home/tiling/waybar/default.nix b/home/tiling/waybar/default.nix deleted file mode 100644 index b9ea075..0000000 --- a/home/tiling/waybar/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ config, pkgs, ... }: - -let - catppuccin-waybar = pkgs.fetchFromGitHub { - owner = "catppuccin"; - repo = "waybar"; - rev = "ee8ed32b4f63e9c417249c109818dcc05a2e25da"; - sha256 = "sha256-za0y6hcN2rvN6Xjf31xLRe4PP0YyHu2i454ZPjr+lWA="; - }; - - mergedConfig = pkgs.runCommand "mergedConfig" { } '' - mkdir -p $out - cp -rv ${./config}/* $out/ - cp -v ${catppuccin-waybar}/themes/${config.catppuccin.flavor}.css $out/colors.css - ''; -in -{ - programs.waybar = { - enable = true; - }; - - home.file.".config/waybar" = { - source = mergedConfig; - recursive = true; - force = true; - }; -} diff --git a/system/all.nix b/system/all.nix index cbe7845..cf2e870 100755 --- a/system/all.nix +++ b/system/all.nix @@ -58,9 +58,7 @@ ../home/graphical/firefox ../home/graphical/mpv ../home/tiling/niri - ../home/tiling/quickshell ../home/tiling/wallpaper - ../home/tiling/waybar ../home/systemd ../home/terminal/btop ../home/terminal/fish