From df56e6bf26aaf8c3efb5b520ca61076bb0fbd65c Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Sat, 14 Mar 2026 13:15:27 +0000 Subject: [PATCH] adwaita issue --- Droidnix/README.org | 147 ++++++++++++++++++------------------------- Droidnix/flake.nix | 148 ++++++++++++++++++-------------------------- 2 files changed, 122 insertions(+), 173 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index 6c725cd9c..d3480c841 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -341,96 +341,71 @@ This section contains the Org blocks for tangling Nix code into the generated fo ** =flake.nix= The Nix flake definition for Droidnix. #+BEGIN_SRC nix :tangle flake.nix :noweb tangle :mkdirp yes :eval never-html -{ - description = "Droidnix: A dendritic NixOS + Home Manager configuration"; +outputs = + inputs@{ + self, + nixpkgs, + home-manager, + emacs-overlay, + catppuccin, + zen-browser, + hyprland, + ... + }: + let + lib = nixpkgs.lib; + system = "x86_64-linux"; + user = import ./assets/flake/users/henrov.nix; + machines = [ + "traveldroid" + "maindroid" + ]; + flakeRoot = ./.; # Define flakeRoot here + in + { + nixosConfigurations = lib.genAttrs machines ( + machine: + lib.nixosSystem { + inherit system; + modules = [ + # Standard NixOS modules + nixpkgs.nixosModules.nixos - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; + # Import machine-specific configurations + ./assets/flake/machines/traveldroid/top.nix + + # Catppuccin theme module + inputs.catppuccin.nixosModules.catppuccin + + # Anchoring all the other nixes + ./generated/top.nix + + # Home Manager module + inputs.home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = { inherit user inputs flakeRoot; }; + } + ]; + specialArgs = { inherit user inputs flakeRoot; }; + } + ); + + homeConfigurations = lib.genAttrs (map (machine: "${user.username}@${machine}") machines) ( + userMachine: + home-manager.lib.homeManagerConfiguration { + inherit system; + configuration = import ./user.nix { inherit inputs user flakeRoot; }; + extraSpecialArgs = { inherit user inputs flakeRoot; }; + } + ); + + devShells.${system}.default = import ./assets/flake/terminal_shell/devshell.nix { + inherit (nixpkgs.legacyPackages.${system}) mkShell; }; - emacs-overlay = { - url = "github:nix-community/emacs-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - catppuccin = { - url = "github:catppuccin/nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - zen-browser = { - url = "github:youwen5/zen-browser-flake"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - hyprland.url = "github:hyprwm/Hyprland"; }; - outputs = - inputs@{ - self, - nixpkgs, - home-manager, - emacs-overlay, - catppuccin, - zen-browser, - hyprland, - ... - }: - let - lib = nixpkgs.lib; - system = "x86_64-linux"; - user = import ./assets/flake/users/henrov.nix; - machines = [ - "traveldroid" - "maindroid" - ]; - flakeRoot = ./.; # Define flakeRoot here - in - { - nixosConfigurations = lib.genAttrs machines ( - machine: - lib.nixosSystem { - inherit system; - modules = [ - - # Standard NixOS modules - nixpkgs.nixosModules.default - - # Import machine-specific configurations - ./assets/flake/machines/traveldroid/top.nix - - # Catppuccin theme module - inputs.catppuccin.nixosModules.catppuccin - - # Anchoring all the other nixes - ./generated/top.nix - - # Home Manager module - inputs.home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit user inputs flakeRoot; }; - } - ]; - specialArgs = { inherit user inputs flakeRoot; }; - } - ); - - homeConfigurations = lib.genAttrs (map (machine: "${user.username}@${machine}") machines) ( - userMachine: - home-manager.lib.homeManagerConfiguration { - inherit system; - configuration = import ./user.nix { inherit inputs user flakeRoot; }; - extraSpecialArgs = { inherit user inputs flakeRoot; }; - } - ); - - devShells.${system}.default = import ./assets/flake/terminal_shell/devshell.nix { - inherit (nixpkgs.legacyPackages.${system}) mkShell; - }; - }; -} #+END_SRC * First the nix-files that flake really needs and that do not fit wel in the hierarchical structure diff --git a/Droidnix/flake.nix b/Droidnix/flake.nix index eb728fcc2..9204ceadd 100644 --- a/Droidnix/flake.nix +++ b/Droidnix/flake.nix @@ -1,90 +1,64 @@ -{ - description = "Droidnix: A dendritic NixOS + Home Manager configuration"; +outputs = + inputs@{ + self, + nixpkgs, + home-manager, + emacs-overlay, + catppuccin, + zen-browser, + hyprland, + ... + }: + let + lib = nixpkgs.lib; + system = "x86_64-linux"; + user = import ./assets/flake/users/henrov.nix; + machines = [ + "traveldroid" + "maindroid" + ]; + flakeRoot = ./.; # Define flakeRoot here + in + { + nixosConfigurations = lib.genAttrs machines ( + machine: + lib.nixosSystem { + inherit system; + modules = [ + # Standard NixOS modules + nixpkgs.nixosModules.nixos - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; + # Import machine-specific configurations + ./assets/flake/machines/traveldroid/top.nix + + # Catppuccin theme module + inputs.catppuccin.nixosModules.catppuccin + + # Anchoring all the other nixes + ./generated/top.nix + + # Home Manager module + inputs.home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = { inherit user inputs flakeRoot; }; + } + ]; + specialArgs = { inherit user inputs flakeRoot; }; + } + ); + + homeConfigurations = lib.genAttrs (map (machine: "${user.username}@${machine}") machines) ( + userMachine: + home-manager.lib.homeManagerConfiguration { + inherit system; + configuration = import ./user.nix { inherit inputs user flakeRoot; }; + extraSpecialArgs = { inherit user inputs flakeRoot; }; + } + ); + + devShells.${system}.default = import ./assets/flake/terminal_shell/devshell.nix { + inherit (nixpkgs.legacyPackages.${system}) mkShell; }; - emacs-overlay = { - url = "github:nix-community/emacs-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - catppuccin = { - url = "github:catppuccin/nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - zen-browser = { - url = "github:youwen5/zen-browser-flake"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - hyprland.url = "github:hyprwm/Hyprland"; }; - - outputs = - inputs@{ - self, - nixpkgs, - home-manager, - emacs-overlay, - catppuccin, - zen-browser, - hyprland, - ... - }: - let - lib = nixpkgs.lib; - system = "x86_64-linux"; - user = import ./assets/flake/users/henrov.nix; - machines = [ - "traveldroid" - "maindroid" - ]; - flakeRoot = ./.; # Define flakeRoot here - in - { - nixosConfigurations = lib.genAttrs machines ( - machine: - lib.nixosSystem { - inherit system; - modules = [ - - # Standard NixOS modules - nixpkgs.nixosModules.default - - # Import machine-specific configurations - ./assets/flake/machines/traveldroid/top.nix - - # Catppuccin theme module - inputs.catppuccin.nixosModules.catppuccin - - # Anchoring all the other nixes - ./generated/top.nix - - # Home Manager module - inputs.home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit user inputs flakeRoot; }; - } - ]; - specialArgs = { inherit user inputs flakeRoot; }; - } - ); - - homeConfigurations = lib.genAttrs (map (machine: "${user.username}@${machine}") machines) ( - userMachine: - home-manager.lib.homeManagerConfiguration { - inherit system; - configuration = import ./user.nix { inherit inputs user flakeRoot; }; - extraSpecialArgs = { inherit user inputs flakeRoot; }; - } - ); - - devShells.${system}.default = import ./assets/flake/terminal_shell/devshell.nix { - inherit (nixpkgs.legacyPackages.${system}) mkShell; - }; - }; -}