Still GTK looks

This commit is contained in:
2026-03-16 10:18:22 +00:00
parent f7ff114619
commit 06aaf21de1
3 changed files with 62 additions and 58 deletions
+1 -1
View File
@@ -138,6 +138,7 @@ Machine-specific NixOS configurations (e.g., =configuration.nix= for =maindroid=
This section contains the Org blocks for tangling Nix code into the generated folders. This section contains the Org blocks for tangling Nix code into the generated folders.
** =flake.nix= ** =flake.nix=
The Nix flake definition for Droidnix. The Nix flake definition for Droidnix.
#+BEGIN_SRC nix :tangle flake.nix :noweb tangle :mkdirp yes :eval never-html #+BEGIN_SRC nix :tangle flake.nix :noweb tangle :mkdirp yes :eval never-html
@@ -314,7 +315,6 @@ mkShell {
} }
#+END_SRC #+END_SRC
** =generated/out_of_tree/machines/traveldroid/top.nix= ** =generated/out_of_tree/machines/traveldroid/top.nix=
This is the top of the machine hierarchy This is the top of the machine hierarchy
#+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/top.nix :noweb tangle :mkdirp yes :eval never-html #+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/top.nix :noweb tangle :mkdirp yes :eval never-html
+55 -57
View File
@@ -15,7 +15,6 @@
url = "github:catppuccin/nix"; url = "github:catppuccin/nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
zen-browser = { zen-browser = {
url = "github:youwen5/zen-browser-flake"; url = "github:youwen5/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -23,63 +22,62 @@
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
}; };
outputs = outputs =
inputs@{ inputs@{
self, self,
nixpkgs, nixpkgs,
home-manager, home-manager,
emacs-overlay, emacs-overlay,
catppuccin, catppuccin,
zen-browser, zen-browser,
hyprland, hyprland,
... ...
}: }:
let let
lib = nixpkgs.lib; lib = nixpkgs.lib;
system = "x86_64-linux"; system = "x86_64-linux";
user = import ./generated/out_of_tree/users/henrov.nix; user = import ./generated/out_of_tree/users/henrov.nix;
machines = [ machines = [
"traveldroid" "traveldroid"
"maindroid" "maindroid"
]; ];
flakeRoot = ./.; # Define flakeRoot here flakeRoot = ./.; # Define flakeRoot here
in in
{ {
nixosConfigurations = lib.genAttrs machines ( nixosConfigurations = lib.genAttrs machines (
machine: machine:
lib.nixosSystem { lib.nixosSystem {
inherit system; inherit system;
modules = [ modules = [
# Import machine-specific configurations # Import machine-specific configurations
./generated/out_of_tree/machines/traveldroid/top.nix ./generated/out_of_tree/machines/traveldroid/top.nix
# Catppuccin theme module # Catppuccin theme module
inputs.catppuccin.nixosModules.default 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; };
}
);
# Anchoring all the other nixes homeConfigurations = lib.genAttrs (map (machine: "${user.username}@${machine}") machines) (
./generated/top.nix userMachine:
# Home Manager module home-manager.lib.homeManagerConfiguration {
inputs.home-manager.nixosModules.home-manager inherit system;
{ configuration = import ./user.nix { inherit inputs user flakeRoot; };
home-manager.useGlobalPkgs = true; extraSpecialArgs = { inherit user inputs flakeRoot; };
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) ( devShells.${system}.default = import ./generated/out_of_tree/terminal_shell/devshell.nix {
userMachine: inherit (nixpkgs.legacyPackages.${system}) mkShell;
home-manager.lib.homeManagerConfiguration {
inherit system;
configuration = import ./user.nix { inherit inputs user flakeRoot; };
extraSpecialArgs = { inherit user inputs flakeRoot; };
}
);
devShells.${system}.default = import ./generated/out_of_tree/terminal_shell/devshell.nix {
inherit (nixpkgs.legacyPackages.${system}) mkShell;
};
}; };
};
} }
@@ -20,5 +20,11 @@
./networking.nix ./networking.nix
./gtk.nix ./gtk.nix
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
inputs.catppuccin.nixosModules.default
]; ];
catppuccin = {
enable = true;
flavor = "mocha";
};
} }