From 8c48d4ed8b35d1ac632cc77b4086f5275cf8afb2 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Tue, 23 Jun 2026 15:37:50 +0000 Subject: [PATCH] Trying to add HomeManager --- .../features/desktop/core/editors.nix | 13 +++++++++++++ .../features/desktop/rice/fetch.nix | 4 ++++ .../features/desktop/rice/niri.nix | 1 + modules_dentritic/hosts/common/common.nix | 11 +++++++++++ .../hosts/framework16/configuration.nix | 19 +++++++++++++++---- 5 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 modules_dentritic/features/desktop/core/editors.nix diff --git a/modules_dentritic/features/desktop/core/editors.nix b/modules_dentritic/features/desktop/core/editors.nix new file mode 100644 index 0000000..66fd99b --- /dev/null +++ b/modules_dentritic/features/desktop/core/editors.nix @@ -0,0 +1,13 @@ +{ self, inputs, ... }: +{ + flake.homeModules.zed = { pkgs, lib, ... }: { + programs.zed-editor = { + enable = true; + extensions = [ + "nix" + ]; + tab_size = 2; + }; + }; + +} diff --git a/modules_dentritic/features/desktop/rice/fetch.nix b/modules_dentritic/features/desktop/rice/fetch.nix index baf6c51..8db891e 100644 --- a/modules_dentritic/features/desktop/rice/fetch.nix +++ b/modules_dentritic/features/desktop/rice/fetch.nix @@ -1,6 +1,10 @@ { self, inputs, ... }: { flake.nixosModules.sysFetch = { pkgs, lib, ... }: { + environment.systemPackages = with pkgs; [ fastfetch ]; + }; + + flake.homeModules.sysFetch = { pkgs, lib, ... }: { programs.fastfetch = { enable = true; package = self.packages.${pkgs.stdenv.hostPlatform.system}.myFastfetch; diff --git a/modules_dentritic/features/desktop/rice/niri.nix b/modules_dentritic/features/desktop/rice/niri.nix index 6a28536..b245772 100644 --- a/modules_dentritic/features/desktop/rice/niri.nix +++ b/modules_dentritic/features/desktop/rice/niri.nix @@ -21,6 +21,7 @@ binds = { "Mod+Return".spawn-sh = lib.getExe pkgs.kitty; + "Mod+R".spawn-sh = lib.getExe pkgs.hyprlauncher; "Mod+Q".close-window = {}; }; }; diff --git a/modules_dentritic/hosts/common/common.nix b/modules_dentritic/hosts/common/common.nix index f4e90f9..86f4ddf 100644 --- a/modules_dentritic/hosts/common/common.nix +++ b/modules_dentritic/hosts/common/common.nix @@ -1,9 +1,20 @@ { self, inputs, ... }: { + flake.homeModules.commonHomeConfig = { config, pkgs, inputs, ... }: { + imports = [ + self.homeModules.sysFetch + self.homeModules.zed + ]; + + home.packages = [ pkgs.hello ]; + }; + flake.nixosModules.commonConfig = { config, pkgs, inputs, ...}: { imports = [ self.nixosModules.nixConfig self.nixosModules.kernelConfig + self.nixosModules.utils + self.nixosModules.sysFetch ]; }; } diff --git a/modules_dentritic/hosts/framework16/configuration.nix b/modules_dentritic/hosts/framework16/configuration.nix index e43547c..8f2e95c 100644 --- a/modules_dentritic/hosts/framework16/configuration.nix +++ b/modules_dentritic/hosts/framework16/configuration.nix @@ -4,12 +4,17 @@ modules = [ self.nixosModules.FW16Config inputs.lanzaboote.nixosModules.lanzaboote - + inputs.home-manager.nixosModules.default ]; }; - flake.nixosModules.FW16Config = { config, pkgs, inputs, ...}: - { + flake.homeConfigurations.alex = inputs.home-manager.lib.homeManagerConfiguration { + modules = [ + self.homeModules.commonHomeConfig + ]; + }; + + flake.nixosModules.FW16Config = { config, pkgs, inputs, ...}: { imports = [ self.nixosModules.FW16Hardware self.nixosModules.amd @@ -53,12 +58,18 @@ alex = { isNormalUser = true; description = "Alexandre Delcamp--Enache"; - shell= pkgs.zsh; + shell = pkgs.zsh; extraGroups = [ "networkmanager" "wheel" "video" "render" ]; }; }; }; + home-manager = { + users = { + "alex" = self.homeConfigurations.alex; + }; + }; + programs = { hyprland = { enable = true;