From 89318957b9094987ea49a8cb739b6bb7ecd51416 Mon Sep 17 00:00:00 2001 From: Superredstone Date: Sat, 23 May 2026 15:38:29 +0200 Subject: [PATCH] feat(de): remove hyprland --- flake.lock | 534 ++--------------------------------- flake.nix | 3 +- home/default.nix | 1 - home/hyprland/default.nix | 9 - home/hyprland/hyprland.nix | 86 ------ home/hyprland/hyprlock.nix | 6 - home/hyprland/waybar.nix | 377 ------------------------- home/hyprland/wofi.nix | 6 - modules/packages.nix | 9 - modules/programs/default.nix | 1 - 10 files changed, 25 insertions(+), 1007 deletions(-) delete mode 100644 home/hyprland/default.nix delete mode 100644 home/hyprland/hyprland.nix delete mode 100644 home/hyprland/hyprlock.nix delete mode 100644 home/hyprland/waybar.nix delete mode 100644 home/hyprland/wofi.nix diff --git a/flake.lock b/flake.lock index b4ebd67..540b61d 100644 --- a/flake.lock +++ b/flake.lock @@ -1,38 +1,5 @@ { "nodes": { - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1778857089, - "narHash": "sha256-TclWRW2SdFeETLaiTG4BA8C8C4m/LppQEldncqyTzAQ=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "ab2b0af63fbc9fb779d684f19149b790978be8a8", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "cachyos-kernel": { "flake": false, "locked": { @@ -81,22 +48,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -139,7 +90,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1731533236, @@ -155,28 +106,6 @@ "type": "github" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "hyprland", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -197,332 +126,13 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1776511930, - "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "39435900785d0c560c6ae8777d29f28617d031ef", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1776426399, - "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprgraphics": "hyprgraphics", - "hyprland-guiutils": "hyprland-guiutils", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1779479172, - "narHash": "sha256-M4JsvbhxoddXhZrJqbBBroifAu55WfH+SPWmJjKudvo=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "342f5bd9a3f5653d7fe5ce421ec1c05095485ab3", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-guiutils": { - "inputs": { - "aquamarine": [ - "hyprland", - "aquamarine" - ], - "hyprgraphics": [ - "hyprland", - "hyprgraphics" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprtoolkit": "hyprtoolkit", - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1776426575, - "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=", - "owner": "hyprwm", - "repo": "hyprland-guiutils", - "rev": "a968d211048e3ed538e47b84cb3649299578f19d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-guiutils", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1772460177, - "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1777320127, - "narHash": "sha256-Qu+Wf2Bp5qUjyn2YpZNq8a7JyzTGowhT1knrwE38a9U=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "090117506ddc3d7f26e650ff344d378c2ec329cc", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprtoolkit": { - "inputs": { - "aquamarine": [ - "hyprland", - "hyprland-guiutils", - "aquamarine" - ], - "hyprgraphics": [ - "hyprland", - "hyprland-guiutils", - "hyprgraphics" - ], - "hyprlang": [ - "hyprland", - "hyprland-guiutils", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland-guiutils", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprland-guiutils", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "hyprland-guiutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-guiutils", - "systems" - ] - }, - "locked": { - "lastModified": 1772462885, - "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=", - "owner": "hyprwm", - "repo": "hyprtoolkit", - "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprtoolkit", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1779475241, - "narHash": "sha256-Nw4DN0A5krWNcPBvuWe5Gz2yuxsUUPiDgtu6SVPJQeU=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "3cd3972b2ee658a14d2610d8494e09259e530124", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1777159683, - "narHash": "sha256-Jxixw6wZphUp+nHYxOKUYSckL17QMBx2d5Zp0rJHr1g=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "b8632713a6beaf28b56f2a7b0ab2fb7088dbb404", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, - "hyprwire": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1778410714, - "narHash": "sha256-o6RzFj4nJXaPRY7EM01siuCQeT41RfwwmcmFQqwFJJg=", - "owner": "hyprwm", - "repo": "hyprwire", - "rev": "85148a8e612808cf5ddb25d0b3c5840f3498a7dc", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwire", - "type": "github" - } - }, "nix-cachyos-kernel": { "inputs": { "cachyos-kernel": "cachyos-kernel", "cachyos-kernel-patches": "cachyos-kernel-patches", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1779477384, @@ -541,16 +151,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1779357205, - "narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=", + "lastModified": 1779436535, + "narHash": "sha256-jJ8YPw+bnLy1c8oI0hO4NKvbCQOt9V1aSUzhpLPs3Cw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1", + "rev": "d04de155b837ea2ba199ec83851b9dbffe57af08", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } @@ -587,22 +197,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1779436535, - "narHash": "sha256-jJ8YPw+bnLy1c8oI0hO4NKvbCQOt9V1aSUzhpLPs3Cw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d04de155b837ea2ba199ec83851b9dbffe57af08", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1779357205, "narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=", @@ -618,7 +212,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1778869304, "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", @@ -632,7 +226,7 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1778794387, "narHash": "sha256-BL04pOS9453Awkeb9f90XBJXBSkWxN+vB7HIgnL0iMM=", @@ -648,7 +242,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1770562336, "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", @@ -665,15 +259,15 @@ "nixvim": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixvim": "nixvim_2" }, "locked": { - "lastModified": 1779521151, - "narHash": "sha256-9/rumVopiy4tbcf2o7NGgNZv/gIzgsSZxwo/EYjzFCY=", + "lastModified": 1779534872, + "narHash": "sha256-5bzlMvP/1vTZljeNNr7uqNnlcatX9yBUuq4aAzIrsnc=", "owner": "Superredstone", "repo": "nixvim", - "rev": "c6b94479c22af7bad8c4e0db10f88b61b7c1d753", + "rev": "3ff6d04d297aafb25bdd1e520e8f6857408b4090", "type": "github" }, "original": { @@ -685,8 +279,8 @@ "nixvim_2": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_5", - "systems": "systems_3" + "nixpkgs": "nixpkgs_4", + "systems": "systems_2" }, "locked": { "lastModified": 1778906310, @@ -729,7 +323,7 @@ "noctalia", "nixpkgs" ], - "systems": "systems_4", + "systems": "systems_3", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -746,35 +340,11 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1778507602, - "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager", - "hyprland": "hyprland", "nix-cachyos-kernel": "nix-cachyos-kernel", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-25-11": "nixpkgs-25-11", "nixvim": "nixvim", "noctalia": "noctalia", @@ -804,7 +374,7 @@ }, "spotiflac-cli": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1771096762, @@ -822,16 +392,16 @@ }, "systems": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -851,21 +421,6 @@ } }, "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -901,47 +456,6 @@ "repo": "treefmt-nix", "type": "github" } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1778265244, - "narHash": "sha256-8jlPtGSsv/CQY6tVVyLF4Jjd0gnS+Zbn9yk/V13A9nM=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "813ea5ca9a1702a9a2d1f5836bc00172ef698968", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 65ecd7f..088fbd6 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; - hyprland.url = "github:hyprwm/Hyprland"; spotiflac-cli.url = "github:Superredstone/spotiflac-cli"; }; @@ -61,7 +60,7 @@ user = username; email = personalEmail; gamingSystem = true; - # Currently supported: plasma, gnome, hyprland and none + # Currently supported: plasma, gnome, niri and none desktopEnvironment = "niri"; enableZram = true; additionalModules = [ diff --git a/home/default.nix b/home/default.nix index c74b97b..3a989d2 100644 --- a/home/default.nix +++ b/home/default.nix @@ -15,7 +15,6 @@ ./vesktop.nix ./zoxide.nix ] - ++ (if currentSystemDe == "hyprland" then [ ./hyprland ] else [ ]) ++ (if currentSystemDe == "gnome" then [ ./gnome.nix ] else [ ]) ++ (if currentSystemDe == "niri" then [ ./niri.nix ] else [ ]); diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix deleted file mode 100644 index ef883b9..0000000 --- a/home/hyprland/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: -{ - imports = [ - ./hyprland.nix - ./hyprlock.nix - ./waybar.nix - ./wofi.nix - ]; -} diff --git a/home/hyprland/hyprland.nix b/home/hyprland/hyprland.nix deleted file mode 100644 index ecfb425..0000000 --- a/home/hyprland/hyprland.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ currentSystemUser, ... }: -{ - dconf.settings = { - "org/gnome/desktop/interface" = { - color-scheme = "prefer-dark"; - }; - }; - - wayland.windowManager.hyprland = { - enable = true; - settings = { - "$mod" = "SUPER"; - bind = [ - "$mod, Return, exec, kitty" - "$mod, SPACE, exec, wofi --show run" - "$mod SHIFT, L, exec, hyprlock" - - "$mod SHIFT, Q, killactive" - "$mod, F, fullscreen" - "$mod, H, movefocus, l" - "$mod, L, movefocus, r" - "$mod, K, movefocus, u" - "$mod, J, movefocus, d" - "$mod SHIFT, H, movewindow, l" - "$mod SHIFT, L, movewindow, r" - "$mod SHIFT, K, movewindow, u" - "$mod SHIFT, J, movewindow, d" - "$mod SHIFT, right, resizeactive, 30 0" - "$mod SHIFT, left, resizeactive, -30 0" - "$mod SHIFT, up, resizeactive, 0 -30" - "$mod SHIFT, down, resizeactive, 0 30" - "$mod SHIFT, U, togglefloating" - - ",XF86MonBrightnessDown, exec, brightnessctl set 2%-" - ",XF86MonBrightnessUp, exec, brightnessctl set +2%" - ",XF86AudioLowerVolume, exec, pamixer -d 2" - ",XF86AudioRaiseVolume, exec, pamixer -i 2" - - "$mod, delete, exit" - ] - ++ (builtins.concatLists ( - builtins.genList ( - i: - let - ws = i + 1; - in - [ - "$mod, code:1${toString i}, workspace, ${toString ws}" - "$mod SHIFT, code:1${toString i}, movetoworkspace, ${toString ws}" - ] - ) 9 - )); - bindm = [ - "$mod, mouse:272, movewindow" - "$mod, mouse:273, resizewindow" - ]; - - monitor = ", preferred, auto, 1"; - - input = { - touchpad = { - natural_scroll = "yes"; - }; - - sensitivity = "0"; - accel_profile = "flat"; - }; - - exec-once = [ - "waybar" - "hyprpaper" - ]; - - exec = [ - ]; - }; - }; - - services.hyprpaper = { - enable = true; - settings = { - preload = [ "/home/${currentSystemUser}/Pictures/wallpaper.jpg" ]; - wallpaper = [ ",/home/${currentSystemUser}/Pictures/wallpaper.jpg" ]; - }; - }; -} diff --git a/home/hyprland/hyprlock.nix b/home/hyprland/hyprlock.nix deleted file mode 100644 index a6ee03d..0000000 --- a/home/hyprland/hyprlock.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: -{ - programs.hyprlock = { - enable = true; - }; -} diff --git a/home/hyprland/waybar.nix b/home/hyprland/waybar.nix deleted file mode 100644 index 9ba1c7b..0000000 --- a/home/hyprland/waybar.nix +++ /dev/null @@ -1,377 +0,0 @@ -{ ... }: -{ - programs.waybar = { - enable = true; - - settings = { - mainBar = { - height = 30; - spacing = 1; - modules-left = [ - "hyprland/workspaces" - ]; - modules-center = [ - "hyprland/window" - ]; - modules-right = [ - "tray" - "pulseaudio" - "network" - "power-profiles-daemon" - "backlight" - "battery" - "clock" - ]; - - "hyprland/workspaces" = { - format = "{name} {icon}"; - format-icons = { - "1" = ""; - "2" = ""; - "3" = ""; - "4" = ""; - "5" = ""; - }; - }; - "tray" = { - spacing = 10; - }; - "pulseaudio" = { - format = "{volume}% {icon}"; - format-icons = { - headphones = ""; - bluetooth = "󰥰"; - handsfree = ""; - headset = "󱡬"; - phone = ""; - portable = ""; - car = ""; - default = [ - "🕨" - "🕩" - "🕪" - ]; - }; - on-click = "pavucontrol"; - }; - "hyprland/window" = { - format = "{class}"; - }; - "battery" = { - "interval" = 1; - states = { - good = 80; - warning = 30; - critical = 20; - }; - format = "{capacity}% {icon}"; - format-charging = "{capacity}% 󰂄"; - format-plugged = "{capacity}% "; - format-alt = "{time} {icon}"; - format-icons = [ - "󰁻" - "󰁼" - "󰁾" - "󰂀" - "󰂂" - "󰁹" - ]; - }; - # Currently not enabled because i don't want to add some external tools to manage brightness - # backlight = { - # format = "{percent}% {icon}"; - # format-icons = [ - # "" - # "" - # "" - # "" - # "" - # "" - # "" - # "" - # "" - # "" - # ]; - # on-scroll-down = "light -A 10"; - # on-scroll-up = "light -U 10"; - # smooth-scrolling-threshold = 1; - # }; - "network" = { - format-wifi = "{ipaddr} Wi-Fi"; - format-ethernet = "{ipaddr} Eth"; - }; - "power-profiles-daemon" = { - "format" = "{icon}"; - "tooltip-format" = "Power profile: {profile}\nDriver: {driver}"; - "tooltip" = true; - "format-icons" = { - "default" = ""; - "performance" = ""; - "balanced" = ""; - "power-saver" = ""; - }; - }; - }; - }; - - style = '' - @define-color rosewater #f5e0dc; - @define-color flamingo #f2cdcd; - @define-color pink #f5c2e7; - @define-color mauve #cba6f7; - @define-color red #f38ba8; - @define-color maroon #eba0ac; - @define-color peach #fab387; - @define-color yellow #f9e2af; - @define-color green #a6e3a1; - @define-color teal #94e2d5; - @define-color sky #89dceb; - @define-color sapphire #74c7ec; - @define-color blue #89b4fa; - @define-color lavender #b4befe; - @define-color text #cdd6f4; - @define-color subtext1 #bac2de; - @define-color subtext0 #a6adc8; - @define-color overlay2 #9399b2; - @define-color overlay1 #7f849c; - @define-color overlay0 #6c7086; - @define-color surface2 #585b70; - @define-color surface1 #45475a; - @define-color surface0 #313244; - @define-color base #1e1e2e; - @define-color mantle #181825; - @define-color crust #11111b; - - * { - border: none; - border-radius: 1px; - font-family: JetBrainsMono Nerd Font; - font-size: 13px; - min-height: 0; - } - - window#waybar { - background-color: @mantle; - color: @text; - } - - window#waybar.hidden { - opacity: 0.2; - } - - tooltip { - background-color: @base; - border: 1px solid @surface1; - } - - tooltip label { - color: @text; - } - - button { - box-shadow: inset 0 -3px transparent; - border: none; - border-radius: 1px; - } - - button:hover { - background: inherit; - box-shadow: inset 0 -3px @text; - } - - #workspaces button { - padding: 0 0; - background-color: @mantle; - color: @text; - } - - #workspaces button:hover { - box-shadow: inherit; - text-shadow: inherit; - background-image: linear-gradient(0deg, @surface1, @mantle); - } - - #workspaces button.focused { - background-image: linear-gradient(0deg, @mauve, @surface1); - box-shadow: inset 0 -3px @text; - } - - #workspaces button.urgent { - background-image: linear-gradient(0deg, @red, @mantle); - } - - #taskbar button.active { - background-image: linear-gradient(0deg, @surface1, @mantle); - } - - #mode { - background-color: @base; - box-shadow: inset 0 -2px @text; - } - - #mpris, - #custom-weather, - #clock, - #language, - #pulseaudio, - #bluetooth, - #network, - #memory, - #cpu, - #temperature, - #disk, - #custom-kernel, - #idle_inhibitor, - #scratchpad, - #mode, - #power-profiles-daemon, - #backlight, - #battery, - #tray { - padding: 0 10px; - margin: 5px 1px; - color: @text; - } - - #window, - #workspaces { - margin: 0 4px; - } - - #power-profiles-daemon { - background-color: @red; - color: @base; - } - - #custom-weather { - background-color: @teal; - color: @mantle; - margin-right: 5px; - } - - #custom-kernel { - background-color: @rosewater; - color: @mantle; - } - - #clock { - background-color: @green; - color: @mantle; - } - - @keyframes blink { - to { - background-color: @mantle; - color: @text; - } - } - - label:focus { - background-color: @mantle; - } - - #cpu { - background-color: @mauve; - color: @mantle; - min-width: 45px; - } - - #memory { - background-color: @red; - color: @mantle; - } - - #disk { - background-color: @flamingo; - color: @mantle; - } - - #battery { - background-color: @mauve; - color: @base; - } - - #backlight { - background-color: @sky; - color: @base; - } - - #network { - background-color: @peach; - color: @mantle; - } - - #network.disconnected { - background-color: red; - color: @mantle; - } - - #bluetooth { - background-color: @maroon; - color: @mantle; - min-width: 40px; - } - - #pulseaudio { - background-color: @yellow; - color: @mantle; - } - - #pulseaudio.muted { - background-color: red; - color: @mantle; - } - - #temperature { - background-color: @pink; - color: @mantle; - min-width: 37px; - } - - #temperature.critical { - background-color: red; - color: @mantle; - min-width: 37px; - } - - #mpris { - background-color: @base; - color: @text; - } - - #tray { - background-color: @overlay0; - color: @text; - } - - #tray > .passive { - -gtk-icon-effect: dim; - } - - #tray > .needs-attention { - -gtk-icon-effect: highlight; - background-color: @mantle; - } - - #idle_inhibitor { - background-color: @base; - color: @text; - font-family: Inter; - } - - #idle_inhibitor.activated { - background-color: @text; - color: @base; - } - - #scratchpad { - background-color: @base; - color: @text; - } - - #scratchpad.empty { - background-color: transparent; - } - ''; - }; -} diff --git a/home/hyprland/wofi.nix b/home/hyprland/wofi.nix deleted file mode 100644 index c63615d..0000000 --- a/home/hyprland/wofi.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: -{ - programs.wofi = { - enable = true; - }; -} diff --git a/modules/packages.nix b/modules/packages.nix index aaf324b..5ca8242 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -114,14 +114,6 @@ kdePackages.wallpaper-engine-plugin ]; - hyprlandPackages = lib.optionals (currentSystemDe == "hyprland") [ - brightnessctl - hyprpaper - pamixer - pavucontrol - kdePackages.dolphin - ]; - gnomePackages = lib.optionals (currentSystemDe == "gnome") [ gnome-tweaks gnomeExtensions.appindicator @@ -142,7 +134,6 @@ ++ gamingPackages ++ workPackages ++ plasmaPackages - ++ hyprlandPackages ++ gnomePackages ++ niriPackages; diff --git a/modules/programs/default.nix b/modules/programs/default.nix index 61468a2..2331ac0 100644 --- a/modules/programs/default.nix +++ b/modules/programs/default.nix @@ -33,6 +33,5 @@ nh = { enable = true; }; - hyprland.enable = if currentSystemDe == "hyprland" then true else false; }; }