flake.lock

@@ -421,7 +421,8 @@
         "nixpkgs-rust-analyzer": "nixpkgs-rust-analyzer",
         "nixpkgs-stable": "nixpkgs-stable",
         "nur": "nur",
-        "sops": "sops"
+        "sops": "sops",
+        "veracrypt": "veracrypt"
       }
     },
     "rust-analyzer-src": {
@@ -544,6 +545,22 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "veracrypt": {
+      "locked": {
+        "lastModified": 1696681798,
+        "narHash": "sha256-tvga08j8IOHrRbEnqJDc6bzO4la5i7ywf23kLs8W0OY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2bbbf414fed6ab89cd971f5645da692dad6d9420",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "2bbbf414fed6ab89cd971f5645da692dad6d9420",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -1,10 +1,27 @@
 {
   description = "NixOS configuration with flakes";
-  outputs = { alejandra, cryptpad, darwin, disko, endless-sky, flake-compat
+  outputs = {
-    , flake-utils, helix, home-manager, nil, nix-ld, nixos-hardware
+    alejandra,
-    , nixpkgs-master, nixpkgs-nixos-unstable, nixpkgs-rust-analyzer
+    cryptpad,
-    , nixpkgs-stable, nur, self, sops, }@inputs:
+    darwin,
-    let
+    disko,
+    endless-sky,
+    flake-compat,
+    flake-utils,
+    helix,
+    home-manager,
+    nil,
+    nix-ld,
+    nixos-hardware,
+    nixpkgs-master,
+    nixpkgs-nixos-unstable,
+    nixpkgs-rust-analyzer,
+    nixpkgs-stable,
+    nur,
+    self,
+    sops,
+    veracrypt,
+  } @ inputs: let
     mkServer = pkgs: system: hostname:
       pkgs.lib.nixosSystem {
         inherit system;
@@ -23,8 +40,10 @@
     mkRaspi = pkgs: hostname:
       pkgs.lib.nixosSystem {
         system = "aarch64-linux";
-          modules =
+        modules = [
-            [ (./. + "/nixos/boxes/${hostname}") sops.nixosModules.sops ];
+          (./. + "/nixos/boxes/${hostname}")
+          sops.nixosModules.sops
+        ];
         specialArgs = {inherit inputs;};
       };
     mkKiosk = pkgs: system: hostname:
@@ -40,8 +59,7 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.cyryl = {
-                imports =
+              imports = [./nixos/home-manager ./nixos/home-manager/linux.nix];
-                  [ ./nixos/home-manager ./nixos/home-manager/linux.nix ];
               _module.args.inputs = inputs;
               _module.args.system = system;
             };
@@ -75,8 +93,7 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.cyryl = {
-                imports =
+              imports = [./nixos/home-manager ./nixos/home-manager/linux.nix];
-                  [ ./nixos/home-manager ./nixos/home-manager/linux.nix ];
               _module.args.inputs = inputs;
               _module.args.system = system;
             };
@@ -88,17 +105,23 @@
             inherit system;
             config = {allowUnfree = true;};
           };
-            nixpkgs-nixos-unstable =
+          nixpkgs-nixos-unstable = import nixpkgs-nixos-unstable {
-              import nixpkgs-nixos-unstable { inherit system; };
+            inherit system;
+          };
           nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable {
             inherit system;
             config = {allowUnfree = true;};
           };
+          nixpkgs-veracrypt = import veracrypt {
+            inherit system;
+            config = {allowUnfree = true;};
+          };
         };
       };
-      mkShell = packageSet: system:
+    mkShell = packageSet: system: let
-        let pkgs = packageSet.legacyPackages.${system};
+      pkgs = packageSet.legacyPackages.${system};
-        in pkgs.mkShell {
+    in
+      pkgs.mkShell {
         packages = with pkgs; [
           inputs.alejandra.defaultPackage.${system}
           cacert
@@ -164,8 +187,7 @@
           (import
             "${inputs.nixpkgs-stable}/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix")
           {
-              environment.systemPackages =
+            environment.systemPackages = with nixpkgs-nixos-unstable.legacyPackages."aarch64-linux"; [
-                with nixpkgs-nixos-unstable.legacyPackages."aarch64-linux"; [
               neovim
               htop
               btop
@@ -232,6 +254,12 @@
       repo = "nixpkgs";
       ref = "2100c4926200b1ebbee032ad22113597195932f2";
     };
+    veracrypt = {
+      type = "github";
+      owner = "NixOS";
+      repo = "nixpkgs";
+      ref = "2bbbf414fed6ab89cd971f5645da692dad6d9420";
+    };
     nixos-hardware = {
       type = "github";
       owner = "NixOS";
@@ -301,7 +329,9 @@
     };
     cryptpad = {
       url = "github:michaelshmitty/cryptpad-flake";
-      inputs = { nixpkgs.follows = "nixpkgs-stable"; };
+      inputs = {
+        nixpkgs.follows = "nixpkgs-stable";
+      };
     };
     disko = {
       url = "github:nix-community/disko";

nixos/boxes/cupsnet/gitea-runner.nix

@@ -3,13 +3,6 @@ let
   unstable = inputs.nixpkgs-nixos-unstable;
   package = unstable.legacyPackages."${system}".gitea-actions-runner;
 in {
-
-  disabledModules =
-    [ "services/continuous-integration/gitea-actions-runner.nix" ];
-  imports = [
-    "${unstable}/nixos/modules/services/continuous-integration/gitea-actions-runner.nix"
-  ];
-
   sops.secrets."gitea-runner-token" = {
     sopsFile = ./gitea-runner-token.sops;
     format = "binary";

nixos/boxes/foryog/default.nix

@@ -51,7 +51,6 @@
       "vscode-extension-ms-vscode-cpptools"
       "vscode-with-extensions"
       "vscode"
-      "veracrypt"
     ];
 
   home-manager.users.cyryl = { ... }: {

nixos/common.nix

@@ -1,5 +1,12 @@
-{ config, pkgs, lib, inputs, nixpkgs-nixos-unstable-and-unfree, ... }:
+{
-let
+  config,
+  pkgs,
+  lib,
+  inputs,
+  nixpkgs-nixos-unstable-and-unfree,
+  nixpkgs-veracrypt,
+  ...
+}: let
   stateVersion = "23.11";
   username = "cyryl";
 in {
@@ -30,7 +37,7 @@ in {
     tmux
     usbutils
     wget
-    veracrypt
+    nixpkgs-veracrypt.veracrypt
   ];
 
   i18n.defaultLocale = "en_GB.UTF-8";
@@ -54,8 +61,7 @@ in {
     shell = pkgs.zsh;
   };
 
-  networking.nameservers =
+  networking.nameservers = ["9.9.9.9" "2620:fe::fe" "149.112.112.112" "2620:fe::9"];
-    [ "9.9.9.9" "2620:fe::fe" "149.112.112.112" "2620:fe::9" ];
 
   networking.hosts = {"10.11.99.1" = ["remarkable"];};