From 6aab08ec9b215c2393af1bb0e614a03b62dee721 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Mon, 2 Sep 2024 19:07:19 +0200 Subject: [PATCH 1/3] do more bar things --- .../eww/configDir/bottomBar/bottomBar.yuck | 41 +++++++++++++++++++ .../home/panels/eww/configDir/eww.css | 2 +- .../home/panels/eww/configDir/eww.yuck | 1 + .../eww/configDir/scripts/workspaces.nu | 3 ++ .../panels/eww/configDir/topBar/topBar.yuck | 11 +++-- .../home/panels/eww/configDir/util.yuck | 4 +- 6 files changed, 53 insertions(+), 9 deletions(-) create mode 100644 modules/desktop-environment/home/panels/eww/configDir/bottomBar/bottomBar.yuck create mode 100644 modules/desktop-environment/home/panels/eww/configDir/scripts/workspaces.nu diff --git a/modules/desktop-environment/home/panels/eww/configDir/bottomBar/bottomBar.yuck b/modules/desktop-environment/home/panels/eww/configDir/bottomBar/bottomBar.yuck new file mode 100644 index 0000000..2a2da02 --- /dev/null +++ b/modules/desktop-environment/home/panels/eww/configDir/bottomBar/bottomBar.yuck @@ -0,0 +1,41 @@ +(defwindow bottomBar + :monitor 0 + :stacking "fg" + :wm-ignore true + :exclusive true + :geometry (geometry + :width "100%" + :height "32px" + :anchor "bottom center") + (bottomBar)) + +(defwidget bottomBar [] + (overlay + :class "bottomBar" + (centerbox + (box + :halign "start" + (label :text "left") + ) + (box + :halign "center" + (label :text "mid") + ) + (box + :halign "end" + (label :text "right") + ) + ) + (box + :class "lesbianFlag" + :height 1 + ( flagEl :flipped true :color "#D52D00") + ( flagEl :flipped true :color "#EF7627") + ( flagEl :flipped true :color "#FF9A56") + ( flagEl :flipped true :color "#FFFFFF") + ( flagEl :flipped true :color "#D162A4") + ( flagEl :flipped true :color "#B55690") + ( flagEl :flipped true :color "#A30262") + ) + ) +) diff --git a/modules/desktop-environment/home/panels/eww/configDir/eww.css b/modules/desktop-environment/home/panels/eww/configDir/eww.css index 3e12d0f..851f731 100644 --- a/modules/desktop-environment/home/panels/eww/configDir/eww.css +++ b/modules/desktop-environment/home/panels/eww/configDir/eww.css @@ -1,4 +1,4 @@ -.topbar { +.topBar { margin-bottom: 2px; } diff --git a/modules/desktop-environment/home/panels/eww/configDir/eww.yuck b/modules/desktop-environment/home/panels/eww/configDir/eww.yuck index d17d0f0..5e5d10d 100644 --- a/modules/desktop-environment/home/panels/eww/configDir/eww.yuck +++ b/modules/desktop-environment/home/panels/eww/configDir/eww.yuck @@ -1 +1,2 @@ (include "topBar/topBar.yuck") +(include "bottomBar/bottomBar.yuck") diff --git a/modules/desktop-environment/home/panels/eww/configDir/scripts/workspaces.nu b/modules/desktop-environment/home/panels/eww/configDir/scripts/workspaces.nu new file mode 100644 index 0000000..6e72651 --- /dev/null +++ b/modules/desktop-environment/home/panels/eww/configDir/scripts/workspaces.nu @@ -0,0 +1,3 @@ +def main [] { + mut workspaces = waymsg -rt get_workspaces | from json | select name focused urgent; +} diff --git a/modules/desktop-environment/home/panels/eww/configDir/topBar/topBar.yuck b/modules/desktop-environment/home/panels/eww/configDir/topBar/topBar.yuck index 8963e5a..be4b25f 100644 --- a/modules/desktop-environment/home/panels/eww/configDir/topBar/topBar.yuck +++ b/modules/desktop-environment/home/panels/eww/configDir/topBar/topBar.yuck @@ -5,7 +5,6 @@ (defwindow topBar :monitor 0 :stacking "fg" - :windowtype "normal" :wm-ignore true :exclusive true :geometry (geometry @@ -46,11 +45,11 @@ (box :class "transFlag" :height 1 - ( flagEl :color "#5BCEFA") - ( flagEl :color "#F5A9B8") - ( flagEl :color "#FFFFFF") - ( flagEl :color "#F5A9B8") - ( flagEl :color "#5BCEFA") + ( flagEl :flipped false :color "#5BCEFA") + ( flagEl :flipped false :color "#F5A9B8") + ( flagEl :flipped false :color "#FFFFFF") + ( flagEl :flipped false :color "#F5A9B8") + ( flagEl :flipped false :color "#5BCEFA") ) ) ) diff --git a/modules/desktop-environment/home/panels/eww/configDir/util.yuck b/modules/desktop-environment/home/panels/eww/configDir/util.yuck index 53b9be5..f0aa592 100644 --- a/modules/desktop-environment/home/panels/eww/configDir/util.yuck +++ b/modules/desktop-environment/home/panels/eww/configDir/util.yuck @@ -1,6 +1,6 @@ -(defwidget flagEl [color] +(defwidget flagEl [color ?flipped] (box - :style "border-bottom: 3px solid ${color}" + :style "border-${flipped ? "top" : "bottom"}: 3px solid ${color}" :halign "fill" ) ) From 47ba1e5796a173d172df2fc7866a4d9113521d17 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Mon, 2 Sep 2024 19:07:58 +0200 Subject: [PATCH 2/3] fix broken/deprecated things --- flake.lock | 47 +++++++++---------- flake.nix | 5 +- hosts/catbook-j/configuration.nix | 2 +- .../desktop-environment/home/sway/default.nix | 1 + modules/desktop/default.nix | 8 ---- 5 files changed, 24 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 6e741be..df5082c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,17 +1,12 @@ { "nodes": { "crane": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, "locked": { - "lastModified": 1724537630, - "narHash": "sha256-gpqINM71zp3kw5XYwUXa84ZtPnCmLLnByuFoYesT1bY=", + "lastModified": 1725125250, + "narHash": "sha256-CB20rDD5eHikF6mMTTJdwPP1qvyoiyyw1RDUzwIaIF8=", "owner": "ipetkov", "repo": "crane", - "rev": "3e08f4b1fc9aaede5dd511d8f5f4ef27501e49b0", + "rev": "96fd12c7100e9e05fa1a0a5bd108525600ce282f", "type": "github" }, "original": { @@ -28,11 +23,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1724567349, - "narHash": "sha256-w2G1EJlGvgRSC1OAm2147mCzlt6ZOWIiqX/TSJUgrGE=", + "lastModified": 1725258763, + "narHash": "sha256-7s5RfYlTljWnKGkK4hOMJCJ0sNQoLYjMxezX3Vijy/0=", "owner": "nix-community", "repo": "fenix", - "rev": "71fe264f6e208831aa0e7e54ad557a283c375014", + "rev": "0774f58cf1025bbb713971deecc7f07c856be6ed", "type": "github" }, "original": { @@ -104,11 +99,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1724401716, - "narHash": "sha256-LXTYUVhv6Kz9Iy9DxXSI0J+2/hunUj2fj0Kvw2eDarQ=", + "lastModified": 1724856988, + "narHash": "sha256-JBLe2CxAhG+J8+x8qmbzkGHNYmGcSiuY2QO4Zhb72lI=", "owner": "helix-editor", "repo": "helix", - "rev": "620dfceb849d6b68d41d4f7678bb4675009fef4d", + "rev": "1b5295a3f3d7cccd96eed5bfd394807a4dae87fc", "type": "github" }, "original": { @@ -124,11 +119,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1725180166, + "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", "type": "github" }, "original": { @@ -205,11 +200,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724224976, - "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "type": "github" }, "original": { @@ -235,11 +230,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1724558323, - "narHash": "sha256-uPXidysk1BXSayGzpxDW8JUgGvLWS+L1CTlBV3xcQB4=", + "lastModified": 1725274606, + "narHash": "sha256-xXINAjCR8eTmp3AxZTk/PIH9nNoFNN0OM7MUw6eB7oQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ba0c72cea47a45556ccd5bc566433bd1242a0f93", + "rev": "66a352a3f27a2eb2f27e42a13c6fe245d3be2b98", "type": "github" }, "original": { @@ -265,11 +260,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1724480527, - "narHash": "sha256-C+roFDGk6Bn/C58NGpyt7cneLCetdRMUfFTkm3O4zWM=", + "lastModified": 1725191098, + "narHash": "sha256-YH0kH5CSOnAuPUB1BUzUqvnKiv5SgDhfMNjrkki9Ahk=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "74a6427861eb8d1e3b7c6090b2c2890ff4c53e0e", + "rev": "779d9eee2ea403da447278a7007c9627c8878856", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fa735be..52b2f66 100644 --- a/flake.nix +++ b/flake.nix @@ -27,9 +27,6 @@ }; crane = { url = "github:ipetkov/crane"; - inputs = { - nixpkgs.follows = "nixpkgs"; - }; }; fenix = { url = "github:nix-community/fenix"; @@ -55,7 +52,7 @@ pkgs = nixpkgs.legacyPackages.${system}; pkgs-stable = nixpkgs-stable.legacyPackages.${system}; pkgs-unstable-small = nixpkgs-unstable-small.legacyPackages.${system}; - crane-lib = crane.lib.${system}; + crane-lib = crane.mkLib nixpkgs.legacyPackages.${system}; rs-toolchain = with fenix.packages.${system}; combine [ complete.toolchain diff --git a/hosts/catbook-j/configuration.nix b/hosts/catbook-j/configuration.nix index d0f1c6b..5ed71d5 100644 --- a/hosts/catbook-j/configuration.nix +++ b/hosts/catbook-j/configuration.nix @@ -42,7 +42,7 @@ systemd.services."ModemManager".wantedBy = ["multi-user.target"]; environment.variables = { - VDPAU_DRIVER = lib.mkIf config.hardware.opengl.enable (lib.mkDefault "va_gl"); + VDPAU_DRIVER = lib.mkIf config.hardware.graphics.enable (lib.mkDefault "va_gl"); S10E_JRNL_FILE_LOC = "/home/jade/Docs/jrnl.md"; }; diff --git a/modules/desktop-environment/home/sway/default.nix b/modules/desktop-environment/home/sway/default.nix index 75f4bf5..781b6c4 100644 --- a/modules/desktop-environment/home/sway/default.nix +++ b/modules/desktop-environment/home/sway/default.nix @@ -13,6 +13,7 @@ # sway = { # default = ["wlr"]; # }; + config.common.default = "*"; }; services.swayidle = { diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 63daa0d..a94b504 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -30,14 +30,6 @@ in ./x.nix ]; - i18n.inputMethod = { - enabled = "fcitx5"; - fcitx5.addons = with pkgs; [ - fcitx5-mozc - fcitx5-gtk - ]; - }; - programs.seahorse.enable = true; security.pam.services.jade.enableGnomeKeyring = true; From e920f9c2069efd9af1eb427171b5f91177253933 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Mon, 2 Sep 2024 19:08:10 +0200 Subject: [PATCH 3/3] add frequently used programs --- common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common.nix b/common.nix index 99e25fe..41f83fe 100644 --- a/common.nix +++ b/common.nix @@ -90,6 +90,10 @@ with builtins; { libjxl s10e-jrnl + + ungoogled-chromium + scc + speedtest-rs ]; };