faukah/nichts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactoring complete?

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
hosts/vali/mars/configuration.nix
View file

@ -23,7 +23,7 @@
programs.kdeconnect.enable = true; programs.kdeconnect.enable = true;
programs.dconf.enable = true; programs.dconf.enable = true;
# boot.kernelModules = [ "v4l2loopback" ]; # boot.kernelModules = [ "v4l2loopback" ];
boot.kernelPackages = pkgs.linuxPackages_6_8; boot.kernelPackages = pkgs.linuxPackages_latest;
# boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ]; # boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ];
# services.picom.enable = true; # services.picom.enable = true;
services.emacs.enable = true; services.emacs.enable = true;
@ -67,6 +67,8 @@
enable = true; enable = true;
doom.enable = false; doom.enable = false;
}; };
helix.enable = true;
kakoune.enable = true;
}; };
services = { services = {
pipewire.enable = true; pipewire.enable = true;

2
modules/default.nix
View file

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

2
modules/editors/default.nix
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 ]; }

12
modules/wms/wayland/default.nix
View file

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

1
modules/wms/wayland/hypr/default.nix
View file

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

4
modules/wms/wayland/hypr/land.nix
View file

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