From 4673e173015dd90c91f2ad399bc0508f6e8a5234 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Wed, 15 Mar 2023 12:03:15 +0100 Subject: [PATCH] Remove hyprland --- flake.nix | 6 - home-manager/modules/hyprland/default.nix | 240 +++++++++++----------- machines/loki/configuration.nix | 1 - modules/desktop/default.nix | 8 - modules/greetd/default.nix | 4 - modules/nix-common/default.nix | 2 - users/erwin/home.nix | 2 - users/erwin/work.nix | 1 - 8 files changed, 120 insertions(+), 144 deletions(-) diff --git a/flake.nix b/flake.nix index 956e149..c7d35c9 100644 --- a/flake.nix +++ b/flake.nix @@ -52,11 +52,6 @@ inputs.flake-utils.follows = "flake-utils"; }; - hyprland = { - url = "github:Hyprwm/Hyprland"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nil = { url = "github:oxalica/nil"; inputs.nixpkgs.follows = "nixpkgs"; @@ -156,7 +151,6 @@ }) sops.nixosModules.sops inputs.sunshine.nixosModules.sunshine - inputs.hyprland.nixosModules.default ] ++ (nixpkgs.lib.optional (deployConfig != null) { _module.args.nixinate = deployConfig; }) ; }; diff --git a/home-manager/modules/hyprland/default.nix b/home-manager/modules/hyprland/default.nix index 70dd756..4082253 100644 --- a/home-manager/modules/hyprland/default.nix +++ b/home-manager/modules/hyprland/default.nix @@ -1,163 +1,163 @@ -{ pkgs, config, lib, ... }: +{ config, lib, ... }: with lib; let cfg = config.eboskma.programs.hyprland; - terminal = "${pkgs.foot}/bin/footclient"; - dmenu = "${pkgs.rofi}/bin/rofi -show drun -no-lazy-grab"; - menu = "${pkgs.rofi}/bin/rofi -show run -no-lazy-grab"; - rofiPower = pkgs.writeShellScriptBin "rofi-power" (builtins.readFile ../sway/powermenu.sh); - powerMenu = "${rofiPower}/bin/rofi-power"; + # terminal = "${pkgs.foot}/bin/footclient"; + # dmenu = "${pkgs.rofi}/bin/rofi -show drun -no-lazy-grab"; + # menu = "${pkgs.rofi}/bin/rofi -show run -no-lazy-grab"; + # rofiPower = pkgs.writeShellScriptBin "rofi-power" (builtins.readFile ../sway/powermenu.sh); + # powerMenu = "${rofiPower}/bin/rofi-power"; - wallpapers = { - hd = ../sway/wallpapers/river-1920.png; - qhd = ../sway/wallpapers/river-2560.png; - uhd = ../sway/wallpapers/river-3840.png; - }; - swaylockcmd = "${pkgs.swaylock}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --image ${wallpapers.qhd} --scaling fill"; + # wallpapers = { + # hd = ../sway/wallpapers/river-1920.png; + # qhd = ../sway/wallpapers/river-2560.png; + # uhd = ../sway/wallpapers/river-3840.png; + # }; + # swaylockcmd = "${pkgs.swaylock}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --image ${wallpapers.qhd} --scaling fill"; in { options.eboskma.programs.hyprland = { enable = mkEnableOption "Hyprland"; }; config = mkIf cfg.enable { - wayland.windowManager.hyprland = { - enable = true; + # wayland.windowManager.hyprland = { + # enable = true; - extraConfig = '' - monitor = DP-2,2560x1440@165,0x0,1 + # extraConfig = '' + # monitor = DP-2,2560x1440@165,0x0,1 - general { - gaps_out = 10 - } + # general { + # gaps_out = 10 + # } - decoration { - rounding = 5 - inactive_opacity = 0.9 - dim_inactive = true - dim_strength = 0.5 - } + # decoration { + # rounding = 5 + # inactive_opacity = 0.9 + # dim_inactive = true + # dim_strength = 0.5 + # } - animations { - animation = workspaces,1,3,default - animation = windows,1,3,default - animation = windowsOut,1,3,default - } + # animations { + # animation = workspaces,1,3,default + # animation = windows,1,3,default + # animation = windowsOut,1,3,default + # } - input { - kb_layout = us - kb_options = lv3:ralt_switch,eurosign:5 - natural_scroll = true - } + # input { + # kb_layout = us + # kb_options = lv3:ralt_switch,eurosign:5 + # natural_scroll = true + # } - misc { - no_vfr = false - focus_on_activate = false - } + # misc { + # no_vfr = false + # focus_on_activate = false + # } - binds { - workspace_back_and_forth = true - } + # binds { + # workspace_back_and_forth = true + # } - $mod = SUPER + # $mod = SUPER - bind = $mod,Return,exec,${terminal} - bind = $mod_SHIFT,Q,killactive - bind = $mod,S,exec,${dmenu} - bind = $mod_SHIFT,S,exec,${menu} + # bind = $mod,Return,exec,${terminal} + # bind = $mod_SHIFT,Q,killactive + # bind = $mod,S,exec,${dmenu} + # bind = $mod_SHIFT,S,exec,${menu} - bind = $mod,N,movefocus,l - bind = $mod,E,movefocus,d - bind = $mod,I,movefocus,u - bind = $mod,O,movefocus,r + # bind = $mod,N,movefocus,l + # bind = $mod,E,movefocus,d + # bind = $mod,I,movefocus,u + # bind = $mod,O,movefocus,r - bind = $mod_SHIFT,N,movewindow,l - bind = $mod_SHIFT,E,movewindow,d - bind = $mod_SHIFT,O,movewindow,r - bind = $mod_SHIFT,I,movewindow,u + # bind = $mod_SHIFT,N,movewindow,l + # bind = $mod_SHIFT,E,movewindow,d + # bind = $mod_SHIFT,O,movewindow,r + # bind = $mod_SHIFT,I,movewindow,u - bind = $mod_SHIFT,Space,togglefloating,active + # bind = $mod_SHIFT,Space,togglefloating,active - bind = $mod,T,fullscreen,0 - bind = $mod_SHIFT,T,fullscreen,1 + # bind = $mod,T,fullscreen,0 + # bind = $mod_SHIFT,T,fullscreen,1 - bind = $mod,1,workspace,1 - bind = $mod,2,workspace,2 - bind = $mod,3,workspace,3 - bind = $mod,4,workspace,4 - bind = $mod,5,workspace,5 - bind = $mod,6,workspace,6 - bind = $mod,7,workspace,7 - bind = $mod,8,workspace,8 - bind = $mod,9,workspace,9 - bind = $mod,0,workspace,10 + # bind = $mod,1,workspace,1 + # bind = $mod,2,workspace,2 + # bind = $mod,3,workspace,3 + # bind = $mod,4,workspace,4 + # bind = $mod,5,workspace,5 + # bind = $mod,6,workspace,6 + # bind = $mod,7,workspace,7 + # bind = $mod,8,workspace,8 + # bind = $mod,9,workspace,9 + # bind = $mod,0,workspace,10 - bind = $mod_SHIFT,1,movetoworkspacesilent,1 - bind = $mod_SHIFT,2,movetoworkspacesilent,2 - bind = $mod_SHIFT,3,movetoworkspacesilent,3 - bind = $mod_SHIFT,4,movetoworkspacesilent,4 - bind = $mod_SHIFT,5,movetoworkspacesilent,5 - bind = $mod_SHIFT,6,movetoworkspacesilent,6 - bind = $mod_SHIFT,7,movetoworkspacesilent,7 - bind = $mod_SHIFT,8,movetoworkspacesilent,8 - bind = $mod_SHIFT,9,movetoworkspacesilent,9 - bind = $mod_SHIFT,0,movetoworkspacesilent,10 + # bind = $mod_SHIFT,1,movetoworkspacesilent,1 + # bind = $mod_SHIFT,2,movetoworkspacesilent,2 + # bind = $mod_SHIFT,3,movetoworkspacesilent,3 + # bind = $mod_SHIFT,4,movetoworkspacesilent,4 + # bind = $mod_SHIFT,5,movetoworkspacesilent,5 + # bind = $mod_SHIFT,6,movetoworkspacesilent,6 + # bind = $mod_SHIFT,7,movetoworkspacesilent,7 + # bind = $mod_SHIFT,8,movetoworkspacesilent,8 + # bind = $mod_SHIFT,9,movetoworkspacesilent,9 + # bind = $mod_SHIFT,0,movetoworkspacesilent,10 - bind = $mod_SHIFT,Minus,movetoworkspacesilent,special - bind = $mod,Minus,togglespecialworkspace + # bind = $mod_SHIFT,Minus,movetoworkspacesilent,special + # bind = $mod,Minus,togglespecialworkspace - bind = $mod_SHIFT,C,exec,${config.wayland.windowManager.hyprland.package}/bin/hyprctl reload + # bind = $mod_SHIFT,C,exec,${config.wayland.windowManager.hyprland.package}/bin/hyprctl reload - bind = $mod_SHIFT,F,exec,${powerMenu} - bind = $mod,L,exec,${swaylockcmd} + # bind = $mod_SHIFT,F,exec,${powerMenu} + # bind = $mod,L,exec,${swaylockcmd} - bind = $mod_SHIFT,K,pin + # bind = $mod_SHIFT,K,pin - bind = $mod,Print,exec,${pkgs.grim}/bin/grim - bind = $mod_SHIFT,Print,exec,${pkgs.grim}/bin/grim | ${pkgs.wl-clipboard}/bin/wl-copy -t image/png -f + # bind = $mod,Print,exec,${pkgs.grim}/bin/grim + # bind = $mod_SHIFT,Print,exec,${pkgs.grim}/bin/grim | ${pkgs.wl-clipboard}/bin/wl-copy -t image/png -f - bind = ,XF86AudioRaiseVolume,exec,${pkgs.pamedia}/bin/pamedia up - bind = ,XF86AudioLowerVolume,exec,${pkgs.pamedia}/bin/pamedia down - bind = ,XF86AudioMute,exec,${pkgs.pamedia}/bin/pamedia mute - bind = ,XF86Calculator,exec,${pkgs.gnome.gnome-calculator}/bin/gnome-calculator + # bind = ,XF86AudioRaiseVolume,exec,${pkgs.pamedia}/bin/pamedia up + # bind = ,XF86AudioLowerVolume,exec,${pkgs.pamedia}/bin/pamedia down + # bind = ,XF86AudioMute,exec,${pkgs.pamedia}/bin/pamedia mute + # bind = ,XF86Calculator,exec,${pkgs.gnome.gnome-calculator}/bin/gnome-calculator - bind = $mod,D,exec,${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw + # bind = $mod,D,exec,${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw - bind = $mod,W,togglegroup - bind = $mod,N,changegroupactive,b - bind = $mod,O,changegroupactive,f + # bind = $mod,W,togglegroup + # bind = $mod,N,changegroupactive,b + # bind = $mod,O,changegroupactive,f - bindm = $mod,mouse:272,movewindow - bindm = $mod,mouse:273,resizewindow + # bindm = $mod,mouse:272,movewindow + # bindm = $mod,mouse:273,resizewindow - windowrulev2 = workspace 1,class:^(firefox)$ - windowrulev2 = workspace 2,class:^(foot)$ - windowrulev2 = workspace 3,class:^(emacs)$ + # windowrulev2 = workspace 1,class:^(firefox)$ + # windowrulev2 = workspace 2,class:^(foot)$ + # windowrulev2 = workspace 3,class:^(emacs)$ - exec = ${pkgs.networkmanagerapplet}/bin/nm-applet --indicator + # exec = ${pkgs.networkmanagerapplet}/bin/nm-applet --indicator - exec-once = ${pkgs.swaybg}/bin/swaybg -i ${wallpapers.qhd} -m fill - exec-once = ${config.wayland.windowManager.hyprland.package}/bin/hyprctl setcursor Nordzy-cursors 24 - exec-once = ${pkgs.systemd}/bin/systemctl --user start swaync - exec-once = ${pkgs.systemd}/bin/systemctl --user start fcitx5-daemon - '' + - (lib.optionalString config.eboskma.programs.emacs.enable "bind = $mod,C,exec,${config.eboskma.programs.emacs.package}/bin/emacsclient -c"); - }; + # exec-once = ${pkgs.swaybg}/bin/swaybg -i ${wallpapers.qhd} -m fill + # exec-once = ${config.wayland.windowManager.hyprland.package}/bin/hyprctl setcursor Nordzy-cursors 24 + # exec-once = ${pkgs.systemd}/bin/systemctl --user start swaync + # exec-once = ${pkgs.systemd}/bin/systemctl --user start fcitx5-daemon + # '' + + # (lib.optionalString config.eboskma.programs.emacs.enable "bind = $mod,C,exec,${config.eboskma.programs.emacs.package}/bin/emacsclient -c"); + # }; - systemd.user.services.hypridle = { - Unit = { - Description = "Idle manager for Wayland (Hyprland)"; - Documentation = "man:swayidle(1)"; - PartOf = "graphical-session.target"; - }; + # systemd.user.services.hypridle = { + # Unit = { + # Description = "Idle manager for Wayland (Hyprland)"; + # Documentation = "man:swayidle(1)"; + # PartOf = "graphical-session.target"; + # }; - Service = { - ExecStart = "${pkgs.swayidle}/bin/swayidle -w timeout 900 '${swaylockcmd}' timeout 1200 '${config.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms off' resume '${config.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms on'"; - }; + # Service = { + # ExecStart = "${pkgs.swayidle}/bin/swayidle -w timeout 900 '${swaylockcmd}' timeout 1200 '${config.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms off' resume '${config.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms on'"; + # }; - Install = { - WantedBy = [ "hyprland-session.target" ]; - }; - }; + # Install = { + # WantedBy = [ "hyprland-session.target" ]; + # }; + # }; }; } diff --git a/machines/loki/configuration.nix b/machines/loki/configuration.nix index 29c66a0..144995e 100644 --- a/machines/loki/configuration.nix +++ b/machines/loki/configuration.nix @@ -47,7 +47,6 @@ greetd = { enable = true; sway = true; - hyprland = true; }; libvirtd.enable = true; livebook = { diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 4d74daf..0ab0ecc 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -40,14 +40,6 @@ in swayidle ]; }; - - hyprland = mkIf cfg.wayland { - enable = true; - - # Required when also using the Home Manager module - # See the wiki: https://wiki.hyprland.org/Nix/#modules-mixnmatch - package = null; - }; }; xdg = { diff --git a/modules/greetd/default.nix b/modules/greetd/default.nix index 5eca5d8..1411f6f 100644 --- a/modules/greetd/default.nix +++ b/modules/greetd/default.nix @@ -1,7 +1,6 @@ { pkgs , config , lib -, inputs , ... }: with lib; let @@ -9,13 +8,11 @@ with lib; let style = builtins.replaceStrings [ "{WALLPAPER}" ] [ (builtins.toString ../../home-manager/modules/sway/wallpapers/river-2560.png) ] (builtins.readFile ./greetd.css); - hyprland = inputs.hyprland.packages.${pkgs.system}.hyprland; in { options.eboskma.greetd = { enable = mkEnableOption "enable greetd"; sway = mkEnableOption "sway"; - hyprland = mkEnableOption "hyprland"; }; config = @@ -50,7 +47,6 @@ in "greetd/environments" = { text = concatStringsSep "\n" ([ ] ++ (optional cfg.sway "${pkgs.sway}/bin/sway") - ++ (optional cfg.hyprland "${hyprland}/bin/Hyprland") ++ [ "${pkgs.bash}/bin/bash" ]); user = "greeter"; group = "greeter"; diff --git a/modules/nix-common/default.nix b/modules/nix-common/default.nix index 9842cfb..61b1ef3 100644 --- a/modules/nix-common/default.nix +++ b/modules/nix-common/default.nix @@ -51,14 +51,12 @@ in substituters = [ "https://nix-community.cachix.org" "https://marcus7070.cachix.org" - "https://hyprland.cachix.org" "https://devenv.cachix.org" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "marcus7070.cachix.org-1:JawxHSgnYsgNYJmNqZwvLjI4NcOwrcEZDToWlT3WwXw=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" ]; }; diff --git a/users/erwin/home.nix b/users/erwin/home.nix index f8b6986..57c109d 100644 --- a/users/erwin/home.nix +++ b/users/erwin/home.nix @@ -67,7 +67,6 @@ in signingKeyFormat = "ssh"; }; gpg.enable = true; - hyprland.enable = true; mpd.enable = true; neovim.enable = true; obs-studio.enable = true; @@ -243,7 +242,6 @@ in inputs.emacs-overlay.overlay ]; } - inputs.hyprland.homeManagerModules.default ../../modules/options ] ++ (map (mod: (../../home-manager/modules + "/${mod}")) (builtins.attrNames (builtins.readDir ../../home-manager/modules))); }; diff --git a/users/erwin/work.nix b/users/erwin/work.nix index 8f48680..edeb8ba 100644 --- a/users/erwin/work.nix +++ b/users/erwin/work.nix @@ -204,7 +204,6 @@ in inputs.emacs-overlay.overlay ]; } - inputs.hyprland.homeManagerModules.default ../../modules/options ] ++ (map (mod: (../../home-manager/modules + "/${mod}")) (builtins.attrNames (builtins.readDir ../../home-manager/modules)));