schulze/nix-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wildfire: 169 current 2025-06-18 11:24:29 25.05.20250615.6c64dab 6.15.2 *

Browse Source 
refactor home-manager files and config imports
This commit is contained in:
Felix Schulze
2025-06-18 11:24:32 +02:00
parent 67ada5577d
commit 14c54edd10
8 changed files with 63 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
flake.nix
View File

@ -1,6 +1,27 @@
{
description = "Felix's NixOS configurations";
outputs = inputs @ {
nixpkgs,
home-manager,
...
}: {
nixosConfigurations = {
wildfire = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = [
./hosts/wildfire/configuration.nix
];
};
hurricane = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = [
./hosts/hurricane/configuration.nix
];
};
};
};
inputs = {
# NixOS
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
@ -56,39 +77,4 @@
};
};
};
outputs = inputs @ {
nixpkgs,
home-manager,
...
}: {
nixosConfigurations = {
wildfire = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = [
./hosts/wildfire/configuration.nix
home-manager.nixosModules.home-manager
{
home-manager.backupFileExtension = "backupHM";
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.schulze = import ./modules/home/schulze.nix;
}
];
};
hurricane = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = [
./hosts/hurricane/configuration.nix
home-manager.nixosModules.home-manager
{
home-manager.backupFileExtension = "backupHM";
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.schulze = import ./modules/home/schulze.nix;
}
];
};
};
};
}

4
hosts/hurricane/configuration.nix
View File

@ -1,6 +1,6 @@
{
config,
pkgs,
inputs,
...
}: {
imports = [
@ -9,6 +9,8 @@
../../modules/desktops/hyprland-desktop.nix
../../modules/programs.nix
];
# Extend home-manager configuration with host-specific monitor settings
home-manager.users.schulze.imports = [./hyprland-monitors.nix];
networking.hostName = "hurricane";

7
hosts/hurricane/hyprland-monitors.nix Normal file
View File

@ -0,0 +1,7 @@
{...}: {
# Home Manager Hyprland monitors
wayland.windowManager.hyprland.extraConfig = ''
#monitor = DP-3, 2560x1440@143.97, 1920x-360, auto;
#monitor = HDMI-A-1, 1920x1080@60, 0x0, auto;
'';
}

8
hosts/wildfire/configuration.nix
View File

@ -1,10 +1,16 @@
{pkgs, ...}: {
{
pkgs,
inputs,
...
}: {
imports = [
./hardware-configuration.nix
../../modules/common.nix
../../modules/desktops/hyprland-desktop.nix
../../modules/programs.nix
];
# Extend home-manager configuration with host-specific monitor settings
home-manager.users.schulze.imports = [./hyprland-monitors.nix];
# Encrypted drive
boot.initrd.luks.devices."luks-1728f038-43a6-4e0d-b7dd-19a4c1083605".device = "/dev/disk/by-uuid/1728f038-43a6-4e0d-b7dd-19a4c1083605";

7
hosts/wildfire/hyprland-monitors.nix Normal file
View File

@ -0,0 +1,7 @@
{...}: {
# Home Manager Hyprland monitors
wayland.windowManager.hyprland.extraConfig = ''
monitor = DP-3, 2560x1440@143.97, 1920x-360, auto;
monitor = HDMI-A-1, 1920x1080@60, 0x0, auto;
'';
}

15
modules/common.nix
View File

@ -3,6 +3,21 @@
inputs,
...
}: {
imports = [
inputs.home-manager.nixosModules.home-manager
];
# Home Manager configuration
home-manager = {
backupFileExtension = "backupHM";
useGlobalPkgs = true;
useUserPackages = true;
users.schulze.imports = [
./home/hyprland.nix
./home/home-manager.nix
];
};
# Define the main user account
users = {
users.schulze = {

3
modules/home/home-manager.nix Normal file
View File

@ -0,0 +1,3 @@
{
home.stateVersion = "25.05"; # Dont change
}

10
modules/home/schulze.nix → modules/home/hyprland.nix
View File

@ -1,10 +1,4 @@
{
config,
pkgs,
...
}: {
home.stateVersion = "25.05"; # Dont change
# Hyprland settings
wayland.windowManager.hyprland.enable = true;
wayland.windowManager.hyprland.settings = {
@ -57,8 +51,4 @@
9)
);
};
wayland.windowManager.hyprland.extraConfig = ''
monitor = DP-3, 2560x1440@143.97, 1920x-360, auto;
monitor = HDMI-A-1, 1920x1080@60, 0x0, auto;
'';
}