diff --git a/.agenix_config.nix b/.agenix_config.nix index 2f70b06..539dfa8 100644 Binary files a/.agenix_config.nix and b/.agenix_config.nix differ diff --git a/.git-crypt/keys/default/0/7685890DCD544AF1507A84F21B59187B161C0215.gpg b/.git-crypt/keys/default/0/7685890DCD544AF1507A84F21B59187B161C0215.gpg deleted file mode 100644 index 2b9956c..0000000 Binary files a/.git-crypt/keys/default/0/7685890DCD544AF1507A84F21B59187B161C0215.gpg and /dev/null differ diff --git a/.git-crypt/keys/default/0/E66B9EE7711B0FBBE6E8DA1A17041163DA10A9A2.gpg b/.git-crypt/keys/default/0/E66B9EE7711B0FBBE6E8DA1A17041163DA10A9A2.gpg index 7588895..bcc4f04 100644 Binary files a/.git-crypt/keys/default/0/E66B9EE7711B0FBBE6E8DA1A17041163DA10A9A2.gpg and b/.git-crypt/keys/default/0/E66B9EE7711B0FBBE6E8DA1A17041163DA10A9A2.gpg differ diff --git a/flake.lock b/flake.lock index f8fa8b2..2c2fa6c 100644 --- a/flake.lock +++ b/flake.lock @@ -388,11 +388,11 @@ "theme": "theme" }, "locked": { - "lastModified": 1701345648, - "narHash": "sha256-Ta/5S6suVBUsgxY4hRWuQCYkOWi0V4bquVsKHkMQn1I=", + "lastModified": 1709128630, + "narHash": "sha256-Lfgfy/EWEmO9X1nkR8gG51FmLVTPh9M9IDCpviyINQY=", "ref": "refs/heads/main", - "rev": "542364e035e3c6fd859df3b527ecbfaf24f0c29d", - "revCount": 112, + "rev": "d280679b1498f9082ba12b2c65adbf16ea23c557", + "revCount": 114, "type": "git", "url": "https://git.pleshevski.ru/mynix/neovim" }, @@ -443,11 +443,11 @@ }, "nix2lua": { "locked": { - "lastModified": 1669103494, - "narHash": "sha256-jEu9VyOfTMbSITGiG329vEC6K7ZNppfhd0LojxMhzK8=", + "lastModified": 1709128456, + "narHash": "sha256-tRduS+XFI6VceWPQzjkuvlyn/Oe5NsQUS/wyEC69dvk=", "ref": "refs/heads/main", - "rev": "32b5ab313597df18a81a85af67c5e1380fd4f688", - "revCount": 13, + "rev": "f152767145e61fea96eddb1b550ab3f25701e0ad", + "revCount": 18, "type": "git", "url": "https://git.pleshevski.ru/mynix/nix2lua" }, diff --git a/home/modules/editor.nix b/home/modules/editor.nix index 13f2b83..fedcfba 100644 --- a/home/modules/editor.nix +++ b/home/modules/editor.nix @@ -30,7 +30,10 @@ let extensions.live_grep_args = { auto_quoting = true; mappings.i = { - "" = mkLuaRaw "require('telescope-live-grep-args.actions').quote_prompt()"; + "" = join "." [ + (mkCall "require" [ "telescope-live-grep-args.actions" ]) + (mkCall "quote_prompt" [ ]) + ]; }; }; }; @@ -54,7 +57,7 @@ let }; }; denols = { - root_dir = mkLuaRaw "root_pattern(\"deno.json\", \"deno.jsonc\")"; + root_dir = mkCall "root_pattern" [ "deno.json" "deno.jsonc" ]; }; rust_analyzer = { settings.rust-analyzer = { diff --git a/home/users/jan/accounts.secret.nix b/home/users/jan/accounts.secret.nix index 9ac7b11..5235477 100644 Binary files a/home/users/jan/accounts.secret.nix and b/home/users/jan/accounts.secret.nix differ diff --git a/home/users/jan/git/github.secret.nix b/home/users/jan/git/github.secret.nix index 0f481d4..18bf869 100644 Binary files a/home/users/jan/git/github.secret.nix and b/home/users/jan/git/github.secret.nix differ diff --git a/home/users/jan/git/gitlab.secret.nix b/home/users/jan/git/gitlab.secret.nix index 4d4c10e..eb6cf9d 100644 Binary files a/home/users/jan/git/gitlab.secret.nix and b/home/users/jan/git/gitlab.secret.nix differ diff --git a/home/users/jan/git/myrepo.secret.nix b/home/users/jan/git/myrepo.secret.nix index 0ad7fb3..d3bfc1d 100644 Binary files a/home/users/jan/git/myrepo.secret.nix and b/home/users/jan/git/myrepo.secret.nix differ diff --git a/nixos/hosts/asus-gl553vd/xmonad_projects.secret.nix b/nixos/hosts/asus-gl553vd/xmonad_projects.secret.nix index b6c30c2..c7f8a44 100644 Binary files a/nixos/hosts/asus-gl553vd/xmonad_projects.secret.nix and b/nixos/hosts/asus-gl553vd/xmonad_projects.secret.nix differ diff --git a/nixos/hosts/home/xmonad_projects.secret.nix b/nixos/hosts/home/xmonad_projects.secret.nix index 8134346..57ca5f2 100644 Binary files a/nixos/hosts/home/xmonad_projects.secret.nix and b/nixos/hosts/home/xmonad_projects.secret.nix differ diff --git a/nixos/hosts/istal/data.secret.nix b/nixos/hosts/istal/data.secret.nix index 972f4da..a76968c 100644 Binary files a/nixos/hosts/istal/data.secret.nix and b/nixos/hosts/istal/data.secret.nix differ diff --git a/nixos/hosts/istal/networking.secret.nix b/nixos/hosts/istal/networking.secret.nix index 611e00b..4f45ed0 100644 Binary files a/nixos/hosts/istal/networking.secret.nix and b/nixos/hosts/istal/networking.secret.nix differ diff --git a/nixos/hosts/tatos/data.secret.nix b/nixos/hosts/tatos/data.secret.nix index c25e893..53bd319 100644 Binary files a/nixos/hosts/tatos/data.secret.nix and b/nixos/hosts/tatos/data.secret.nix differ diff --git a/nixos/hosts/tatos/networking.secret.nix b/nixos/hosts/tatos/networking.secret.nix index c59c683..b9c19be 100644 Binary files a/nixos/hosts/tatos/networking.secret.nix and b/nixos/hosts/tatos/networking.secret.nix differ diff --git a/nixos/shared/fail2ban/fail2ban.secret.nix b/nixos/shared/fail2ban/fail2ban.secret.nix index 4cd7e78..362093f 100644 Binary files a/nixos/shared/fail2ban/fail2ban.secret.nix and b/nixos/shared/fail2ban/fail2ban.secret.nix differ diff --git a/nixos/shared/networking.secret.nix b/nixos/shared/networking.secret.nix index 9a44c5e..8d17b7e 100644 Binary files a/nixos/shared/networking.secret.nix and b/nixos/shared/networking.secret.nix differ diff --git a/notes/ssd.md b/notes/ssd.md index 7c2f59f..0050bae 100644 --- a/notes/ssd.md +++ b/notes/ssd.md @@ -2,7 +2,7 @@ Get available disk size -``` +```sh fdisk -l ``` diff --git a/packages/git-crypt-rm-gpg-user/git-crypt-rm-gpg-user.sh b/packages/git-crypt-rm-gpg-user/git-crypt-rm-gpg-user.sh index 57a6d11..5c70db8 100644 --- a/packages/git-crypt-rm-gpg-user/git-crypt-rm-gpg-user.sh +++ b/packages/git-crypt-rm-gpg-user/git-crypt-rm-gpg-user.sh @@ -211,14 +211,14 @@ do done cd "${CURRENT_DIR}" -for encrypted_file in $(awk '{print $2}' ${TMPDIR}/${BASENAME}/${TMPFILE}); do - rsync -rp -R "${encrypted_file}" "${TMPDIR}/${BASENAME}" -done +while read encrypted_file; do + rsync -rp -R "${encrypted_file}" "${TMPDIR}/${BASENAME}" +done < ${TMPDIR}/${BASENAME}/${TMPFILE} cd "${TMPDIR}/${BASENAME}" -for encrypted_file in $(awk '{print $2}' ${TMPFILE}); do +while read encrypted_file; do git add "${encrypted_file}" -done +done < ${TMPDIR}/${BASENAME}/${TMPFILE} git commit -m "New encrypted files" || true popd diff --git a/readme.md b/readme.md index 3b62d3d..16fca84 100644 --- a/readme.md +++ b/readme.md @@ -9,10 +9,6 @@ Workstations: - **home** - Home desktop computer for work. - **asus-gl553vd** - My laptop for remote work. -### Modules - -- **Docker stack** - It creates services in docker swarm node. - # Home Manager configs User configurations are included. diff --git a/secrets/users-jan-passfile.age b/secrets/users-jan-passfile.age index 9b432fd..bd5e3f1 100644 Binary files a/secrets/users-jan-passfile.age and b/secrets/users-jan-passfile.age differ diff --git a/secrets/users-nas-passfile.age b/secrets/users-nas-passfile.age index 10ba7e2..8f4911c 100644 Binary files a/secrets/users-nas-passfile.age and b/secrets/users-nas-passfile.age differ diff --git a/secrets/wireguard-asus-gl553vd-private.age b/secrets/wireguard-asus-gl553vd-private.age index cfc6bc2..ee6e35c 100644 Binary files a/secrets/wireguard-asus-gl553vd-private.age and b/secrets/wireguard-asus-gl553vd-private.age differ diff --git a/secrets/wireguard-home-private.age b/secrets/wireguard-home-private.age index f01c098..dbee235 100644 Binary files a/secrets/wireguard-home-private.age and b/secrets/wireguard-home-private.age differ diff --git a/secrets/wireguard-istal-private.age b/secrets/wireguard-istal-private.age index b4cb8c7..6abdef2 100644 Binary files a/secrets/wireguard-istal-private.age and b/secrets/wireguard-istal-private.age differ diff --git a/secrets/wireguard-tatos-private.age b/secrets/wireguard-tatos-private.age index 1039776..b5844b8 100644 Binary files a/secrets/wireguard-tatos-private.age and b/secrets/wireguard-tatos-private.age differ