diff --git a/configuration/hosts/default.nix b/configuration/hosts/default.nix index 083b223b..367808a2 100644 --- a/configuration/hosts/default.nix +++ b/configuration/hosts/default.nix @@ -18,7 +18,7 @@ let }; mabon = { ssh.host = "root@192.168.1.218"; - groups = [ "laptop" "personal"]; + groups = [ "laptop" "personal" ]; }; }; pkgs = import { }; diff --git a/configuration/hosts/mabon/configuration.nix b/configuration/hosts/mabon/configuration.nix index 1b93757f..98853b20 100644 --- a/configuration/hosts/mabon/configuration.nix +++ b/configuration/hosts/mabon/configuration.nix @@ -14,14 +14,13 @@ ../../profiles/yubikey ]; - # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; boot.loader.grub.version = 2; boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only networking.hostName = "mabon"; # Define your hostname. - + networking.useDHCP = false; networking.interfaces.enp0s25.useDHCP = true; networking.interfaces.wls3.useDHCP = true; @@ -33,4 +32,3 @@ } - diff --git a/configuration/hosts/mabon/hardware-configuration.nix b/configuration/hosts/mabon/hardware-configuration.nix index 614e4dfa..a164db9b 100644 --- a/configuration/hosts/mabon/hardware-configuration.nix +++ b/configuration/hosts/mabon/hardware-configuration.nix @@ -4,23 +4,29 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ata_piix" "ahci" "firewire_ohci" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.availableKernelModules = [ + "uhci_hcd" + "ehci_pci" + "ata_piix" + "ahci" + "firewire_ohci" + "usb_storage" + "sd_mod" + "sdhci_pci" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/05829271-4036-4d81-85b0-cd8c8197d40f"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/05829271-4036-4d81-85b0-cd8c8197d40f"; + fsType = "ext4"; + }; swapDevices = - [ { device = "/dev/disk/by-uuid/aacb9f81-bc7a-46f9-8cac-04942d078318"; } - ]; + [{ device = "/dev/disk/by-uuid/aacb9f81-bc7a-46f9-8cac-04942d078318"; }]; networking.enableIntel3945ABGFirmware = true; } diff --git a/configuration/hosts/samhain/configuration.nix b/configuration/hosts/samhain/configuration.nix index a907513a..8d4f5f15 100644 --- a/configuration/hosts/samhain/configuration.nix +++ b/configuration/hosts/samhain/configuration.nix @@ -11,7 +11,7 @@ ../../profiles/network ../../profiles/yubikey ]; - + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -35,7 +35,7 @@ rpc-whitelist = "127.0.0.1,192.168.1.*"; }; }; - + services.samba = { enable = true; securityType = "user"; diff --git a/configuration/hosts/samhain/hardware-configuration.nix b/configuration/hosts/samhain/hardware-configuration.nix index 67eab979..2d879d1c 100644 --- a/configuration/hosts/samhain/hardware-configuration.nix +++ b/configuration/hosts/samhain/hardware-configuration.nix @@ -32,12 +32,13 @@ # fsType = "exfat"; # }; - fileSystems."/disks/BigEXT" = - { device = "/dev/disk/by-uuid/f9797766-59d6-4fca-9a2a-7bade7f57291"; - fsType = "ext4"; - }; + fileSystems."/disks/BigEXT" = { + device = "/dev/disk/by-uuid/f9797766-59d6-4fca-9a2a-7bade7f57291"; + fsType = "ext4"; + }; - boot.initrd.luks.devices."mewmapper".device = "/dev/disk/by-uuid/2802caf9-2dd6-4365-a022-f1359911a1db"; + boot.initrd.luks.devices."mewmapper".device = + "/dev/disk/by-uuid/2802caf9-2dd6-4365-a022-f1359911a1db"; swapDevices = [{ device = "/dev/disk/by-uuid/88595373-9566-401b-8c9b-03bbc8314f1b"; }]; diff --git a/configuration/profiles/desktop/default.nix b/configuration/profiles/desktop/default.nix index 79b93952..961f6e51 100644 --- a/configuration/profiles/desktop/default.nix +++ b/configuration/profiles/desktop/default.nix @@ -2,7 +2,9 @@ let nixpkgs-master = import - (fetchTarball "https://github.com/NixOS/nixpkgs/archive/master.tar.gz") { config.allowUnfree = true; }; + (fetchTarball "https://github.com/NixOS/nixpkgs/archive/master.tar.gz") { + config.allowUnfree = true; + }; in { nixpkgs.config = { mumble.speechdSupport = true; }; @@ -61,12 +63,14 @@ in { fonts.fonts = [ pkgs.nerdfonts pkgs.corefonts ]; networking.firewall = { - allowedTCPPortRanges = [ - { from = 1714; to = 1764; } - ]; - allowedUDPPortRanges = [ - { from = 1714; to = 1764; } - ]; + allowedTCPPortRanges = [{ + from = 1714; + to = 1764; + }]; + allowedUDPPortRanges = [{ + from = 1714; + to = 1764; + }]; }; sound.enable = true; diff --git a/configuration/profiles/gaming/default.nix b/configuration/profiles/gaming/default.nix index c207a992..30ea3050 100644 --- a/configuration/profiles/gaming/default.nix +++ b/configuration/profiles/gaming/default.nix @@ -3,5 +3,8 @@ hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ]; hardware.pulseaudio.support32Bit = true; - home-manager.users.kat = { home.packages = [ pkgs.lutris pkgs.steam pkgs.steam-run pkgs.multimc pkgs.obs-studio ]; }; -} \ No newline at end of file + home-manager.users.kat = { + home.packages = + [ pkgs.lutris pkgs.steam pkgs.steam-run pkgs.multimc pkgs.obs-studio ]; + }; +}