flake.lock

@@ -179,6 +179,43 @@
         "url": "https://reciproka.dev/reciproka/hakyll-skeleton/"
       }
     },
+    "lowdown-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1633514407,
+        "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
+        "owner": "kristapsdz",
+        "repo": "lowdown",
+        "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kristapsdz",
+        "repo": "lowdown",
+        "type": "github"
+      }
+    },
+    "nix": {
+      "inputs": {
+        "lowdown-src": "lowdown-src",
+        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-regression": "nixpkgs-regression"
+      },
+      "locked": {
+        "lastModified": 1657886512,
+        "narHash": "sha256-B9EyDUz/9tlcWwf24lwxCFmkxuPTVW7HFYvp0C4xGbc=",
+        "owner": "NixOS",
+        "repo": "nix",
+        "rev": "0b62dab6db3da5b20e62697b14aaaf80f1a2eea6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "2.10.3",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1683408522,
@@ -195,6 +232,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-regression": {
+      "locked": {
+        "lastModified": 1643052045,
+        "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "type": "github"
+      }
+    },
     "nixpkgsUnstable": {
       "locked": {
         "lastModified": 1696019113,
@@ -213,16 +266,32 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1701539137,
+        "lastModified": 1657693803,
-        "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=",
+        "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d",
+        "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-22.05-small",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1699169573,
+        "narHash": "sha256-cvUb1xZkvOp3W2SzylStrTirhVd9zCeo5utJl9nSIhw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "aeefe2054617cae501809b82b44a8e8f7be7cc4b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -289,7 +358,8 @@
       "inputs": {
         "colmena": "colmena",
         "hakyll-skeleton": "hakyll-skeleton",
-        "nixpkgs": "nixpkgs_2",
+        "nix": "nix",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgsUnstable": "nixpkgsUnstable",
         "ragenix": "ragenix",
         "reciproka-web": "reciproka-web",

flake.nix

@@ -19,7 +19,8 @@
       flake = false;
       url = git+https://reciproka.dev/resrok/resrok-web/?ref=consensus;
     };
-    nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-23.11;
+    nix.url = "github:NixOS/nix/?ref=2.10.3";
+    nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-23.05;
     nixpkgsUnstable.url = github:NixOS/nixpkgs/?ref=nixos-unstable;
     utils.url = "github:numtide/flake-utils";
     voc-web = {

nixos/configurations.nix

@@ -2,6 +2,7 @@
   self,
   nixpkgs,
   inputs,
+  nix,
   ...
 }: let
   nixosSystem = nixpkgs.lib.makeOverridable nixpkgs.lib.nixosSystem;

outputs.nix

@@ -4,6 +4,7 @@
   reciproka-web,
   ragenix,
   colmena,
+  nix,
   nixpkgs,
   nixpkgsUnstable,
   resrok-web,
@@ -19,6 +20,7 @@ in {
     ./shell.nix {
       inherit (ragenix.packages."${pkgs.system}") ragenix;
       inherit (colmena.packages."${pkgs.system}") colmena;
+      inherit (nix.packages."${pkgs.system}") nix;
       inherit (nixpkgsUnstable.legacyPackages."${pkgs.system}") alejandra;
     };
 }))

profiles/host_common.nix

@@ -38,14 +38,12 @@
   security.sudo.wheelNeedsPassword = false;
 
   # Configure and install required fonts
-  fonts = {
+  fonts.enableDefaultFonts = true;
-    enableDefaultPackages = true;
+  fonts.fontDir.enable = true;
-    fontDir.enable = true;
+  fonts.fonts = with pkgs; [
-    packages = with pkgs; [
+    powerline-fonts # Required for Powerline prompts
-      powerline-fonts # Required for Powerline prompts
+  ];
-    ];
+  fonts.fontconfig.includeUserConf = false;
-    fontconfig.includeUserConf = false;
-  };
 
   # Adapted from gchristensen and clever
   nix = {

profiles/nix-direnv.nix

@@ -16,11 +16,11 @@
   environment = {
     systemPackages = with pkgs; [
       direnv # A shell extension that manages your environment
-      #nix-direnv # A fast, persistent use_nix implementation for direnv
+      nix-direnv # A fast, persistent use_nix implementation for direnv
+    ];
+    pathsToLink = [
+      "/share/nix-direnv"
     ];
-    #  pathsToLink = [
-    #    "/share/nix-direnv"
-    #  ];
   };
 
   nixpkgs.overlays = [

profiles/reciproka-forgejo.nix

@@ -86,14 +86,6 @@ in {
         };
       }
     ];
-    package = pkgs.postgresql_16;
-  };
-
-  services.postgresqlBackup = {
-    enable = true;
-    compression = "zstd";
-    databases = ["gitea"];
-    startAt = "*-*-* 15:00:00";
   };
 
   services.nginx = {

profiles/users.nix

@@ -19,7 +19,7 @@
     group = "fiscalvelvetpoet";
     extraGroups = ["wheel"];
     # fix this
-    hashedPasswordFile = config.age.secrets.fiscalvelvetpoet.path;
+    passwordFile = config.age.secrets.fiscalvelvetpoet.path;
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJDMAhG6+40YiYy9wqruHK9M2fLwYAqikJSJ/pRjR/so fiscalvelvetpoet@reciproka"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID7qAXTCAnqq+3ks4L8/2f4J8RxmrFaMOCA7m9ImbW2m fiscalvelvetpoet@sealgair"
@@ -28,7 +28,7 @@
 
   users.users.root = {
     # fix this
-    hashedPasswordFile = config.age.secrets.root.path;
+    passwordFile = config.age.secrets.root.path;
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJDMAhG6+40YiYy9wqruHK9M2fLwYAqikJSJ/pRjR/so fiscalvelvetpoet@reciproka"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID7qAXTCAnqq+3ks4L8/2f4J8RxmrFaMOCA7m9ImbW2m fiscalvelvetpoet@sealgair"

shell.nix

@@ -4,6 +4,7 @@
   alejandra,
   mkShell,
   colmena,
+  nix,
 }:
 with pkgs;
   mkShell {
@@ -11,7 +12,7 @@ with pkgs;
       ragenix # CLI management of secrets encrypted via existing SSH keys
       alejandra # The Uncompromising Nix Code Formatter
       colmena # simple, stateless NixOS deployment tool
-      nix # Powerful package manager that makes package management reliable and reproducible
+      nix # Powerful package manager, makes packaging reliable & reproducible
       tea # Gitea official CLI client
       treefmt # one CLI to format the code tree
     ];