From d20c9ac3bd0ffd742dab0b7114dbc1166b4d7d54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christopher=20M=C3=BChl?= Date: Mon, 4 Aug 2025 18:20:22 +0200 Subject: [PATCH] Move eww config --- .../christopher@cobalt/config/eww.nix | 15 +++++++++++++++ .../{fixtures => config}/eww/README.md | 4 ++-- .../{fixtures => config}/eww/_catppuccin.scss | 0 .../{fixtures => config}/eww/eww.scss | 0 .../{fixtures => config}/eww/eww.yuck | 0 .../eww/scripts/get-active-workspace | 0 .../eww/scripts/get-workspaces | 0 .../{fixtures => config}/eww/scripts/memory | 0 .../{fixtures => config}/eww/scripts/pkgs | 0 .../{fixtures => config}/eww/scripts/temps | 0 .../{fixtures => config}/eww/variables.yuck | 0 .../christopher@cobalt/config/fixtures.nix | 6 ------ homes/x86_64-linux/christopher@cobalt/default.nix | 3 --- systems/x86_64-linux/cobalt/default.nix | 9 +-------- 14 files changed, 18 insertions(+), 19 deletions(-) create mode 100644 homes/x86_64-linux/christopher@cobalt/config/eww.nix rename homes/x86_64-linux/christopher@cobalt/{fixtures => config}/eww/README.md (56%) rename homes/x86_64-linux/christopher@cobalt/{fixtures => config}/eww/_catppuccin.scss (100%) rename homes/x86_64-linux/christopher@cobalt/{fixtures => config}/eww/eww.scss (100%) rename homes/x86_64-linux/christopher@cobalt/{fixtures => config}/eww/eww.yuck (100%) rename homes/x86_64-linux/christopher@cobalt/{fixtures => config}/eww/scripts/get-active-workspace (100%) rename homes/x86_64-linux/christopher@cobalt/{fixtures => config}/eww/scripts/get-workspaces (100%) rename homes/x86_64-linux/christopher@cobalt/{fixtures => config}/eww/scripts/memory (100%) rename homes/x86_64-linux/christopher@cobalt/{fixtures => config}/eww/scripts/pkgs (100%) rename homes/x86_64-linux/christopher@cobalt/{fixtures => config}/eww/scripts/temps (100%) rename homes/x86_64-linux/christopher@cobalt/{fixtures => config}/eww/variables.yuck (100%) delete mode 100644 homes/x86_64-linux/christopher@cobalt/config/fixtures.nix diff --git a/homes/x86_64-linux/christopher@cobalt/config/eww.nix b/homes/x86_64-linux/christopher@cobalt/config/eww.nix new file mode 100644 index 0000000..8731b40 --- /dev/null +++ b/homes/x86_64-linux/christopher@cobalt/config/eww.nix @@ -0,0 +1,15 @@ +{ + config, + pkgs, + ... +}: { + home.packages = with pkgs; [ + eww + lm_sensors + ]; + + home.file."${config.xdg.configHome}/eww" = { + source = ./eww; + recursive = true; + }; +} diff --git a/homes/x86_64-linux/christopher@cobalt/fixtures/eww/README.md b/homes/x86_64-linux/christopher@cobalt/config/eww/README.md similarity index 56% rename from homes/x86_64-linux/christopher@cobalt/fixtures/eww/README.md rename to homes/x86_64-linux/christopher@cobalt/config/eww/README.md index 0851bbe..a8cb5eb 100644 --- a/homes/x86_64-linux/christopher@cobalt/fixtures/eww/README.md +++ b/homes/x86_64-linux/christopher@cobalt/config/eww/README.md @@ -1,5 +1,5 @@ In order to develop these widgets (with live reloading) do the following: 1. Kill the original eww daemon using `eww kill` -2. Start the new daemon using `eww open main_menu --config /home/christopher/.dotfiles/home/fixtures/eww` -3. Now all changes to the original dotfiles defining the config will be hot-reloaded \ No newline at end of file +2. Start the new daemon using `eww open spraggins --config ~/.dotfiles/homes/x86_64-linux/christopher@cobalt/config/eww ` +3. Now all changes to the original dotfiles defining the config will be hot-reloaded diff --git a/homes/x86_64-linux/christopher@cobalt/fixtures/eww/_catppuccin.scss b/homes/x86_64-linux/christopher@cobalt/config/eww/_catppuccin.scss similarity index 100% rename from homes/x86_64-linux/christopher@cobalt/fixtures/eww/_catppuccin.scss rename to homes/x86_64-linux/christopher@cobalt/config/eww/_catppuccin.scss diff --git a/homes/x86_64-linux/christopher@cobalt/fixtures/eww/eww.scss b/homes/x86_64-linux/christopher@cobalt/config/eww/eww.scss similarity index 100% rename from homes/x86_64-linux/christopher@cobalt/fixtures/eww/eww.scss rename to homes/x86_64-linux/christopher@cobalt/config/eww/eww.scss diff --git a/homes/x86_64-linux/christopher@cobalt/fixtures/eww/eww.yuck b/homes/x86_64-linux/christopher@cobalt/config/eww/eww.yuck similarity index 100% rename from homes/x86_64-linux/christopher@cobalt/fixtures/eww/eww.yuck rename to homes/x86_64-linux/christopher@cobalt/config/eww/eww.yuck diff --git a/homes/x86_64-linux/christopher@cobalt/fixtures/eww/scripts/get-active-workspace b/homes/x86_64-linux/christopher@cobalt/config/eww/scripts/get-active-workspace similarity index 100% rename from homes/x86_64-linux/christopher@cobalt/fixtures/eww/scripts/get-active-workspace rename to homes/x86_64-linux/christopher@cobalt/config/eww/scripts/get-active-workspace diff --git a/homes/x86_64-linux/christopher@cobalt/fixtures/eww/scripts/get-workspaces b/homes/x86_64-linux/christopher@cobalt/config/eww/scripts/get-workspaces similarity index 100% rename from homes/x86_64-linux/christopher@cobalt/fixtures/eww/scripts/get-workspaces rename to homes/x86_64-linux/christopher@cobalt/config/eww/scripts/get-workspaces diff --git a/homes/x86_64-linux/christopher@cobalt/fixtures/eww/scripts/memory b/homes/x86_64-linux/christopher@cobalt/config/eww/scripts/memory similarity index 100% rename from homes/x86_64-linux/christopher@cobalt/fixtures/eww/scripts/memory rename to homes/x86_64-linux/christopher@cobalt/config/eww/scripts/memory diff --git a/homes/x86_64-linux/christopher@cobalt/fixtures/eww/scripts/pkgs b/homes/x86_64-linux/christopher@cobalt/config/eww/scripts/pkgs similarity index 100% rename from homes/x86_64-linux/christopher@cobalt/fixtures/eww/scripts/pkgs rename to homes/x86_64-linux/christopher@cobalt/config/eww/scripts/pkgs diff --git a/homes/x86_64-linux/christopher@cobalt/fixtures/eww/scripts/temps b/homes/x86_64-linux/christopher@cobalt/config/eww/scripts/temps similarity index 100% rename from homes/x86_64-linux/christopher@cobalt/fixtures/eww/scripts/temps rename to homes/x86_64-linux/christopher@cobalt/config/eww/scripts/temps diff --git a/homes/x86_64-linux/christopher@cobalt/fixtures/eww/variables.yuck b/homes/x86_64-linux/christopher@cobalt/config/eww/variables.yuck similarity index 100% rename from homes/x86_64-linux/christopher@cobalt/fixtures/eww/variables.yuck rename to homes/x86_64-linux/christopher@cobalt/config/eww/variables.yuck diff --git a/homes/x86_64-linux/christopher@cobalt/config/fixtures.nix b/homes/x86_64-linux/christopher@cobalt/config/fixtures.nix deleted file mode 100644 index e7f143a..0000000 --- a/homes/x86_64-linux/christopher@cobalt/config/fixtures.nix +++ /dev/null @@ -1,6 +0,0 @@ -{config, ...}: { - home.file."${config.xdg.configHome}/eww" = { - source = ../fixtures/eww; - recursive = true; - }; -} diff --git a/homes/x86_64-linux/christopher@cobalt/default.nix b/homes/x86_64-linux/christopher@cobalt/default.nix index a9fb104..e34df47 100644 --- a/homes/x86_64-linux/christopher@cobalt/default.nix +++ b/homes/x86_64-linux/christopher@cobalt/default.nix @@ -46,9 +46,6 @@ tofi-hg open-url generate-wallpaper - - # Required for eww. Move this somewhere else. - pkgs.lm_sensors ]; }; diff --git a/systems/x86_64-linux/cobalt/default.nix b/systems/x86_64-linux/cobalt/default.nix index 0872c75..1577286 100644 --- a/systems/x86_64-linux/cobalt/default.nix +++ b/systems/x86_64-linux/cobalt/default.nix @@ -145,22 +145,15 @@ with lib._elements; { htop gnumake libnotify - xarchiver # GUI archiving tool, used with Thunar - lact + lact # GPU tuning # Oxidized coreutils uutils-coreutils-noprefix wally-cli keymapp - - # SANE frontend - xsane - - # Desktop environment pavucontrol - eww nix-tree nix-output-monitor