diff --git a/modules/home/home/default.nix b/modules/home/home/default.nix index 827c81e..4df8739 100644 --- a/modules/home/home/default.nix +++ b/modules/home/home/default.nix @@ -5,34 +5,21 @@ ... }: let inherit (lib) mkIf; - inherit (lib.mine) enabled; + inherit (lib.my-namespace) enabled; - imp = config.mine.home.impermanence.enable; + imp = config.my-namespace.home.impermanence.enable; in { config = { home = { packages = with pkgs; [ - dig - duf - du-dust - eltclsh - fzf - idracclient inetutils - jq neofetch + tmux nerdfonts - nodejs_18 p7zip - poppler_utils - pv - qrencode - restic rclone ripgrep - switchssh unzip - yq zip ]; sessionPath = ["$HOME/bin" "$HOME/.local/bin"]; @@ -63,44 +50,10 @@ in { enableBashIntegration = true; nix-direnv = enabled; }; - gpg = { - enable = true; - settings = { - personal-cipher-preferences = "AES256 AES192 AES"; - personal-digest-preferences = "SHA512 SHA384 SHA256"; - personal-compress-preferences = "ZLIB BZIP2 ZIP Uncompressed"; - default-preference-list = "SHA512 SHA384 SHA256 AES256 AES192 AES ZLIB BZIP2 ZIP Uncompressed"; - cert-digest-algo = "SHA512"; - s2k-digest-algo = "SHA512"; - s2k-cipher-algo = "AES256"; - charset = "utf-8"; - fixed-list-mode = true; - no-comments = true; - no-emit-version = true; - no-greeting = true; - keyid-format = "0xlong"; - list-options = "show-uid-validity"; - verify-options = "show-uid-validity"; - with-fingerprint = true; - require-cross-certification = true; - no-symkey-cache = true; - use-agent = true; - throw-keyids = true; - }; - }; home-manager = enabled; }; services = { - gpg-agent = { - enable = true; - enableScDaemon = true; - enableSshSupport = true; - extraConfig = '' - ttyname $GPG_TTY - ''; - defaultCacheTtl = 10800; - maxCacheTtl = 21600; - }; + }; }; } diff --git a/modules/home/stream-tools/default.nix b/modules/home/stream-tools/default.nix index e119547..fa5bdd4 100644 --- a/modules/home/stream-tools/default.nix +++ b/modules/home/stream-tools/default.nix @@ -5,7 +5,7 @@ ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.mine.home.stream-tools; + cfg = config.my-namespace.home.stream-tools; in { options.my-namespace.home.stream-tools = { enable = mkEnableOption "Enable the Stream Machine Tools";