refactoring complete?

This commit is contained in:
Charlie Root 2024-05-21 20:34:31 +02:00
commit 858c6dd88d
7 changed files with 17 additions and 9 deletions

View file

@ -1 +1 @@
_: { imports = [ ./cli ./gui ./tui ./other ./services ./editors ]; }
_: { imports = [ ./cli ./gui ./tui ./other ./services ./editors ./wms ]; }

View file

@ -1 +1 @@
_: { imports = [ ./emacs.nix ]; }
_: { imports = [ ./emacs.nix ./helix.nix ./kakoune.nix ]; }

1
modules/wms/default.nix Normal file
View file

@ -0,0 +1 @@
_: { imports = [ ./wayland ]; }

View file

@ -1,6 +1,10 @@
{ config, pkgs, inputs, ... }: {
imports =
[ inputs.niri.nixosModules.niri ];
;
programs.niri.enable = true;
imports = [
# inputs.niri.nixosModules.niri
./hypr
./variables.nix
];
# programs.niri.enable = true;
}

View file

@ -0,0 +1 @@
_: { imports = [ ./land.nix ]; }

View file

@ -1,7 +1,7 @@
{ config, pkgs, lib, inputs, ... }:
with lib;
let
cfg = config.modules.programs.hyprland;
cfg = config.modules.wms.wayland.hyprland;
username = config.modules.other.system.username;
inherit (inputs.hyprland.packages.${pkgs.system}) hyprland;
inherit (inputs.anyrun.packages.${pkgs.system}) anyrun;
@ -11,7 +11,7 @@ let
inherit (inputs.split-monitor-workspaces.packages.${pkgs.system})
split-monitor-workspaces;
in {
options.modules.programs.hyprland.enable = mkEnableOption "hyprland";
options.modules.wms.wayland.hyprland.enable = mkEnableOption "hyprland";
config = mkIf cfg.enable {
# xdg Portal