From 5ffd2cdeebffd12701f300ebb059f5eb2235574e Mon Sep 17 00:00:00 2001 From: Aria Nolan Date: Thu, 21 Dec 2023 01:37:09 -0500 Subject: [PATCH] formatted --- flake.nix | 12 +++--- hosts/BICEP/configuration.nix | 4 +- hosts/BICEP/hardware-configuration.nix | 52 ++++++++++++++------------ modules/nixos-common.nix | 15 +++----- users/tacocat/email.nix | 2 +- users/tacocat/programs/firefox.nix | 1 - 6 files changed, 43 insertions(+), 43 deletions(-) diff --git a/flake.nix b/flake.nix index ce555ff..b6cf73a 100644 --- a/flake.nix +++ b/flake.nix @@ -57,11 +57,13 @@ nixosConfigurations."BICEP" = nixpkgs.lib.nixosSystem { inherit system; specialArgs = {inherit inputs;}; - modules = [ - ./hosts/BICEP/configuration.nix - ./modules/nixos-common.nix - {nixpkgs.overlays = overlays;} - ] ++ home-manager-config ./users/tacocat/home.nix; + modules = + [ + ./hosts/BICEP/configuration.nix + ./modules/nixos-common.nix + {nixpkgs.overlays = overlays;} + ] + ++ home-manager-config ./users/tacocat/home.nix; }; # laptop diff --git a/hosts/BICEP/configuration.nix b/hosts/BICEP/configuration.nix index 6e6d20e..b368b3a 100644 --- a/hosts/BICEP/configuration.nix +++ b/hosts/BICEP/configuration.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix diff --git a/hosts/BICEP/hardware-configuration.nix b/hosts/BICEP/hardware-configuration.nix index 5b7997a..500eedf 100644 --- a/hosts/BICEP/hardware-configuration.nix +++ b/hosts/BICEP/hardware-configuration.nix @@ -1,36 +1,40 @@ # 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 = [ "nvme" "xhci_pci" "ahci" "usbhid" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/7204d9a8-ccfd-4fa7-8b94-c791ad80a34f"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/7204d9a8-ccfd-4fa7-8b94-c791ad80a34f"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/AB77-4404"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/AB77-4404"; + fsType = "vfat"; + }; - fileSystems."/mnt/secondary" = - { device = "/dev/disk/by-uuid/7408a47c-4fe5-482f-84f0-fa27d86570fc"; - fsType = "ext4"; - }; + fileSystems."/mnt/secondary" = { + device = "/dev/disk/by-uuid/7408a47c-4fe5-482f-84f0-fa27d86570fc"; + fsType = "ext4"; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/614e4b01-8946-44fc-a4b3-d53499f29a3e"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/614e4b01-8946-44fc-a4b3-d53499f29a3e";} + ]; # 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 diff --git a/modules/nixos-common.nix b/modules/nixos-common.nix index 68b2b30..a2ba87c 100644 --- a/modules/nixos-common.nix +++ b/modules/nixos-common.nix @@ -3,7 +3,6 @@ pkgs, ... }: { - # ------------ System ------------ users.users.tacocat = { @@ -82,7 +81,7 @@ programs.nix-index.enable = true; programs.command-not-found.enable = false; - + # ------------ Software ------------ environment = { @@ -117,11 +116,11 @@ programs.steam.enable = true; programs.steam.remotePlay.openFirewall = true; # programs.steam.gamescopeSession = { - # enable = true; - # args = [ - # "-f" - # "--expose-wayland" - # ]; + # enable = true; + # args = [ + # "-f" + # "--expose-wayland" + # ]; # }; programs.gamemode.enable = true; # programs.gamescope.enable = true; @@ -143,6 +142,4 @@ driSupport = true; driSupport32Bit = true; }; - } - diff --git a/users/tacocat/email.nix b/users/tacocat/email.nix index f89e4e3..02b90e6 100644 --- a/users/tacocat/email.nix +++ b/users/tacocat/email.nix @@ -1,5 +1,5 @@ {...}: { - accounts.email.accounts = { + accounts.email.accounts = { "aria" = { address = "aria@chytrid.org"; userName = "aria@chytrid.org"; diff --git a/users/tacocat/programs/firefox.nix b/users/tacocat/programs/firefox.nix index 640ed80..819f49f 100644 --- a/users/tacocat/programs/firefox.nix +++ b/users/tacocat/programs/firefox.nix @@ -332,5 +332,4 @@ }; }; }; - }