working on home manager spreading though the nix files

This commit is contained in:
Julian Sutter 2023-01-23 08:57:22 -08:00
parent 30f378b063
commit 5153dc64f6
4 changed files with 36 additions and 14 deletions

View file

@ -9,14 +9,13 @@
};
};
outputs = { self, nixpkgs, home-manager }: {
outputs = { self, nixpkgs, home-manager, ... }: {
nixosConfigurations = {
framework = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [ ./systems/common.nix
./systems/framework.nix
/etc/nixos/hardware-configuration.nix
./user-jsutter.nix
];
};

View file

@ -3,6 +3,16 @@
{
fileSystems."/" =
{ device = "/dev/disk/by-partlabel/primary";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-partlabel/ESP";
fsType = "vfat";
};
nixpkgs.config.allowUnfree = true;
users.users.jsutter = {

View file

@ -1,11 +1,24 @@
{ config, lib, pkgs, ... }: {
{ config, lib, pkgs, modulesPath, ... }: {
# CPU Stuff
hardware.cpu.amd.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp166s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode = lib.mkDefault
config.hardware.enableRedistributableFirmware;
# From Flakes
boot.kernelParams = [

View file

@ -1,11 +1,11 @@
{ config, pkgs, ... }:
let
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
in
{ config, pkgs, home-manager, ... }:
#let
# home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
#in
{
imports = [
(import "${home-manager}/nixos")
];
# imports = [
# (import "${home-manager}/nixos")
# ];
home-manager.users.jsutter = {
@ -25,10 +25,10 @@ in
};
# Add Firefox GNOME theme directory
home.file."firefox-gnome-theme" = {
target = ".mozilla/firefox/default/chrome/firefox-gnome-theme";
source = (fetchTarball "https://github.com/rafaelmardojai/firefox-gnome-theme/archive/master.tar.gz");
};
# home.file."firefox-gnome-theme" = {
# target = ".mozilla/firefox/default/chrome/firefox-gnome-theme";
# source = (fetchTarball "https://github.com/rafaelmardojai/firefox-gnome-theme/archive/master.tar.gz");
# };
programs.firefox = {
enable = true;