From e3ddf1cbaa70bcfd084db94bf86ca402a0ed2520 Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Wed, 20 Sep 2023 22:17:52 +0200 Subject: [PATCH] refactor --- hosts/yodaTab/configuration.nix | 1 + hosts/yodaTux/configuration.nix | 1 + hosts/yodaYoga/configuration.nix | 1 + modules/programs.nix | 1 - modules/veracrypt.nix | 15 +++++++++++++++ 5 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 modules/veracrypt.nix diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix index 91c269d..a7d4339 100644 --- a/hosts/yodaTab/configuration.nix +++ b/hosts/yodaTab/configuration.nix @@ -52,6 +52,7 @@ in ../../modules/journalwatch.nix #../../modules/waydroid.nix ../../modules/ntfs.nix + #../../modules/veracrypt.nix ]; networking.hostName = "yodaTab"; diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix index bf96885..5546af6 100644 --- a/hosts/yodaTux/configuration.nix +++ b/hosts/yodaTux/configuration.nix @@ -52,6 +52,7 @@ in ../../modules/journalwatch.nix #../../modules/waydroid.nix ../../modules/ntfs.nix + #../../modules/veracrypt.nix ]; networking.hostName = "yodaTux"; diff --git a/hosts/yodaYoga/configuration.nix b/hosts/yodaYoga/configuration.nix index 55f0728..ec3cc17 100644 --- a/hosts/yodaYoga/configuration.nix +++ b/hosts/yodaYoga/configuration.nix @@ -54,6 +54,7 @@ in ../../modules/journalwatch.nix #../../modules/waydroid.nix #../../modules/ntfs.nix + #../../modules/veracrypt.nix ]; networking.hostName = "yodaYoga"; diff --git a/modules/programs.nix b/modules/programs.nix index 0031279..991afd8 100644 --- a/modules/programs.nix +++ b/modules/programs.nix @@ -41,7 +41,6 @@ tor-browser-bundle-bin # Tor web browser keepassxc # Password manager freetube # YouTube client - veracrypt # Encrypted filesystem joplin-desktop # Markdown notes rnote # Handwritten notes xournalpp # Handwritte notes diff --git a/modules/veracrypt.nix b/modules/veracrypt.nix new file mode 100644 index 0000000..80ca52e --- /dev/null +++ b/modules/veracrypt.nix @@ -0,0 +1,15 @@ +{ config, pkgs, ... }: + +{ + # Looks as if TrueCrypt is unfree software + # https://github.com/NixOS/nixpkgs/blob/5d017a8822e0907fb96f7700a319f9fe2434de02/pkgs/applications/misc/veracrypt/default.nix#L59 + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "veracrypt" + ]; + + users.users.yoda = { + packages = with pkgs; [ + veracrypt # Encrypted filesystem + ]; + }; +}