unpin veracrypt as the pr landed

flake.lock

@@ -421,8 +421,7 @@
         "nixpkgs-rust-analyzer": "nixpkgs-rust-analyzer",
         "nixpkgs-stable": "nixpkgs-stable",
         "nur": "nur",
-        "sops": "sops",
-        "veracrypt": "veracrypt"
+        "sops": "sops"
       }
     },
     "rust-analyzer-src": {
@@ -545,22 +544,6 @@
         "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,27 +1,10 @@
 {
   description = "NixOS configuration with flakes";
-  outputs = {
-    alejandra,
-    cryptpad,
-    darwin,
-    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
+  outputs = { alejandra, cryptpad, darwin, 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, }@inputs:
+    let
       mkServer = pkgs: system: hostname:
         pkgs.lib.nixosSystem {
           inherit system;
@@ -30,21 +13,19 @@
             (import ./nixos/server-common.nix)
             sops.nixosModules.sops
             disko.nixosModules.disko
-          ({pkgs, ...}: {
-            nixpkgs.overlays = [inputs.cryptpad.overlays.default];
+            ({ pkgs, ... }: {
+              nixpkgs.overlays = [ inputs.cryptpad.overlays.default ];
             })
             inputs.cryptpad.nixosModules.cryptpad
           ];
-        specialArgs = {inherit inputs system;};
+          specialArgs = { inherit inputs system; };
         };
       mkRaspi = pkgs: hostname:
         pkgs.lib.nixosSystem {
           system = "aarch64-linux";
-        modules = [
-          (./. + "/nixos/boxes/${hostname}")
-          sops.nixosModules.sops
-        ];
-        specialArgs = {inherit inputs;};
+          modules =
+            [ (./. + "/nixos/boxes/${hostname}") sops.nixosModules.sops ];
+          specialArgs = { inherit inputs; };
         };
       mkKiosk = pkgs: system: hostname:
         pkgs.lib.nixosSystem {
@@ -59,7 +40,8 @@
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
               home-manager.users.cyryl = {
-              imports = [./nixos/home-manager ./nixos/home-manager/linux.nix];
+                imports =
+                  [ ./nixos/home-manager ./nixos/home-manager/linux.nix ];
                 _module.args.inputs = inputs;
                 _module.args.system = system;
               };
@@ -69,11 +51,11 @@
             inherit inputs system;
             nixpkgs-nixos-stable-and-unfree = import nixpkgs-stable {
               inherit system;
-            config = {allowUnfree = true;};
+              config = { allowUnfree = true; };
             };
             nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable {
               inherit system;
-            config = {allowUnfree = true;};
+              config = { allowUnfree = true; };
             };
           };
         };
@@ -87,13 +69,14 @@
             sops.nixosModules.sops
             disko.nixosModules.disko
             nix-ld.nixosModules.nix-ld
-          {programs.nix-ld.dev.enable = true;}
+            { programs.nix-ld.dev.enable = true; }
             home-manager.nixosModules.home-manager
             {
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
               home-manager.users.cyryl = {
-              imports = [./nixos/home-manager ./nixos/home-manager/linux.nix];
+                imports =
+                  [ ./nixos/home-manager ./nixos/home-manager/linux.nix ];
                 _module.args.inputs = inputs;
                 _module.args.system = system;
               };
@@ -103,25 +86,19 @@
             inherit inputs system;
             nixpkgs-nixos-stable-and-unfree = import nixpkgs-stable {
               inherit system;
-            config = {allowUnfree = true;};
-          };
-          nixpkgs-nixos-unstable = import nixpkgs-nixos-unstable {
-            inherit system;
+              config = { allowUnfree = true; };
             };
+            nixpkgs-nixos-unstable =
+              import nixpkgs-nixos-unstable { 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;};
+              config = { allowUnfree = true; };
             };
           };
         };
-    mkShell = packageSet: system: let
-      pkgs = packageSet.legacyPackages.${system};
-    in
-      pkgs.mkShell {
+      mkShell = packageSet: system:
+        let pkgs = packageSet.legacyPackages.${system};
+        in pkgs.mkShell {
           packages = with pkgs; [
             inputs.alejandra.defaultPackage.${system}
             cacert
@@ -149,7 +126,7 @@
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
               home-manager.users.cyryl = {
-              imports = [./nixos/home-manager];
+                imports = [ ./nixos/home-manager ];
                 _module.args.inputs = inputs;
                 _module.args.system = system;
               };
@@ -169,12 +146,12 @@
 
         bootstrap = nixpkgs-stable.lib.nixosSystem rec {
           system = "x86_64-linux";
-        modules = [(./. + "/nixos/boxes/bootstrap") sops.nixosModules.sops];
+          modules = [ (./. + "/nixos/boxes/bootstrap") sops.nixosModules.sops ];
           specialArgs = {
             inherit inputs system;
             nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable {
               inherit system;
-            config = {allowUnfree = true;};
+              config = { allowUnfree = true; };
             };
           };
         };
@@ -187,7 +164,8 @@
             (import
               "${inputs.nixpkgs-stable}/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix")
             {
-            environment.systemPackages = with nixpkgs-nixos-unstable.legacyPackages."aarch64-linux"; [
+              environment.systemPackages =
+                with nixpkgs-nixos-unstable.legacyPackages."aarch64-linux"; [
                   neovim
                   htop
                   btop
@@ -219,7 +197,7 @@
               console.earlySetup = true;
             }
           ];
-        specialArgs = {inherit inputs;};
+          specialArgs = { inherit inputs; };
         };
       };
     };
@@ -254,12 +232,6 @@
       repo = "nixpkgs";
       ref = "2100c4926200b1ebbee032ad22113597195932f2";
     };
-    veracrypt = {
-      type = "github";
-      owner = "NixOS";
-      repo = "nixpkgs";
-      ref = "2bbbf414fed6ab89cd971f5645da692dad6d9420";
-    };
     nixos-hardware = {
       type = "github";
       owner = "NixOS";
@@ -329,9 +301,7 @@
     };
     cryptpad = {
       url = "github:michaelshmitty/cryptpad-flake";
-      inputs = {
-        nixpkgs.follows = "nixpkgs-stable";
-      };
+      inputs = { nixpkgs.follows = "nixpkgs-stable"; };
     };
     disko = {
       url = "github:nix-community/disko";

nixos/boxes/foryog/default.nix

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

nixos/common.nix

@@ -1,12 +1,5 @@
-{
-  config,
-  pkgs,
-  lib,
-  inputs,
-  nixpkgs-nixos-unstable-and-unfree,
-  nixpkgs-veracrypt,
-  ...
-}: let
+{ config, pkgs, lib, inputs, nixpkgs-nixos-unstable-and-unfree, ... }:
+let
   stateVersion = "23.11";
   username = "cyryl";
 in {
@@ -37,7 +30,7 @@ in {
     tmux
     usbutils
     wget
-    nixpkgs-veracrypt.veracrypt
+    veracrypt
   ];
 
   i18n.defaultLocale = "en_GB.UTF-8";
@@ -61,9 +54,10 @@ in {
     shell = pkgs.zsh;
   };
 
-  networking.nameservers = ["9.9.9.9" "2620:fe::fe" "149.112.112.112" "2620:fe::9"];
+  networking.nameservers =
+    [ "9.9.9.9" "2620:fe::fe" "149.112.112.112" "2620:fe::9" ];
 
-  networking.hosts = {"10.11.99.1" = ["remarkable"];};
+  networking.hosts = { "10.11.99.1" = [ "remarkable" ]; };
 
   programs.light.enable = true;
   programs.adb.enable = true;
@@ -86,13 +80,13 @@ in {
     enable = true;
     autoPrune.enable = true;
     daemon.settings = {
-      "insecure-registries" = ["vpsfree1.raptor-carp.ts.net:5000"];
+      "insecure-registries" = [ "vpsfree1.raptor-carp.ts.net:5000" ];
     };
   };
 
   fonts.fontconfig = {
     enable = true;
-    defaultFonts.monospace = ["BerkeleyMono Nerd Font"];
+    defaultFonts.monospace = [ "BerkeleyMono Nerd Font" ];
   };
 
   fonts.packages = with pkgs; [
@@ -118,7 +112,7 @@ in {
     '';
   };
 
-  system = {inherit stateVersion;};
+  system = { inherit stateVersion; };
   system.activationScripts.diff = ''
     ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"
   '';