From e8b1f901e3fe4912eee3df1f51cb2b57f4bdb6e3 Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Wed, 28 Aug 2024 14:15:49 -0700 Subject: [PATCH] feat(hyprland): remove the chud wm --- flake.lock | 397 +----------------- flake.nix | 62 --- home/environments/hyprland/gtk.nix | 32 -- home/environments/hyprland/hypridle.nix | 29 -- home/environments/hyprland/hyprland.nix | 173 -------- home/environments/hyprland/hyprlock.nix | 12 - home/environments/hyprland/konawall.nix | 39 -- home/environments/hyprland/swaylock.nix | 11 - home/environments/hyprland/waybar.nix | 107 ----- home/environments/hyprland/waybar.sass | 85 ---- home/environments/hyprland/wlogout.nix | 5 - home/environments/hyprland/wofi.nix | 20 - home/environments/hyprland/wofi.sass | 26 -- nixos/environments/hyprland/colord.nix | 3 - nixos/environments/hyprland/gnome-keyring.nix | 3 - nixos/environments/hyprland/hyprland.nix | 15 - .../hyprland/profile-inheritance.nix | 9 - nixos/environments/hyprland/xdg-portals.nix | 10 - 18 files changed, 2 insertions(+), 1036 deletions(-) delete mode 100644 home/environments/hyprland/gtk.nix delete mode 100644 home/environments/hyprland/hypridle.nix delete mode 100644 home/environments/hyprland/hyprland.nix delete mode 100644 home/environments/hyprland/hyprlock.nix delete mode 100644 home/environments/hyprland/konawall.nix delete mode 100644 home/environments/hyprland/swaylock.nix delete mode 100644 home/environments/hyprland/waybar.nix delete mode 100644 home/environments/hyprland/waybar.sass delete mode 100644 home/environments/hyprland/wlogout.nix delete mode 100644 home/environments/hyprland/wofi.nix delete mode 100644 home/environments/hyprland/wofi.sass delete mode 100644 nixos/environments/hyprland/colord.nix delete mode 100644 nixos/environments/hyprland/gnome-keyring.nix delete mode 100644 nixos/environments/hyprland/hyprland.nix delete mode 100644 nixos/environments/hyprland/profile-inheritance.nix delete mode 100644 nixos/environments/hyprland/xdg-portals.nix diff --git a/flake.lock b/flake.lock index ea0467b7..6db3b8c5 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": 1721853718, - "narHash": "sha256-QEkCryhEMBW8maWEbwN0LoJIjdt640FviwMeJpghJXM=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "353dc1b7299d43f08de44276b93ae32726ff9d70", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "arcexprs": { "inputs": { "nixpkgs": "nixpkgs" @@ -104,27 +71,6 @@ } }, "crane": { - "inputs": { - "nixpkgs": [ - "hyprsome", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1707685877, - "narHash": "sha256-XoXRS+5whotelr1rHiZle5t5hDg9kpguS5yk8c8qzOc=", - "owner": "ipetkov", - "repo": "crane", - "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_2": { "inputs": { "flake-compat": [ "lanzaboote", @@ -357,266 +303,6 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1721330371, - "narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprlang": [ - "hyprlang" - ], - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": [ - "nixpkgs" - ], - "systems": [ - "systems" - ], - "xdph": [ - "xdph" - ] - }, - "locked": { - "lastModified": 1721914179, - "narHash": "sha256-rh6YUcOJ1LEWfwFmx5P74moeqOqgMeYpuFMTs1y30ew=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "33a5c8ce325e1657ec5571b57e05c6378706f4cd", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "systems": [ - "systems" - ] - }, - "locked": { - "lastModified": 1721326555, - "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": "hyprutils_2", - "nixpkgs": [ - "nixpkgs" - ], - "systems": [ - "systems" - ] - }, - "locked": { - "lastModified": 1721324361, - "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlock": { - "inputs": { - "hyprlang": [ - "hyprlang" - ], - "hyprutils": "hyprutils_3", - "nixpkgs": [ - "nixpkgs" - ], - "systems": [ - "systems" - ] - }, - "locked": { - "lastModified": 1721855891, - "narHash": "sha256-S70Pif/SaChwtJwV0K4rUh+pU8kyVtzbGtNtsOQ8geo=", - "owner": "hyprwm", - "repo": "hyprlock", - "rev": "cf0e975fedcddde897a75c5b6a2a111177b0baad", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlock", - "type": "github" - } - }, - "hyprsome": { - "inputs": { - "crane": "crane", - "flake-utils": [ - "utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1708469806, - "narHash": "sha256-BBEVzd9Zy52FDGlr+7/kPHMvmifIuDqOf2qxKcXNkgs=", - "owner": "kittywitch", - "repo": "hyprsome", - "rev": "234ce1fc0946e3080e53dc33af72fca7a2da8432", - "type": "github" - }, - "original": { - "owner": "kittywitch", - "repo": "hyprsome", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1721324102, - "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "962582a090bc233c4de9d9897f46794280288989", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_2": { - "inputs": { - "nixpkgs": [ - "hyprlang", - "nixpkgs" - ], - "systems": [ - "hyprlang", - "systems" - ] - }, - "locked": { - "lastModified": 1721324102, - "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "962582a090bc233c4de9d9897f46794280288989", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_3": { - "inputs": { - "nixpkgs": [ - "hyprlock", - "nixpkgs" - ], - "systems": [ - "hyprlock", - "systems" - ] - }, - "locked": { - "lastModified": 1721324102, - "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "962582a090bc233c4de9d9897f46794280288989", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1721324119, - "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "konawall-py": { "inputs": { "flake-utils": [ @@ -642,7 +328,7 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_2", + "crane": "crane", "flake-compat": [ "flake-compat" ], @@ -671,32 +357,6 @@ "type": "github" } }, - "mach-nix": { - "inputs": { - "flake-utils": [ - "utils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "pypi-deps-db": [ - "pypi-deps-db" - ] - }, - "locked": { - "lastModified": 1654084003, - "narHash": "sha256-j/XrVVistvM+Ua+0tNFvO5z83isL+LBgmBi9XppxuKA=", - "owner": "DavHau", - "repo": "mach-nix", - "rev": "7e14360bde07dcae32e5e24f366c83272f52923f", - "type": "github" - }, - "original": { - "id": "mach-nix", - "ref": "3.5.0", - "type": "indirect" - } - }, "minecraft": { "inputs": { "flake-compat": [ @@ -873,22 +533,6 @@ "type": "github" } }, - "pypi-deps-db": { - "flake": false, - "locked": { - "lastModified": 1699338846, - "narHash": "sha256-RhdhdtRRZcRzxCduxQf79d2tE+qhjtlanx7CcAmMhrM=", - "owner": "DavHau", - "repo": "pypi-deps-db", - "rev": "e72a0d5d535bde034717a175c8228c237b18449c", - "type": "github" - }, - "original": { - "owner": "DavHau", - "repo": "pypi-deps-db", - "type": "github" - } - }, "root": { "inputs": { "arcexprs": "arcexprs", @@ -901,21 +545,14 @@ "flakelib": "flakelib", "flakelibstd": "flakelibstd", "home-manager": "home-manager", - "hyprland": "hyprland", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", - "hyprlock": "hyprlock", - "hyprsome": "hyprsome", "konawall-py": "konawall-py", "lanzaboote": "lanzaboote", - "mach-nix": "mach-nix", "minecraft": "minecraft", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "nur": "nur", "plasma-manager": "plasma-manager", - "pypi-deps-db": "pypi-deps-db", "scalpel": "scalpel", "sops-nix": "sops-nix", "spacebar": "spacebar", @@ -923,8 +560,7 @@ "systems": "systems", "tree": "tree", "utils": "utils", - "wsl": "wsl", - "xdph": "xdph" + "wsl": "wsl" } }, "rust-overlay": { @@ -1120,35 +756,6 @@ "repo": "NixOS-WSL", "type": "github" } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland-protocols" - ], - "hyprlang": [ - "hyprlang" - ], - "nixpkgs": [ - "nixpkgs" - ], - "systems": [ - "systems" - ] - }, - "locked": { - "lastModified": 1721755049, - "narHash": "sha256-O17b38bQnmfxv7It3OnVYx7fp1seEdI7xxnw5vJFv30=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "5555f467f68ce7cdf1060991c24263073b95e9da", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index a30569c3..6c475b76 100644 --- a/flake.nix +++ b/flake.nix @@ -111,68 +111,6 @@ sops-nix.follows = "sops-nix"; }; }; - # dependency database for mach-nix - pypi-deps-db = { - url = "github:DavHau/pypi-deps-db"; - flake = false; - }; - hyprlang = { - url = "github:hyprwm/hyprlang"; - inputs = { - nixpkgs.follows = "nixpkgs"; - systems.follows = "systems"; - }; - }; - xdph = { - url = "github:hyprwm/xdg-desktop-portal-hyprland"; - inputs = { - nixpkgs.follows = "nixpkgs"; - systems.follows = "systems"; - hyprlang.follows = "hyprlang"; - hyprland-protocols.follows = "hyprland-protocols"; - }; - }; - hyprland-protocols = { - url = "github:hyprwm/hyprland-protocols"; - inputs = { - nixpkgs.follows = "nixpkgs"; - systems.follows = "systems"; - }; - }; - hyprland = { - url = "github:hyprwm/Hyprland"; - inputs = { - nixpkgs.follows = "nixpkgs"; - systems.follows = "systems"; - hyprlang.follows = "hyprlang"; - xdph.follows = "xdph"; - hyprland-protocols.follows = "hyprland-protocols"; - }; - }; - hyprsome = { - url = "github:kittywitch/hyprsome"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "utils"; - }; - }; - hyprlock = { - url = "github:hyprwm/hyprlock"; - inputs = { - nixpkgs.follows = "nixpkgs"; - systems.follows = "systems"; - hyprlang.follows = "hyprlang"; - }; - }; - # nixified python environments - mach-nix = { - url = "mach-nix/3.5.0"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "utils"; - pypi-deps-db.follows = "pypi-deps-db"; - }; - }; # pre-computed nix-index nix-index-database = { url = "github:Mic92/nix-index-database"; diff --git a/home/environments/hyprland/gtk.nix b/home/environments/hyprland/gtk.nix deleted file mode 100644 index c68b82b3..00000000 --- a/home/environments/hyprland/gtk.nix +++ /dev/null @@ -1,32 +0,0 @@ -{pkgs, ...}: { - home.pointerCursor = { - gtk.enable = true; - # x11.enable = true; - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Classic"; - size = 16; - }; - - gtk = { - enable = true; - iconTheme = { - name = "Numix-Square-Light"; - package = pkgs.numix-icon-theme-square; - }; - - theme = { - name = "Arc"; - package = pkgs.arc-theme; - }; - - cursorTheme = { - name = "Numix-Cursor"; - package = pkgs.numix-cursor-theme; - }; - - font = { - name = "Monaspace Krypton"; - size = 11; - }; - }; -} diff --git a/home/environments/hyprland/hypridle.nix b/home/environments/hyprland/hypridle.nix deleted file mode 100644 index a9e411f3..00000000 --- a/home/environments/hyprland/hypridle.nix +++ /dev/null @@ -1,29 +0,0 @@ -{pkgs, ...}: { - services.hypridle = { - enable = true; - listeners = [ - { - timeout = 150; - onTimeout = "${pkgs.brightnessctl}/bin/brightnessctl -s set 5"; - onResume = "${pkgs.brightnessctl}/bin/brightnessctl -r"; - } - { - timeout = 300; - onTimeout = "${pkgs.systemd}/bin/loginctl lock-session"; - } - { - timeout = 330; - onTimeout = "${pkgs.hyprland}/bin/hyprctl dispatch dpms off"; - onResume = "${pkgs.hyprland}/bin/hyprctl dispatch dpms on"; - } - { - timeout = 600; - onTimeout = "${pkgs.systemd}/bin/systemctl suspend"; - } - ]; - beforeSleepCmd = "${pkgs.systemd}/bin/loginctl lock-session"; - afterSleepCmd = "${pkgs.hyprland}/bin/hyprctl dispatch dpms on"; - lockCmd = "pidof hyprlock || ${pkgs.hyprlock}/bin/hyprlock"; - unlockCmd = "${pkgs.psmisc}/bin/killall hyprlock"; - }; -} diff --git a/home/environments/hyprland/hyprland.nix b/home/environments/hyprland/hyprland.nix deleted file mode 100644 index 50b36140..00000000 --- a/home/environments/hyprland/hyprland.nix +++ /dev/null @@ -1,173 +0,0 @@ -{ - std, - pkgs, - inputs, - ... -}: let - inherit (std) list; -in { - home.packages = with pkgs; [ - grimblast - wl-clipboard - wlr-randr - wl-screenrec - slurp - grim - swww - pavucontrol - hyprpicker - gnome.nautilus - brightnessctl - playerctl - inputs.hyprsome.packages.${pkgs.system}.default - ]; - home.sessionVariables = { - QT_QPA_PLATFORM = "wayland"; - SDL_VIDEODRIVER = "wayland"; - XDG_SESSION_TYPE = "wayland"; - }; - wayland.windowManager.hyprland = { - enable = true; - systemd = { - enable = true; - variables = ["--all"]; - extraCommands = [ - "systemctl --user stop graphical-session.target" - "systemctl --user start hyprland-session.target" - ]; - }; - xwayland.enable = true; - settings = { - "$mod" = "SUPER"; - input = { - kb_options = "ctrl:nocaps"; - }; - workspace = let - commonOptions = "gapsin:0,gapsout:0,rounding:false"; - in - ["1,monitor:eDP-1,default:true,${commonOptions}"] - ++ (list.map ( - workspace: "${toString workspace},monitor:eDP-1${commonOptions}" - ) (list.range 2 10)); - /* - ++ [ "11,monitor:DP-3,default:true"] ++ (list.map (workspace: - "${toString workspace},monitor:DP-3" - ) (list.range 12 20)); - /*list.concat (list.generate ( - x: let - ws = let - c = (x + 1) / 10; - in - builtins.toString (x + 1 - (c * 10)); - in [ - "${toString x},monitor:eDP-1" - "${toString (x + 10)},monitor:DP-3" - ] - ) - 10); - */ - monitor = [ - "eDP-1, 2256x1504, 0x0, 1" - ]; - exec-once = [ - "${pkgs.swww}/bin/swww init" - "${pkgs.hypridle}/bin/hypridle" - "${pkgs.dbus}/bin/dbus-update-activation-environment --all" - "${pkgs.libsForQt5.polkit-kde-agent}/bin/polkit-kde-agent" - "${pkgs.networkmanagerapplet}/bin/nm-applet" - "${pkgs.mako}/bin/mako" - "${pkgs.udiskie}/bin/udiskie &" - "${pkgs.pasystray}/bin/pasystray" - "${pkgs.systemd}/bin/systemctl restart waybar --user" - "${pkgs.systemd}/bin/systemctl restart konawall-py --user" - ]; - exec = [ - ]; - xwayland = { - force_zero_scaling = true; - }; - bindm = [ - "$mod, mouse:272, movewindow" - "$mod, mouse:273, resizewindow" - "$mod ALT, mouse:272, resizewindow" - ]; - binde = [ - ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+" - ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" - ", XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl -c backlight set 5%+" - ", XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl -c backlight set 5%-" - ]; - bind = - [ - ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" - ", XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl play-pause" - ", XF86AudioNext, exec, ${pkgs.playerctl}/bin/playerctl next" - ", XF86AudioPrev, exec, ${pkgs.playerctl}/bin/playerctl prev" - - "$mod, R, exec, wofi -t wezterm -IS drun" - "$mod SHIFT, R, exec, wofi -t wezterm -IS run" - "$mod, Return, exec, wezterm" - ", Print, exec, grimblast copy area" - - "$mod SHIFT, E, exec, pkill Hyprland" - "$mod, Q, killactive," - "$mod, F, fullscreen," - "$mod, G, togglegroup," - "$mod SHIFT, N, changegroupactive, f" - "$mod SHIFT, P, changegroupactive, b" - "$mod, T, togglefloating," - "$mod SHIFT, T, togglesplit," - "$mod SHIFT, X, pseudo," - "$mod ALT, ,resizeactive," - "$mod, Escape, exec, wlogout -p layer-shell" - "$mod, L, exec, loginctl lock-session" - - "$mod, left, movefocus, l" - "$mod, right, movefocus, r" - "$mod, up, movefocus, u" - "$mod, down, movefocus, d" - "$mod SHIFT, left, movewindow, l" - "$mod SHIFT, right, movewindow, r" - "$mod SHIFT, up, movewindow, u" - "$mod SHIFT, down, movewindow, d" - "$mod ALT, left, movewindoworgroup, l" - "$mod ALT, right, movewindoworgroup, r" - "$mod ALT, up, movewindoworgroup, u" - "$mod ALT, down, movewindoworgroup, d" - - "$mod, P, exec, ${pkgs.hyprpicker}/bin/hyprpicker -na" - - "CTRL, Print, exec, grimblast --notify --cursor copysave output" - "$mod SHIFT CTRL, R, exec, grimblast --notify --cursor copysave output" - - "ALT, Print, exec, grimblast --notify --cursor copysave screen" - "$mod SHIFT ALT, R, exec, grimblast --notify --cursor copysave screen" - - "$mod, bracketleft, workspace, m-1" - "$mod, bracketright, workspace, m+1" - - "$mod SHIFT, bracketleft, focusmonitor, l" - "$mod SHIFT, bracketright, focusmonitor, r" - - "$mod SHIFT ALT, bracketleft, movecurrentworkspacetomonitor, l" - "$mod SHIFT ALT, bracketright, movecurrentworkspacetomonitor, r" - ] - ++ ( - # workspaces - # binds $mod + [shift +] {1..10} to [move to] workspace {1..10} - list.concat (list.generate ( - x: let - ws = let - c = (x + 1) / 10; - in - builtins.toString (x + 1 - (c * 10)); - in [ - "$mod, ${ws}, exec, hyprsome workspace ${toString (x + 1)}" - "$mod SHIFT, ${ws}, exec, hyprsome move ${toString (x + 1)}" - ] - ) - 10) - ); - }; - }; -} diff --git a/home/environments/hyprland/hyprlock.nix b/home/environments/hyprland/hyprlock.nix deleted file mode 100644 index a38b43d5..00000000 --- a/home/environments/hyprland/hyprlock.nix +++ /dev/null @@ -1,12 +0,0 @@ -_: { - programs.hyprlock = { - enable = true; - backgrounds = [ - { - path = "screenshot"; - blur_size = 8; - blur_passes = 1; - } - ]; - }; -} diff --git a/home/environments/hyprland/konawall.nix b/home/environments/hyprland/konawall.nix deleted file mode 100644 index 1411b9d3..00000000 --- a/home/environments/hyprland/konawall.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - inputs, - pkgs, - config, - ... -}: let - konawallConfig = { - interval = 60 * 5; - rotate = true; - source = "konachan"; - tags = [ - "rating:s" - "touhou" - "score:>=50" - "width:>=1500" - ]; - logging = { - file = "INFO"; - console = "DEBUG"; - }; - }; -in { - systemd.user.services.konawall-py-hyprland = { - Unit = { - Description = "konawall-py"; - X-Restart-Triggers = [(toString config.xdg.configFile."konawall/config.toml".source)]; - After = ["hyprland-session.target" "network-online.target"]; - }; - Service = { - ExecStart = "${inputs.konawall-py.packages.${pkgs.system}.konawall-py}/bin/konawall"; - Restart = "on-failure"; - RestartSec = "1s"; - }; - Install = {WantedBy = ["hyprland-session.target"];}; - }; - xdg.configFile = { - "konawall/config.toml".source = (pkgs.formats.toml {}).generate "konawall-config" konawallConfig; - }; -} diff --git a/home/environments/hyprland/swaylock.nix b/home/environments/hyprland/swaylock.nix deleted file mode 100644 index dad3907c..00000000 --- a/home/environments/hyprland/swaylock.nix +++ /dev/null @@ -1,11 +0,0 @@ -{pkgs, ...}: { - programs.swaylock = { - enable = true; - package = pkgs.swaylock-effects; - settings = { - clock = true; - font = "Iosevka"; - indicator = true; - }; - }; -} diff --git a/home/environments/hyprland/waybar.nix b/home/environments/hyprland/waybar.nix deleted file mode 100644 index f03316fe..00000000 --- a/home/environments/hyprland/waybar.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ - kittywitch, - config, - lib, - ... -}: let - inherit (lib.modules) mkForce; -in { - systemd.user.services.waybar = { - Install.WantedBy = lib.mkForce ["hyprland-session.target"]; - Service = { - RestartSec = "1s"; - }; - Unit = { - After = ["hyprland-session.target"]; - X-Restart-Triggers = [ - (builtins.hashString "md5" (builtins.toJSON config.programs.waybar.settings)) - ]; - }; - }; - - programs.waybar = { - enable = true; - systemd.enable = true; - style = let - template = kittywitch.sassTemplate { - name = "waybar-style"; - src = ./waybar.sass; - }; - in - template.source; - settings.main = { - layer = "top"; - position = "top"; - height = 24; - - # Modules Placement - modules-left = [ - "hyprland/workspaces" - "hyprland/submap" - "hyprland/window" - ]; - modules-right = [ - "idle_inhibitor" - "power-profiles-daemon" - "tray" - "battery" - "clock" - ]; - - # Modules Definition - "hyprland/workspaces" = { - format = "{icon}"; - /* - format-icons = { - # https://fontawesome.com/v5/cheatsheet - "1" = ""; # chats - "2" = ""; # cloud (browser) - "3" = ""; # music - "4" = ""; # brain - "5" = ""; # terminal >_ - }; - */ - }; - "hyprland/window" = { - format = "{}"; - rewrite = { - "(.*) — Mozilla Firefox" = "🌎 $1"; - "(.*) - fish" = "> [$1]"; - }; - }; - tray = { - show-passive-items = true; - icon-size = 24; - spacing = 2; - }; - power-profiles-daemon = { - format = "{profile}"; - tooltip-format = "Power profile: {profile}\nDriver: {driver}"; - tooltip = true; - }; - mpris = { - format = "{player_icon} {dynamic}"; - format-paused = "{status_icon} {dynamic}"; - player-icons = { - default = ""; - brave = ""; - mpv = ""; - spotify = ""; - }; - status-icons = { - paused = ""; - }; - }; - idle_inhibitor = { - format = "{icon}"; - format-icons = { - activated = ""; - deactivated = ""; - }; - }; - clock = { - format = "{:%F %H:%M %Z}"; - }; - }; - }; -} diff --git a/home/environments/hyprland/waybar.sass b/home/environments/hyprland/waybar.sass deleted file mode 100644 index ae37fe3a..00000000 --- a/home/environments/hyprland/waybar.sass +++ /dev/null @@ -1,85 +0,0 @@ -* - padding: 0 - margin: 0 - border: none - border-radius: 0 - background: none - font-family: "Monaspace Krypton", "Font Awesome 6 Free", "Font Awesome 6 Brands" - font-size: $font_size - text-shadow: none - box-shadow: none - -%widget_unpadded - transition: none - background: rgba($base01, 0.5) - color: $base07 - margin: 0 4px - -%widget - @extend %widget_unpadded - padding: 0 4px - padding-top: 2px - -window#waybar - background: rgba($base00, 0.1) - border-bottom: 2px solid transparent - -// sway/workspaces -#workspaces - @extend %widget_unpadded - button - color: $base06 - &.focused - color: $base07 - background: $base0D - - &:hover - transition: none - box-shadow: inherit - text-shadow: inherit - background: $base06 - color: $base0C - - -// widgets -#mode, window#waybar #window, -#custom-clock, #mpris, -#clock, #pulseaudio, #backlight, #network, #temperature, #battery, #idle_inhibitor, #tray, #tray menu - @extend %widget - -// hide when empty -window#waybar.empty #window - opacity: 0 - - -// tooltips -tooltip - background: rgba($base00, 0.9) - label - color: $base07 - -// mpris player and state -#mpris - &.spotify - background: #191414 - color: #1DB954 - - &.paused - background: $base01 - color: $base03 - -/*.modules-left - #window - widget - label - margin: 0 - - &:first-child - margin-left: 0 - - &:last-child - margin-right: 0*/ - -.modules-center - -.modules-right diff --git a/home/environments/hyprland/wlogout.nix b/home/environments/hyprland/wlogout.nix deleted file mode 100644 index c7493482..00000000 --- a/home/environments/hyprland/wlogout.nix +++ /dev/null @@ -1,5 +0,0 @@ -_: { - programs.wlogout = { - enable = true; - }; -} diff --git a/home/environments/hyprland/wofi.nix b/home/environments/hyprland/wofi.nix deleted file mode 100644 index 8d408389..00000000 --- a/home/environments/hyprland/wofi.nix +++ /dev/null @@ -1,20 +0,0 @@ -{kittywitch, ...}: { - programs.wofi = { - enable = true; - settings = { - style = let - template = kittywitch.sassTemplate { - name = "wofi-style"; - src = ./wofi.sass; - }; - in - template.source; - insensitive = true; - allow_images = true; - hide_scroll = true; - width = "25%"; - mode = "dmenu"; - prompt = ""; - }; - }; -} diff --git a/home/environments/hyprland/wofi.sass b/home/environments/hyprland/wofi.sass deleted file mode 100644 index cf68cb41..00000000 --- a/home/environments/hyprland/wofi.sass +++ /dev/null @@ -1,26 +0,0 @@ -#scroll - background: $base01 - border: 1px solid $base03 - -#input - background: $base01 - border: 1px solid $base0C - margin: 1em - background: $base02 - color: $base04 - -window - font-family: $font - background: rgba($base00, .9) - border-radius: 1em - font-size: $font_size - color: $base07 - -#outer-box - margin: 1em - -#entry - border-bottom: 1px dashed $base04 - padding: .75em - &:selected - background-color: $base0D diff --git a/nixos/environments/hyprland/colord.nix b/nixos/environments/hyprland/colord.nix deleted file mode 100644 index 82411e7a..00000000 --- a/nixos/environments/hyprland/colord.nix +++ /dev/null @@ -1,3 +0,0 @@ -_: { - services.colord.enable = true; -} diff --git a/nixos/environments/hyprland/gnome-keyring.nix b/nixos/environments/hyprland/gnome-keyring.nix deleted file mode 100644 index 18644217..00000000 --- a/nixos/environments/hyprland/gnome-keyring.nix +++ /dev/null @@ -1,3 +0,0 @@ -_: { - services.gnome.gnome-keyring.enable = true; -} diff --git a/nixos/environments/hyprland/hyprland.nix b/nixos/environments/hyprland/hyprland.nix deleted file mode 100644 index 8250c4f8..00000000 --- a/nixos/environments/hyprland/hyprland.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - pkgs, - inputs, - ... -}: { - programs.hyprland = { - enable = true; - package = inputs.hyprland.packages.${pkgs.system}.hyprland; - }; - - services.xserver = { - enable = true; - displayManager.gdm.enable = true; - }; -} diff --git a/nixos/environments/hyprland/profile-inheritance.nix b/nixos/environments/hyprland/profile-inheritance.nix deleted file mode 100644 index 140771c4..00000000 --- a/nixos/environments/hyprland/profile-inheritance.nix +++ /dev/null @@ -1,9 +0,0 @@ -{tree, ...}: { - imports = with tree.nixos.profiles; [ - graphical - ]; - - home-manager.users.kat.imports = with tree.home.environments; [ - hyprland - ]; -} diff --git a/nixos/environments/hyprland/xdg-portals.nix b/nixos/environments/hyprland/xdg-portals.nix deleted file mode 100644 index 34ea31b4..00000000 --- a/nixos/environments/hyprland/xdg-portals.nix +++ /dev/null @@ -1,10 +0,0 @@ -{pkgs, ...}: { - xdg = { - portal = { - enable = true; - extraPortals = with pkgs; [ - xdg-desktop-portal-wlr - ]; - }; - }; -}