diff --git a/home/default.nix b/home/default.nix index 6aa1695a..96459931 100644 --- a/home/default.nix +++ b/home/default.nix @@ -10,7 +10,7 @@ ./gpg.nix ./helix.nix ./packages.nix - ./persist.nix + # ./persist.nix ./playerctld.nix ./rofi.nix ./sops.nix diff --git a/home/persist.nix b/home/persist.nix index 9cbc5158..319e38bc 100644 --- a/home/persist.nix +++ b/home/persist.nix @@ -23,12 +23,12 @@ ".config/obsidian" ".config/spotify" ( - lib.mkIf + lib.optionals config.gaming.enable ".local/share/PrismLauncher" ) ( - lib.mkIf + lib.optionals config.gaming.enable ".local/share/Steam" ) diff --git a/hosts/lilith-pad/hardware-configuration.nix b/hosts/lilith-pad/hardware-configuration.nix index 5df571e2..b0225f1a 100644 --- a/hosts/lilith-pad/hardware-configuration.nix +++ b/hosts/lilith-pad/hardware-configuration.nix @@ -1,37 +1,33 @@ # 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") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci"]; + boot.initrd.kernelModules = []; + boot.kernelModules = []; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/080fa116-424e-4079-a2a6-658a230e2721"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/080fa116-424e-4079-a2a6-658a230e2721"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/40E8-A12D"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/40E8-A12D"; + fsType = "vfat"; + }; - swapDevices = [ ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; + swapDevices = []; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/system/users.nix b/system/users.nix index be002336..1074e1ac 100644 --- a/system/users.nix +++ b/system/users.nix @@ -1,4 +1,5 @@ { + lib, conf, config, ... @@ -14,18 +15,21 @@ }; home-manager = { - extraSpecialArgs = inputs // {system-config = config;}; + extraSpecialArgs = { + inherit inputs; + conf = conf; + }; useGlobalPkgs = true; useUserPackages = true; }; home-manager.users = let - hm = {user = [];}; # import ../home; + hm = import ../home; in { ${conf.user} = { imports = hm.user; - # home.username = conf.user; - # home.stateVersion = "24.11"; + home.username = conf.user; + home.stateVersion = "24.11"; }; }; diff --git a/system/zsh.nix b/system/zsh.nix index ad14ac47..6440627e 100644 --- a/system/zsh.nix +++ b/system/zsh.nix @@ -1,4 +1,4 @@ {pkgs, ...}: { - programs.zsh.enable = true; - users.defaultUserShell = pkgs.zsh; + # programs.zsh.enable = true; + # users.defaultUserShell = pkgs.zsh; }