Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2a413052f7 | |||
| 507560a1d4 |
@@ -1,39 +1,48 @@
|
|||||||
{
|
{
|
||||||
hostname,
|
hostname,
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
modulesPath,
|
modulesPath,
|
||||||
user,
|
user,
|
||||||
config,
|
config,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
../../hardware/hardware.nix
|
#../../hardware/hardware.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
|
boot.initrd.availableKernelModules = [
|
||||||
boot.initrd.kernelModules = [ ];
|
"xhci_pci"
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
"nvme"
|
||||||
boot.extraModulePackages = [ ];
|
"usb_storage"
|
||||||
|
"sd_mod"
|
||||||
|
"rtsx_usb_sdmmc"
|
||||||
|
];
|
||||||
|
boot.initrd.kernelModules = [ ];
|
||||||
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" = {
|
||||||
{ device = "/dev/disk/by-uuid/69433a14-fbaf-401b-af85-cd1bbf02b4e2";
|
device = "/dev/disk/by-uuid/69433a14-fbaf-401b-af85-cd1bbf02b4e2";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" = {
|
||||||
{ device = "/dev/disk/by-uuid/811D-0676";
|
device = "/dev/disk/by-uuid/811D-0676";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = [ "fmask=0077" "dmask=0077" ];
|
options = [
|
||||||
};
|
"fmask=0077"
|
||||||
|
"dmask=0077"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
swapDevices =
|
swapDevices = [
|
||||||
[ { device = "/dev/disk/by-uuid/b6c557c2-7682-460b-a5e7-8f6f2f429a3a"; }
|
{ device = "/dev/disk/by-uuid/b6c557c2-7682-460b-a5e7-8f6f2f429a3a"; }
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,6 @@
|
|||||||
|
|
||||||
# Minimal settings that must be defined here
|
# Minimal settings that must be defined here
|
||||||
networking.hostName = "traveldroid";
|
networking.hostName = "traveldroid";
|
||||||
system = "x86_64-linux"; # Define the system explicitly
|
|
||||||
wm.type = "hyprland"; # Define the window manager type here, mangowc will be made possible in the nerar future.
|
wm.type = "hyprland"; # Define the window manager type here, mangowc will be made possible in the nerar future.
|
||||||
# In generated/top.nix the chpice fopr a window manager will be effectuated
|
# In generated/top.nix the chpice fopr a window manager will be effectuated
|
||||||
}
|
}
|
||||||
|
|||||||
+22
-6
@@ -22,22 +22,37 @@
|
|||||||
hyprland.url = "github:hyprwm/Hyprland";
|
hyprland.url = "github:hyprwm/Hyprland";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs@{ nixpkgs, home-manager, emacs-overlay, catppuccin, zen-browser, hyprland, ... }:
|
outputs =
|
||||||
|
inputs@{
|
||||||
|
nixpkgs,
|
||||||
|
home-manager,
|
||||||
|
emacs-overlay,
|
||||||
|
catppuccin,
|
||||||
|
zen-browser,
|
||||||
|
hyprland,
|
||||||
|
...
|
||||||
|
}:
|
||||||
let
|
let
|
||||||
lib = nixpkgs.lib;
|
lib = nixpkgs.lib;
|
||||||
system = lib.system.system;
|
system = "x86_64-linux"; # Define the system explicitly
|
||||||
user = import ./assets/flake/users/henrov.nix;
|
user = import ./assets/flake/users/henrov.nix;
|
||||||
machines = ["traveldroid" "maindroid"];
|
machines = [
|
||||||
|
"traveldroid"
|
||||||
|
"maindroid"
|
||||||
|
];
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
nixosConfigurations = lib.genAttrs machines (machine: lib.nixosSystem {
|
nixosConfigurations = lib.genAttrs machines (
|
||||||
|
machine:
|
||||||
|
lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
modules = [
|
modules = [
|
||||||
# Import machine-specific configurations
|
# Import machine-specific configurations
|
||||||
./assets/flake/machines/${machine}/top.nix
|
./assets/flake/machines/${machine}/top.nix
|
||||||
|
|
||||||
# Home Manager and theme modules
|
# Home Manager and theme modules
|
||||||
home-manager.nixosModules.home-manager {
|
home-manager.nixosModules.home-manager
|
||||||
|
{
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.extraSpecialArgs = { inherit user inputs; };
|
home-manager.extraSpecialArgs = { inherit user inputs; };
|
||||||
@@ -45,7 +60,8 @@
|
|||||||
inputs.catppuccin.nixosModules.catppuccin
|
inputs.catppuccin.nixosModules.catppuccin
|
||||||
];
|
];
|
||||||
specialArgs = { inherit user inputs; };
|
specialArgs = { inherit user inputs; };
|
||||||
});
|
}
|
||||||
|
);
|
||||||
|
|
||||||
devShells.${system}.default = import ./assets/flake/terminal_shell/devshell.nix {
|
devShells.${system}.default = import ./assets/flake/terminal_shell/devshell.nix {
|
||||||
inherit (nixpkgs) mkShell;
|
inherit (nixpkgs) mkShell;
|
||||||
|
|||||||
Reference in New Issue
Block a user