feat: fix issues with the refactoring

This commit is contained in:
Xavier Morel
2025-07-23 18:04:01 +02:00
parent 85fdab6375
commit c2197f5e73
11 changed files with 47 additions and 86 deletions

View File

@@ -8,6 +8,7 @@
options.myHome.bundle.shell.enable = lib.mkEnableOption "enable shell bundle";
config = lib.mkIf config.myHome.bundle.shell.enable {
myHome.programs.nvim.enable = true;
home.packages = with pkgs; [
commitizen
pre-commit

View File

@@ -1,17 +0,0 @@
{
pkgs,
lib,
config,
...
}:
{
options = {
myHome.dotfiles.enable = lib.mkEnableOption "enables dotfiles";
};
config = lib.mkIf config.myHome.dotfiles.enable {
home.file = {
".config/hypr/hyprland.conf".source = ../../dotfiles/hyprland.conf;
};
};
}

View File

@@ -5,19 +5,17 @@
...
}:
{
options.myNixOS.feature.hyprland.enable = lib.mkEnableOption "enables hyprland";
options.myHome.services.hyprland.enable = lib.mkEnableOption "enables hyprland";
config = lib.mkIf config.myNixOS.feature.hyprland.enable {
config = lib.mkIf config.myHome.services.hyprland.enable {
home.file.".config/hypr" = {
source = ../../../dotfiles/hypr;
recursive = true;
};
programs = {
dconf.enable = true;
hyprland.enable = true;
};
environment.systemPackages = with pkgs; [
wayland.windowManager.hyprland.enable = true;
home.packages = with pkgs; [
libnotify
xclip
wl-clipboard
@@ -25,18 +23,17 @@
libnotify
hyprpicker
slurp
swappy
grim
rofi
];
services = {
picom.enable = true;
xserver.enable = true;
};
xdg.portal = {
enable = true;
wlr.enable = true;
extraPortals = [
pkgs.xdg-desktop-portal-gtk
pkgs.xdg-desktop-portal

View File

@@ -12,7 +12,7 @@
FLAKE = "${config.home.homeDirectory}/nixos/";
NH_FLAKE = "${config.home.homeDirectory}/nixos/";
};
systemPackages = map lib.lowPrio [
home.packages = map lib.lowPrio [
pkgs.nh
pkgs.nil
pkgs.nixfmt-rfc-style