From aaf473a0123a8f7dc9ec9af232d78d99697a59eb Mon Sep 17 00:00:00 2001 From: maya Date: Sat, 21 Feb 2026 18:48:43 +0800 Subject: [PATCH] fixed up things --- flake.nix | 22 +++++++++++++++ hosts/fenix/configuration.nix | 37 ++++++++++++++++++++++++++ hosts/fenix/default.nix | 6 +++++ hosts/fenix/hardware-configuration.nix | 37 ++++++++++++++++++++++++++ 4 files changed, 102 insertions(+) create mode 100644 hosts/fenix/configuration.nix create mode 100644 hosts/fenix/default.nix create mode 100644 hosts/fenix/hardware-configuration.nix diff --git a/flake.nix b/flake.nix index bf2566f..080e486 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,28 @@ }; outputs = inputs@{self, nixpkgs, home-manager, ...}:{ + nixosConfigurations."fenix" = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit inputs; }; + modules = [ + ./hosts/fenix + ./variables.nix + { config.var.username = "maya"; + config.var.timezone = "Etc/GMT-8"; }; + home-manager.nixosModules.home-manager { + home-manager.extraSpecialArgs = { + inherit inputs; + vars = { + class = "desktop"; + user = "maya"; + }; + }; + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.maya = ./home; + } + ]; + }; nixosConfigurations."apalapucia" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; diff --git a/hosts/fenix/configuration.nix b/hosts/fenix/configuration.nix new file mode 100644 index 0000000..3322c2f --- /dev/null +++ b/hosts/fenix/configuration.nix @@ -0,0 +1,37 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + boot.kernelPackages = pkgs.linuxPackages_latest; + + services.displayManager.ly = { + enable = true; + settings.animation = "colormix"; + }; + services.xserver.xkb = { + layout = "us"; + variant = ""; + }; + + services.printing.enable = true; + + users.users.${config.var.username} = { + isNormalUser = true; + description = "Maya Wren"; + extraGroups = [ "networkmanager" "wheel" ]; + packages = with pkgs; [ + # thunderbird + ]; + }; + + #system.stateVersion = "25.11"; # Did you read the comment? + +} diff --git a/hosts/fenix/default.nix b/hosts/fenix/default.nix new file mode 100644 index 0000000..cdf9c6e --- /dev/null +++ b/hosts/fenix/default.nix @@ -0,0 +1,6 @@ +{ config, pkgs, ... }:{ + imports = [ + ./configuration.nix + ../generic.nix + ]; +} diff --git a/hosts/fenix/hardware-configuration.nix b/hosts/fenix/hardware-configuration.nix new file mode 100644 index 0000000..c332ea4 --- /dev/null +++ b/hosts/fenix/hardware-configuration.nix @@ -0,0 +1,37 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.blacklistedKernelModules = [ "bcma" "b43" "ssb" "brcmsmac" ]; + boot.kernelParams = [ "radeon.si_support=0" "amdgpu.si_support=1" ]; + services.mbpfan = { + enable = true; + settings.general.max_temp = 70; + settings.general.high_temp = 55; + settings.general.low_temp = 50; + }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/f5f5207a-bade-4201-baf6-19898093c459"; + fsType = "xfs"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/4FB9-0D14"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = [ ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}