From c2197f5e73f7e5041d81683b3130e3f0ac2786f5 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 23 Jul 2025 18:04:01 +0200 Subject: [PATCH] feat: fix issues with the refactoring --- dotfiles/hypr/config/autostart.conf | 2 +- dotfiles/hypr/config/keybinds.conf | 2 +- modules/home-manager/bundles/shell.nix | 1 + modules/home-manager/dotfiles.nix | 17 ------------- modules/home-manager/services/hyprland.nix | 15 +++++------ modules/home-manager/services/nix.nix | 2 +- modules/nixos/cli-environment.nix | 29 ---------------------- modules/nixos/default.nix | 9 +++++++ modules/nixos/{ => features}/fonts.nix | 0 modules/nixos/features/gaming.nix | 28 +++++++++++++++++++++ modules/nixos/gaming.nix | 28 --------------------- 11 files changed, 47 insertions(+), 86 deletions(-) delete mode 100644 modules/home-manager/dotfiles.nix delete mode 100644 modules/nixos/cli-environment.nix rename modules/nixos/{ => features}/fonts.nix (100%) delete mode 100644 modules/nixos/gaming.nix diff --git a/dotfiles/hypr/config/autostart.conf b/dotfiles/hypr/config/autostart.conf index 4bcd323..293a263 100644 --- a/dotfiles/hypr/config/autostart.conf +++ b/dotfiles/hypr/config/autostart.conf @@ -7,7 +7,7 @@ source = ~/.config/hypr/config/defaults.conf # Autostart wiki https://wiki.hyprland.org/0.45.0/Configuring/Keywords/#executing # exec-once = tailscale-systray & exec-once = slack & -exec-once = swaybg -o \* -i ~/.wallpaper.jpg -m fill +# exec-once = swaybg -o \* -i ~/.wallpaper.jpg -m fill exec-once = waybar & exec-once = fcitx5 -d & exec-once = mako & diff --git a/dotfiles/hypr/config/keybinds.conf b/dotfiles/hypr/config/keybinds.conf index 07530c4..5d245c9 100644 --- a/dotfiles/hypr/config/keybinds.conf +++ b/dotfiles/hypr/config/keybinds.conf @@ -46,7 +46,7 @@ bindd = , XF86AudioPrev, Previous track, exec, playerctl previous bindel = , XF86MonBrightnessUp, exec, brightnessctl s +5% #Increases brightness 5% bindel = , XF86MonBrightnessDown, exec, brightnessctl s 5%- #Decreases brightness 5% bindd = $mainMod SHIFT, P, Runs the calculator application, exec, gnome-calculator -bindd = $mainMod SHIFT, L, Lock the screen, exec, swaylock-fancy -e -K -p 10 -f Hack-Regular +bindd = $mainMod SHIFT, L, Lock the screen, exec, swaylock -e -K -p 10 -f Hack-Regular bindd = $mainMod, O, Reload/restarts Waybar, exec, killall -SIGUSR2 waybar # ======= Window Actions ======= diff --git a/modules/home-manager/bundles/shell.nix b/modules/home-manager/bundles/shell.nix index f9b8dc5..2fcf0ae 100644 --- a/modules/home-manager/bundles/shell.nix +++ b/modules/home-manager/bundles/shell.nix @@ -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 diff --git a/modules/home-manager/dotfiles.nix b/modules/home-manager/dotfiles.nix deleted file mode 100644 index a3eed46..0000000 --- a/modules/home-manager/dotfiles.nix +++ /dev/null @@ -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; - }; - }; -} diff --git a/modules/home-manager/services/hyprland.nix b/modules/home-manager/services/hyprland.nix index a4583dd..27c5cde 100644 --- a/modules/home-manager/services/hyprland.nix +++ b/modules/home-manager/services/hyprland.nix @@ -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 diff --git a/modules/home-manager/services/nix.nix b/modules/home-manager/services/nix.nix index 7bfe402..bf95d77 100644 --- a/modules/home-manager/services/nix.nix +++ b/modules/home-manager/services/nix.nix @@ -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 diff --git a/modules/nixos/cli-environment.nix b/modules/nixos/cli-environment.nix deleted file mode 100644 index 6d5c3a7..0000000 --- a/modules/nixos/cli-environment.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: -with lib; -let - cfg = config.services.cli-environment; -in -{ - imports = [ ]; - - options.services.cli-environment = { - enable = mkEnableOption "enable cli-environment"; - }; - - config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ - openssl - nixfmt-rfc-style - nil - ripgrep - fd - clang - ]; - programs.fish.enable = true; - }; -} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index f71c1a5..6248fa7 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -18,6 +18,15 @@ ]; config = { + programs.dconf.enable = true; + programs.hyprland.enable = true; + services.xserver = { + displayManager = { + defaultSession = "hyprland"; + }; + }; + xdg.portal.enable = true; + nix.settings.experimental-features = [ "nix-command" "flakes" diff --git a/modules/nixos/fonts.nix b/modules/nixos/features/fonts.nix similarity index 100% rename from modules/nixos/fonts.nix rename to modules/nixos/features/fonts.nix diff --git a/modules/nixos/features/gaming.nix b/modules/nixos/features/gaming.nix index e69de29..b28e0ec 100644 --- a/modules/nixos/features/gaming.nix +++ b/modules/nixos/features/gaming.nix @@ -0,0 +1,28 @@ +{ + pkgs, + lib, + config, + ... +}: +with lib; +let + cfg = config.services.gaming; +in +{ + imports = [ ]; + + options.services.gaming = { + enable = mkEnableOption "enable gaming"; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + bottles + steam + discord + openttd + ]; + programs.steam.enable = true; + programs.gamemode.enable = true; + }; +} diff --git a/modules/nixos/gaming.nix b/modules/nixos/gaming.nix deleted file mode 100644 index b28e0ec..0000000 --- a/modules/nixos/gaming.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: -with lib; -let - cfg = config.services.gaming; -in -{ - imports = [ ]; - - options.services.gaming = { - enable = mkEnableOption "enable gaming"; - }; - - config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ - bottles - steam - discord - openttd - ]; - programs.steam.enable = true; - programs.gamemode.enable = true; - }; -}