From 8744d630d2ecad20f824bc8b62861cbc20c0da91 Mon Sep 17 00:00:00 2001 From: Laurent Gueret Date: Sun, 25 Jan 2026 14:21:25 +0100 Subject: [PATCH] Change of named folders and fix configurations --- flake.nix | 11 +++++-- home-manager/.DS_Store | Bin 6148 -> 0 bytes home-manager/configurations/zed.nix | 27 ------------------ home/configuration.nix | 11 +++++++ .../configurations/firefox.nix | 0 .../configurations/ghostty.nix | 0 .../configurations/gnome.nix | 0 {home-manager => home}/home.nix | 1 - .../wallpapers/dark-gray.svg | 0 {home-manager => home}/wallpapers/frappe.svg | 0 {home-manager => home}/wallpapers/latte.svg | 0 .../wallpapers/macchiato.svg | 0 {home-manager => home}/wallpapers/mocha.svg | 0 .../wallpapers/solarized-light.svg | 0 .../wallpapers/solarized.svg | 0 nixos/configuration.nix | 5 ++-- nixos/configurations/home-manager.nix | 12 -------- nixos/{configurations => parts}/kernel.nix | 0 nixos/{configurations => parts}/users.nix | 0 19 files changed, 22 insertions(+), 45 deletions(-) delete mode 100644 home-manager/.DS_Store delete mode 100644 home-manager/configurations/zed.nix create mode 100644 home/configuration.nix rename {home-manager => home}/configurations/firefox.nix (100%) rename {home-manager => home}/configurations/ghostty.nix (100%) rename {home-manager => home}/configurations/gnome.nix (100%) rename {home-manager => home}/home.nix (94%) rename {home-manager => home}/wallpapers/dark-gray.svg (100%) rename {home-manager => home}/wallpapers/frappe.svg (100%) rename {home-manager => home}/wallpapers/latte.svg (100%) rename {home-manager => home}/wallpapers/macchiato.svg (100%) rename {home-manager => home}/wallpapers/mocha.svg (100%) rename {home-manager => home}/wallpapers/solarized-light.svg (100%) rename {home-manager => home}/wallpapers/solarized.svg (100%) delete mode 100644 nixos/configurations/home-manager.nix rename nixos/{configurations => parts}/kernel.nix (100%) rename nixos/{configurations => parts}/users.nix (100%) diff --git a/flake.nix b/flake.nix index b7d1430..04bb2af 100755 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,7 @@ outputs = { nixpkgs, + home-manager, ... }@inputs: let @@ -25,13 +26,19 @@ overlays = import ./overlays { inherit inputs; }; apps = import ./modules/apps; + home = import ./modules/home; nixos = import ./modules/nixos; - home-manager = import ./modules/home; nixosConfigurations = { nixos = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; }; - modules = [ ./nixos/configuration.nix ]; + modules = [ + ./nixos/configuration.nix + ] + ++ [ + home-manager.nixosModules.home-manager + ./home/configuration.nix + ]; }; }; diff --git a/home-manager/.DS_Store b/home-manager/.DS_Store deleted file mode 100644 index 57043a5f8bb3dc10f52b0435c2043e8124a704b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~O-chn5QSgGEP{e$>9X+v0dFu2apBqvXyRXBbV4-fa?a!h^}Xs=%s5LCk*d)B zdaA3sXFf>(0I+&{bplKQOjx9*#(>E^*flD_dsOo=R=C9$8(iXPV4%O~(z_pGi53sI z!Poa+x$p6;X_t$pT`*3NYL?lX8(RW%$GCf3W5y9yc|PvET_|-N?cX6%bL?+J~PKDGk;uO%x9-Rc{r@f8g&o|0=oos z_oYp>|DWmdP7NB{JBI*1XdOB7 d&fK5WW?WUY%c@c2_jGC;1RO|ILEsk%yaSztH-7*C diff --git a/home-manager/configurations/zed.nix b/home-manager/configurations/zed.nix deleted file mode 100644 index 37966a5..0000000 --- a/home-manager/configurations/zed.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - pkgs, - config, - ... -}: -with lib; -let - cfg = config.within.zed; -in -{ - options.within.zed = { - enable = mkEnableOption "System zed service"; - }; - config = mkIf cfg.enable { - home.packages = with pkgs; [ - - # Nix languages parser - nil - nixd - - # Zed Editor - zed-editor - - ]; - }; -} diff --git a/home/configuration.nix b/home/configuration.nix new file mode 100644 index 0000000..662c20a --- /dev/null +++ b/home/configuration.nix @@ -0,0 +1,11 @@ +{ inputs, ... }: + +{ + home-manager.useUserPackages = true; + home-manager.overwriteBackup = true; + home-manager.backupFileExtension = "bak"; + home-manager.extraSpecialArgs = { inherit inputs; }; + home-manager.sharedModules = [ + ./home.nix + ]; +} diff --git a/home-manager/configurations/firefox.nix b/home/configurations/firefox.nix similarity index 100% rename from home-manager/configurations/firefox.nix rename to home/configurations/firefox.nix diff --git a/home-manager/configurations/ghostty.nix b/home/configurations/ghostty.nix similarity index 100% rename from home-manager/configurations/ghostty.nix rename to home/configurations/ghostty.nix diff --git a/home-manager/configurations/gnome.nix b/home/configurations/gnome.nix similarity index 100% rename from home-manager/configurations/gnome.nix rename to home/configurations/gnome.nix diff --git a/home-manager/home.nix b/home/home.nix similarity index 94% rename from home-manager/home.nix rename to home/home.nix index 7db4057..b9e7800 100755 --- a/home-manager/home.nix +++ b/home/home.nix @@ -7,7 +7,6 @@ ./configurations/gnome.nix ./configurations/firefox.nix ./configurations/ghostty.nix - ./configurations/zed.nix ]; nixpkgs = { diff --git a/home-manager/wallpapers/dark-gray.svg b/home/wallpapers/dark-gray.svg similarity index 100% rename from home-manager/wallpapers/dark-gray.svg rename to home/wallpapers/dark-gray.svg diff --git a/home-manager/wallpapers/frappe.svg b/home/wallpapers/frappe.svg similarity index 100% rename from home-manager/wallpapers/frappe.svg rename to home/wallpapers/frappe.svg diff --git a/home-manager/wallpapers/latte.svg b/home/wallpapers/latte.svg similarity index 100% rename from home-manager/wallpapers/latte.svg rename to home/wallpapers/latte.svg diff --git a/home-manager/wallpapers/macchiato.svg b/home/wallpapers/macchiato.svg similarity index 100% rename from home-manager/wallpapers/macchiato.svg rename to home/wallpapers/macchiato.svg diff --git a/home-manager/wallpapers/mocha.svg b/home/wallpapers/mocha.svg similarity index 100% rename from home-manager/wallpapers/mocha.svg rename to home/wallpapers/mocha.svg diff --git a/home-manager/wallpapers/solarized-light.svg b/home/wallpapers/solarized-light.svg similarity index 100% rename from home-manager/wallpapers/solarized-light.svg rename to home/wallpapers/solarized-light.svg diff --git a/home-manager/wallpapers/solarized.svg b/home/wallpapers/solarized.svg similarity index 100% rename from home-manager/wallpapers/solarized.svg rename to home/wallpapers/solarized.svg diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 46b8bf8..6fa9fae 100755 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -10,11 +10,10 @@ # Hardware ./hardware-configuration.nix - ./configurations/kernel.nix + ./parts/kernel.nix # Configurations - ./configurations/users.nix - ./configurations/home-manager.nix + ./parts/users.nix # Modules inputs.self.nixos diff --git a/nixos/configurations/home-manager.nix b/nixos/configurations/home-manager.nix deleted file mode 100644 index bc10d6b..0000000 --- a/nixos/configurations/home-manager.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ inputs, ... }: - -{ - imports = [ inputs.home-manager.nixosModules.home-manager ]; - - home-manager = { - extraSpecialArgs = { inherit inputs; }; - users = { - alistreaza = import ../../home-manager/home.nix; - }; - }; -} diff --git a/nixos/configurations/kernel.nix b/nixos/parts/kernel.nix similarity index 100% rename from nixos/configurations/kernel.nix rename to nixos/parts/kernel.nix diff --git a/nixos/configurations/users.nix b/nixos/parts/users.nix similarity index 100% rename from nixos/configurations/users.nix rename to nixos/parts/users.nix