diff --git a/lib/mksystem.nix b/lib/mksystem.nix index 69a99ae..b348416 100644 --- a/lib/mksystem.nix +++ b/lib/mksystem.nix @@ -27,7 +27,16 @@ let HMConfig = ../home; systemPackages = ../modules/packages.nix; specialArgs = { - inherit gamingSystem workSystem enableZram nixvim sops-nix noctalia inputs additionalModules; + inherit + gamingSystem + workSystem + enableZram + nixvim + sops-nix + noctalia + inputs + additionalModules + ; pkgs-unstable = import nixpkgs { inherit system; config.allowUnfree = true; diff --git a/machines/bomba/services/nextcloud.nix b/machines/bomba/services/nextcloud.nix index 9b0196d..be7e972 100644 --- a/machines/bomba/services/nextcloud.nix +++ b/machines/bomba/services/nextcloud.nix @@ -26,7 +26,7 @@ ]; }; }; - # Required to change nextcloud port + # Required to change nextcloud port nginx.virtualHosts."${config.services.nextcloud.hostName}".listen = [ { addr = "127.0.0.1"; diff --git a/machines/bomba/services/vikunja.nix b/machines/bomba/services/vikunja.nix index 63d0680..102f4c4 100644 --- a/machines/bomba/services/vikunja.nix +++ b/machines/bomba/services/vikunja.nix @@ -1,9 +1,9 @@ { ... }: { - services.vikunja = { - enable = true; - port = 8011; - frontendScheme = "http"; - frontendHostname = "vikunja.patrickcanal.it"; - }; + services.vikunja = { + enable = true; + port = 8011; + frontendScheme = "http"; + frontendHostname = "vikunja.patrickcanal.it"; + }; } diff --git a/machines/frog/configuration.nix b/machines/frog/configuration.nix index c1b4811..361ffa5 100644 --- a/machines/frog/configuration.nix +++ b/machines/frog/configuration.nix @@ -2,13 +2,13 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ pkgs, ... }: { - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; + imports = [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/vda"; diff --git a/machines/frog/default.nix b/machines/frog/default.nix index 6f3fc87..0167962 100644 --- a/machines/frog/default.nix +++ b/machines/frog/default.nix @@ -1,6 +1,6 @@ { ... }: { - imports = [ - ./configuration.nix - ]; + imports = [ + ./configuration.nix + ]; } diff --git a/machines/frog/hardware-configuration.nix b/machines/frog/hardware-configuration.nix index eb0c7c2..4ea53d9 100644 --- a/machines/frog/hardware-configuration.nix +++ b/machines/frog/hardware-configuration.nix @@ -1,26 +1,32 @@ # 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, ... }: +{ lib, modulesPath, ... }: { - imports = - [ (modulesPath + "/profiles/qemu-guest.nix") - ]; + imports = [ + (modulesPath + "/profiles/qemu-guest.nix") + ]; - boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ]; + boot.initrd.availableKernelModules = [ + "ahci" + "xhci_pci" + "virtio_pci" + "sr_mod" + "virtio_blk" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/b3a05e5f-6394-4115-b206-8fb51c235067"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/b3a05e5f-6394-4115-b206-8fb51c235067"; + fsType = "ext4"; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/c94fa719-f29a-41bb-8e85-e186fe96846c"; } - ]; + swapDevices = [ + { device = "/dev/disk/by-uuid/c94fa719-f29a-41bb-8e85-e186fe96846c"; } + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } diff --git a/modules/packages.nix b/modules/packages.nix index fa2e833..4fc7483 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -15,7 +15,8 @@ nixpkgs.config.allowUnfree = true; - environment.systemPackages = with pkgs; + environment.systemPackages = + with pkgs; let hostSystem = pkgs.stdenv.hostPlatform.system; basePackages = [ @@ -98,7 +99,7 @@ arrpc cura-appimage heroic - obs-studio + obs-studio openrgb prismlauncher protonplus @@ -132,11 +133,11 @@ ]; in basePackages - ++ guiPackages - ++ gamingPackages - ++ workPackages - ++ plasmaPackages - ++ gnomePackages - ++ niriPackages; + ++ guiPackages + ++ gamingPackages + ++ workPackages + ++ plasmaPackages + ++ gnomePackages + ++ niriPackages; }