diff --git a/home/default.nix b/home/default.nix index 263befd..b25b34b 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, inputs, ... }: +{ pkgs, inputs, ... }: { imports = [ # diff --git a/home/hyprland.nix b/home/hyprland.nix index 64e90e9..6f4abfb 100644 --- a/home/hyprland.nix +++ b/home/hyprland.nix @@ -1,4 +1,4 @@ -{ lib, inputs, pkgs, ... }: { +{ lib, pkgs, ... }: { wayland.windowManager.hyprland = { enable = true; #package = pkgs.hyprland-patched; @@ -108,7 +108,6 @@ bind = let alacritty = lib.getExe pkgs.alacritty; - chrome = lib.getExe pkgs.google-chrome; hyprshot = lib.getExe pkgs.hyprshot; wofi = lib.getExe pkgs.wofi; workspaces = ["1" "2" "3" "4" "5" "6" "7" "8" "9"]; diff --git a/home/packages.nix b/home/packages.nix index dd760b2..a0bc2d7 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -1,4 +1,4 @@ -{ pkgs, nixpkgs, home-manager, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ vesktop diff --git a/home/waybar.nix b/home/waybar.nix index 338e004..2da8607 100644 --- a/home/waybar.nix +++ b/home/waybar.nix @@ -1,4 +1,3 @@ -{ config, pkgs, ... }: { programs.waybar = { enable = true; diff --git a/home/wofi.nix b/home/wofi.nix index c0c2eaf..d1a6cec 100644 --- a/home/wofi.nix +++ b/home/wofi.nix @@ -1,4 +1,3 @@ -{ config, pkgs, ... }: { programs.wofi = { enable = true; diff --git a/modules/configuration.nix b/modules/configuration.nix index 6d04bc1..ac2279e 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ pkgs, ... }: { # Bootloader. diff --git a/modules/fingerprint.nix b/modules/fingerprint.nix index f99efcd..04092c9 100644 --- a/modules/fingerprint.nix +++ b/modules/fingerprint.nix @@ -1,4 +1,3 @@ -{ pkgs, ...}: { services.fprintd = { enable = true; diff --git a/modules/hardware-configuration.nix b/modules/hardware-configuration.nix index f51fae9..c8e5730 100644 --- a/modules/hardware-configuration.nix +++ b/modules/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { imports = diff --git a/modules/hyprland.nix b/modules/hyprland.nix deleted file mode 100644 index b893c4c..0000000 --- a/modules/hyprland.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ inputs, pkgs, ... }: - -{ - # Enable Hyprland - programs.hyprland.enable = true; - environment.sessionVariables.NIXOS_OZONE_WL = "1"; - - environment.systemPackages = with pkgs; [ - hyprlock - ]; -} diff --git a/modules/wayland.nix b/modules/wayland.nix index dbaf82c..b3e0bc7 100644 --- a/modules/wayland.nix +++ b/modules/wayland.nix @@ -1,5 +1,4 @@ -{ inputs, pkgs, ... }: { - programs.hyprland.enable = true; +{ pkgs, ... }: { xdg.portal = { enable = true; wlr.enable = true; @@ -7,5 +6,7 @@ extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; + # TODO: I should probably set `xdg.portal.config` or `xdg.portal.configPackages` here, but for now this works... + config.common.default = "*"; }; }