diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..2fcd3c2 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,16 @@ +--- +kind: pipeline +type: docker +name: default + +steps: + - name: lint + image: nixos/nix:2.11.1 + commands: + - nix-env -i nixpkgs-fmt + - nixpkgs-fmt --check . +--- +kind: signature +hmac: d481135de9de842e2af6d0cc9729577477c8906d5d862c1a54cf1e57f823f134 + +... diff --git a/hosts/microserver.home.ts.hillion.co.uk/default.nix b/hosts/microserver.home.ts.hillion.co.uk/default.nix index 0670d7b..32a4f0c 100644 --- a/hosts/microserver.home.ts.hillion.co.uk/default.nix +++ b/hosts/microserver.home.ts.hillion.co.uk/default.nix @@ -5,7 +5,7 @@ networking.hostName = "microserver"; networking.domain = "home.ts.hillion.co.uk"; - + imports = [ ../../modules/common/default.nix ../../modules/secrets/tailscale/microserver.home.ts.hillion.co.uk.nix diff --git a/hosts/microserver.parents.ts.hillion.co.uk/default.nix b/hosts/microserver.parents.ts.hillion.co.uk/default.nix index 7403a09..f35e20c 100644 --- a/hosts/microserver.parents.ts.hillion.co.uk/default.nix +++ b/hosts/microserver.parents.ts.hillion.co.uk/default.nix @@ -11,7 +11,7 @@ enable = true; version = 4; }; - + imports = [ ./hardware-configuration.nix ../../modules/common/default.nix diff --git a/hosts/microserver.parents.ts.hillion.co.uk/hardware-configuration.nix b/hosts/microserver.parents.ts.hillion.co.uk/hardware-configuration.nix index 5ae9d65..6cb0846 100644 --- a/hosts/microserver.parents.ts.hillion.co.uk/hardware-configuration.nix +++ b/hosts/microserver.parents.ts.hillion.co.uk/hardware-configuration.nix @@ -5,7 +5,8 @@ { imports = - [ (modulesPath + "/installer/scan/not-detected.nix") + [ + (modulesPath + "/installer/scan/not-detected.nix") ]; boot.initrd.availableKernelModules = [ "xhci_pci" ]; @@ -14,7 +15,8 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; + { + device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; fsType = "ext4"; }; diff --git a/hosts/vm.strangervm.ts.hillion.co.uk/default.nix b/hosts/vm.strangervm.ts.hillion.co.uk/default.nix index 43ef260..204ddc7 100644 --- a/hosts/vm.strangervm.ts.hillion.co.uk/default.nix +++ b/hosts/vm.strangervm.ts.hillion.co.uk/default.nix @@ -5,7 +5,7 @@ networking.hostName = "vm"; networking.domain = "strangervm.ts.hillion.co.uk"; - + imports = [ ../../modules/common/default.nix ../../modules/resilio/default.nix diff --git a/hosts/vm.strangervm.ts.hillion.co.uk/hardware-configuration.nix b/hosts/vm.strangervm.ts.hillion.co.uk/hardware-configuration.nix index 776bd60..5f80c1d 100644 --- a/hosts/vm.strangervm.ts.hillion.co.uk/hardware-configuration.nix +++ b/hosts/vm.strangervm.ts.hillion.co.uk/hardware-configuration.nix @@ -5,7 +5,8 @@ { imports = - [ (modulesPath + "/profiles/qemu-guest.nix") + [ + (modulesPath + "/profiles/qemu-guest.nix") ]; boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; @@ -14,12 +15,14 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/6d59bd4b-439d-4480-897c-4480ea6fbe56"; + { + device = "/dev/disk/by-uuid/6d59bd4b-439d-4480-897c-4480ea6fbe56"; fsType = "ext4"; }; fileSystems."/data" = - { device = "/dev/disk/by-uuid/01a351b8-cf66-4a31-9804-0b4145e69153"; + { + device = "/dev/disk/by-uuid/01a351b8-cf66-4a31-9804-0b4145e69153"; fsType = "btrfs"; }; diff --git a/modules/common/default.nix b/modules/common/default.nix index 3ade4b4..036d72a 100644 --- a/modules/common/default.nix +++ b/modules/common/default.nix @@ -6,7 +6,7 @@ ./ssh.nix ./tailscale.nix ]; - + nix = { settings.experimental-features = [ "nix-command" "flakes" ]; settings = { diff --git a/modules/resilio/default.nix b/modules/resilio/default.nix index 6f39102..93ce5aa 100644 --- a/modules/resilio/default.nix +++ b/modules/resilio/default.nix @@ -3,7 +3,7 @@ { options.resilioFolders = lib.mkOption { type = with lib.types; uniq (listOf attrs); - default = []; + default = [ ]; }; config.services.resilio.sharedFolders = @@ -11,13 +11,14 @@ mkFolder = name: secret: { directory = "${config.services.resilio.directoryRoot}/${name}"; secret = "${secret}"; - knownHosts = []; + knownHosts = [ ]; searchLAN = true; useDHT = true; useRelayServer = true; useSyncTrash = false; useTracker = true; }; - in builtins.map (folder: mkFolder folder.name folder.secret) config.resilioFolders; + in + builtins.map (folder: mkFolder folder.name folder.secret) config.resilioFolders; } diff --git a/modules/reverse-proxy/global.nix b/modules/reverse-proxy/global.nix index 850aea0..4df5c84 100644 --- a/modules/reverse-proxy/global.nix +++ b/modules/reverse-proxy/global.nix @@ -8,7 +8,7 @@ services.caddy = { enable = true; - + virtualHosts."ts.hillion.co.uk".extraConfig = '' reverse_proxy http://10.48.62.14:8080 '';