diff --git a/flake.nix b/flake.nix index b32a542..3f9e0d9 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,6 @@ inputs = { nixpkgs.url = "github:donovanglover/nixpkgs/personal-unstable"; - hyprland = { - url = "github:hyprwm/Hyprland"; - }; - home-manager = { url = "github:donovanglover/home-manager/personal-master"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/hyprland.nix b/home/hyprland.nix index 7a6f01d..6e5d3fd 100644 --- a/home/hyprland.nix +++ b/home/hyprland.nix @@ -205,7 +205,6 @@ in windowrulev2 = nodim,title:^(Picture-in-Picture)$ windowrulev2 = tile,class:^(.qemu-system-x86_64-wrapped)$ windowrulev2 = opacity ${opacity} ${opacity},class:^(thunar)$ - windowrulev2 = bordersize 2,floating:1 # Scroll through existing workspaces with super + scroll bind = $SUPER, mouse_down, workspace, e+1 diff --git a/modules/greetd.nix b/modules/greetd.nix index e9db243..1c1063d 100644 --- a/modules/greetd.nix +++ b/modules/greetd.nix @@ -1,4 +1,4 @@ -{ pkgs, hyprland, ... }: +{ pkgs, ... }: { services.greetd = { @@ -12,7 +12,7 @@ }; initial_session = { - command = "${hyprland.packages.${pkgs.system}.hyprland}/bin/Hyprland"; + command = "${pkgs.hyprland}/bin/Hyprland"; user = "user"; }; }; diff --git a/modules/hyprland.nix b/modules/hyprland.nix index 68cca35..17016f9 100644 --- a/modules/hyprland.nix +++ b/modules/hyprland.nix @@ -1,10 +1,7 @@ -{ pkgs, hyprland, ... }: +{ pkgs, ... }: { - programs.hyprland = { - enable = true; - package = hyprland.packages.${pkgs.system}.hyprland; - }; + programs.hyprland.enable = true; i18n.inputMethod.enabled = "fcitx5"; i18n.inputMethod.fcitx5.addons = [ pkgs.fcitx5-mozc ];