diff --git a/nixos-apps/crueltysquad.com.nix b/nixos-apps/crueltysquad.com.nix index 3667ed5..5dac602 100644 --- a/nixos-apps/crueltysquad.com.nix +++ b/nixos-apps/crueltysquad.com.nix @@ -3,7 +3,7 @@ enable = true; virtualHosts = { "crueltysquad.com" = { - serverAliases = [ "www.crueltysquad.com" ]; + serverAliases = ["www.crueltysquad.com"]; extraConfig = '' redir https://store.steampowered.com/app/1388770/Cruelty_Squad/ ''; diff --git a/nixos-apps/cutesealfanpage.love.nix b/nixos-apps/cutesealfanpage.love.nix index 78d4342..aada46d 100644 --- a/nixos-apps/cutesealfanpage.love.nix +++ b/nixos-apps/cutesealfanpage.love.nix @@ -1,14 +1,11 @@ -{ pkgs, ... }: - -let +{pkgs, ...}: let PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/cutesealfanpage.love"; -in -{ +in { services.caddy = { enable = true; virtualHosts = { "cutesealfanpage.love" = { - serverAliases = [ "www.cutesealfanpage.love" ]; + serverAliases = ["www.cutesealfanpage.love"]; extraConfig = '' root * ${PROJECT_ROOT}/_site file_server @@ -21,7 +18,7 @@ in cutesealfanpage-hakyll-site = { enable = true; description = "The hakyll executable that rebuilds the site when a new blog post is created."; - path = with pkgs; [ nix git ]; + path = with pkgs; [nix git]; script = '' cd ${PROJECT_ROOT} nix run .#hakyll-site -- watch --no-server @@ -32,7 +29,7 @@ in enable = true; description = "The haskell script that creates the new post of the day."; startAt = "08:12:42"; - path = with pkgs; [ nix git ]; + path = with pkgs; [nix git]; script = '' cd ${PROJECT_ROOT} nix run .#generateSealPosts diff --git a/nixos-apps/ewanick.com.nix b/nixos-apps/ewanick.com.nix index ecda702..37ade7c 100644 --- a/nixos-apps/ewanick.com.nix +++ b/nixos-apps/ewanick.com.nix @@ -1,17 +1,14 @@ -{ pkgs, ... }: - -let +{pkgs, ...}: let PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/ewanick.com"; PORT = "5567"; HOST = "localhost"; emanote-version = "1.2.0"; -in -{ +in { services.caddy = { enable = true; virtualHosts = { "ewanick.com" = { - serverAliases = [ "www.ewanick.com" ]; + serverAliases = ["www.ewanick.com"]; extraConfig = '' reverse_proxy ${HOST}:${PORT} ''; diff --git a/nixos-apps/ewanick.com/index.md b/nixos-apps/ewanick.com/index.md index f32b885..4338efa 100644 --- a/nixos-apps/ewanick.com/index.md +++ b/nixos-apps/ewanick.com/index.md @@ -7,10 +7,10 @@ - Haskell disciple - Polyglot programmer familiar with everything, from Ada to Zig. -Software developer for hire. -Contact me for contract work at `@.com` -See what I'm currently tinkering with at: +Software developer for hire.\ +Contact me for contract work at `@.com`\ +See what I'm currently tinkering with at:\ :::{.photoframe-center} -![[profile.jpg]] +!\[[profile.jpg]\] diff --git a/nixos-apps/fancytypist.com.nix b/nixos-apps/fancytypist.com.nix index f4c107f..7f409f7 100644 --- a/nixos-apps/fancytypist.com.nix +++ b/nixos-apps/fancytypist.com.nix @@ -1,23 +1,20 @@ -{ pkgs, ... }: - -let +{pkgs, ...}: let PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/fancyTypist.dev"; HOST = "localhost"; PORT = 12513; -in -{ +in { services.caddy = { enable = true; virtualHosts = { "fancytypist.com" = { - serverAliases = [ "www.fancytypist.com" ]; + serverAliases = ["www.fancytypist.com"]; extraConfig = '' respond "Hello, world! fancytypist.com" ''; }; "fancytypist.ca" = { - serverAliases = [ "www.fancytypist.ca" ]; + serverAliases = ["www.fancytypist.ca"]; extraConfig = '' respond "Hello, world! fancytypist.ca" ''; @@ -36,7 +33,7 @@ in }; "osds.fancytypist.dev" = { - serverAliases = [ "osds.fancytypist.dev" ]; + serverAliases = ["osds.fancytypist.dev"]; extraConfig = '' reverse_proxy ${HOST}:${toString PORT} ''; diff --git a/nixos-apps/git.ewanick.com.nix b/nixos-apps/git.ewanick.com.nix index 265a321..c91a73c 100644 --- a/nixos-apps/git.ewanick.com.nix +++ b/nixos-apps/git.ewanick.com.nix @@ -1,9 +1,7 @@ -{ pkgs, ... }: -let +{pkgs, ...}: let baseUrl = "git.ewanick.com"; PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/git.ewanick.com"; -in -{ +in { services.gitea = { enable = true; appName = "Bill's Gitea server, hosted on Linode using NixOS"; @@ -58,17 +56,16 @@ in virtualisation.docker.enable = true; } - - /* - # README +# README - ## View users and use the command line +## View users and use the command line - Do something like this, preferably as the gitea user +Do something like this, preferably as the gitea user - ```bash - $ sudo su gitea - $ /nix/store/5xwh7m7252m9ljvr3lyilcza1q699r2c-gitea-1.17.4/bin/gitea -c /var/lib/gitea/custom/conf/app.ini admin user list - ``` +```bash +$ sudo su gitea +$ /nix/store/5xwh7m7252m9ljvr3lyilcza1q699r2c-gitea-1.17.4/bin/gitea -c /var/lib/gitea/custom/conf/app.ini admin user list +``` */ + diff --git a/nixos-apps/hydra.fancyTypist.com.nix b/nixos-apps/hydra.fancyTypist.com.nix index 22dc8bf..ef98ea4 100644 --- a/nixos-apps/hydra.fancyTypist.com.nix +++ b/nixos-apps/hydra.fancyTypist.com.nix @@ -2,14 +2,13 @@ let baseUrl = "hydra.fancyTypist.com"; HOST = "localhost"; PORT = 8246; -in -{ +in { services.hydra = { enable = false; port = PORT; hydraURL = "https://${HOST}:${toString PORT}"; notificationSender = "hydra@fancyTypist.com"; - buildMachinesFiles = [ ]; + buildMachinesFiles = []; useSubstitutes = true; }; diff --git a/nixos-apps/paperless.ewanick.com.nix b/nixos-apps/paperless.ewanick.com.nix index 45fbeee..cc34b70 100644 --- a/nixos-apps/paperless.ewanick.com.nix +++ b/nixos-apps/paperless.ewanick.com.nix @@ -1,20 +1,18 @@ # Currently disabled, having issues starting -{ pkgs, ... }: -let +{pkgs, ...}: let baseUrl = "paperless.ewanick.com"; HOST = "localhost"; PORT = 28981; -in -{ +in { services.paperless = { enable = true; address = HOST; port = PORT; passwordFile = "/run/keys/paperless-password"; }; - systemd.services.paperless-scheduler.after = [ "var-lib-paperless.mount" ]; - systemd.services.paperless-consumer.after = [ "var-lib-paperless.mount" ]; - systemd.services.paperless-web.after = [ "var-lib-paperless.mount" ]; + systemd.services.paperless-scheduler.after = ["var-lib-paperless.mount"]; + systemd.services.paperless-consumer.after = ["var-lib-paperless.mount"]; + systemd.services.paperless-web.after = ["var-lib-paperless.mount"]; services.caddy = { enable = true; diff --git a/server-config/configuration.nix b/server-config/configuration.nix index 7095ac6..7ea12fa 100644 --- a/server-config/configuration.nix +++ b/server-config/configuration.nix @@ -1,16 +1,13 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). - { inputs, config, pkgs, lib, ... -}: - -{ +}: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix @@ -30,7 +27,7 @@ # This will add each flake input as a registry # To make nix3 commands consistent with your flake - registry = lib.mapAttrs (_: value: { flake = value; }) inputs; + registry = lib.mapAttrs (_: value: {flake = value;}) inputs; # This will additionally add your inputs to the system's legacy channels # Making legacy nix commands consistent as well, awesome! @@ -82,9 +79,9 @@ packages = with pkgs; [ tldr ]; - hashedPassword = "$y$j9T$7AufeqRXQaD9CxeBmwBUt0$.qNf/QdO5BGc0peHvHzDQqs1B48D0pYw9PhIDzcYAK8"; + hashedPassword = "$y$j9T$7AufeqRXQaD9CxeBmwBUt0$.qNf/QdO5BGc0peHvHzDQqs1B48D0pYw9PhIDzcYAK8"; # cspell:disable-line openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGzXqcOu6/EjS60Ke55w4hj//lY6u3S1DYPoSd7yjdR3 alice@foobar" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGzXqcOu6/EjS60Ke55w4hj//lY6u3S1DYPoSd7yjdR3 alice@foobar" # cspell:disable-line ]; }; diff --git a/server-config/hardware-configuration.nix b/server-config/hardware-configuration.nix index 8a9961f..f177ce5 100644 --- a/server-config/hardware-configuration.nix +++ b/server-config/hardware-configuration.nix @@ -1,19 +1,23 @@ # 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 + "/profiles/qemu-guest.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/profiles/qemu-guest.nix") + ]; - boot.initrd.availableKernelModules = [ "virtio_pci" "virtio_scsi" "ahci" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["virtio_pci" "virtio_scsi" "ahci" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = []; + boot.extraModulePackages = []; - boot.kernelParams = [ "console=ttyS0,19200n8" ]; + boot.kernelParams = ["console=ttyS0,19200n8"]; boot.loader.grub.extraConfig = '' serial --speed-19200 --unit=0 --word=8 --parity=no --stop=1; terminal_input serial; @@ -24,14 +28,14 @@ boot.loader.grub.device = "nodev"; boot.loader.timeout = 10; - fileSystems."/" = - { device = "/dev/sda"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/sda"; + fsType = "ext4"; + }; - swapDevices = - [ { device = "/dev/sdb"; } - ]; + swapDevices = [ + {device = "/dev/sdb";} + ]; # 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