diff --git a/hosts/elderbug/hardware-configuration.nix b/hosts/elderbug/hardware-configuration.nix index f03fed2..95ff1a9 100644 --- a/hosts/elderbug/hardware-configuration.nix +++ b/hosts/elderbug/hardware-configuration.nix @@ -1,29 +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" "ehci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/1abab84b-47d7-45bb-b31d-e5668f545d7f"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/1abab84b-47d7-45bb-b31d-e5668f545d7f"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/1F77-6B2D"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/1F77-6B2D"; + fsType = "vfat"; + }; - swapDevices = [ ]; + 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 diff --git a/hosts/pingbox/configuration.nix b/hosts/pingbox/configuration.nix index 30c536a..fd917ec 100644 --- a/hosts/pingbox/configuration.nix +++ b/hosts/pingbox/configuration.nix @@ -33,10 +33,10 @@ networking = { hostName = "pingbox"; interfaces.wlp170s0.useDHCP = true; - wireless = { - enable = true; - userControlled.enable = true; - }; + wireless = { + enable = true; + userControlled.enable = true; + }; }; services = { diff --git a/modules/backups/bigding/default.nix b/modules/backups/bigding/default.nix index aa68834..21f7114 100644 --- a/modules/backups/bigding/default.nix +++ b/modules/backups/bigding/default.nix @@ -39,7 +39,6 @@ backupPrepareCommand = '' ${pkgs.postgresql_13}/bin/pg_dumpall --clean -U postgres | ${pkgs.zstd}/bin/zstd --rsyncable > /var/backup/pgdump.sql.zst ''; - }; }; } diff --git a/modules/caddy/default.nix b/modules/caddy/default.nix index 2516f39..976cdba 100644 --- a/modules/caddy/default.nix +++ b/modules/caddy/default.nix @@ -14,12 +14,14 @@ })); element = pkgs.element-web.override { - conf = { - default_server_config."m.homeserver" = { - "base_url" = "https://broccoli.town"; - "server_name" = "broccoli.town"; - }; - } // catppuccin; + conf = + { + default_server_config."m.homeserver" = { + "base_url" = "https://broccoli.town"; + "server_name" = "broccoli.town"; + }; + } + // catppuccin; }; in { enable = true; diff --git a/modules/gitea/default.nix b/modules/gitea/default.nix index 8da0145..7c3cfcf 100644 --- a/modules/gitea/default.nix +++ b/modules/gitea/default.nix @@ -28,7 +28,6 @@ repository = { ENABLE_PUSH_CREATE_USER = true; }; - }; }; }; } diff --git a/users/configs/desktop/tofi/default.nix b/users/configs/desktop/tofi/default.nix index fd312f6..c00accd 100644 --- a/users/configs/desktop/tofi/default.nix +++ b/users/configs/desktop/tofi/default.nix @@ -1,5 +1,4 @@ -{pkgs, ...}: -{ +{pkgs, ...}: { home.packages = with pkgs; [ tofi ]; diff --git a/users/configs/system/nvim/default.nix b/users/configs/system/nvim/default.nix index 6a9fdc4..1fbc495 100644 --- a/users/configs/system/nvim/default.nix +++ b/users/configs/system/nvim/default.nix @@ -1,9 +1,15 @@ -{...}: { +{pkgs, ...}: let + nvim = pkgs.fetchgit { + url = "https://git.broccoli.town/dp/nvim"; + sha256 = "sha256-yhbgfKarel8ACIWvIw2fM1qFoZnH8O+5+oNVnMZwdjo="; + }; +in { programs.neovim.enable = true; home.file = { ".config/nvim" = { - source = ./nvim; + recursive = true; + source = nvim; }; }; }