about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-05-10 22:50:13 +0200
committerBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-05-10 22:50:13 +0200
commit19f7840789fff99d3dd9634d2793c07c5b20e34e (patch)
treee09bd775c949876dbc552c4afa5c2e32ef70c33a
parentchore(treewide): Remove git crypt (diff)
downloadnixos-config-19f7840789fff99d3dd9634d2793c07c5b20e34e.tar.gz
nixos-config-19f7840789fff99d3dd9634d2793c07c5b20e34e.zip
chore(treewide): Fully remove any last mentions of git-crypt
-rw-r--r--.git-crypt/.gitattributes4
-rw-r--r--.git-crypt/keys/default/0/9606FC749FCE16360723D4ADA5E94010C3A642AD.gpg1
-rw-r--r--flake/default.nix1
-rw-r--r--hm/soispha/pkgs/default.nix1
-rw-r--r--notes/git_crypt.md9
-rw-r--r--sys/nixpkgs/pkgs/scripts/default.nix3
6 files changed, 5 insertions, 14 deletions
diff --git a/.git-crypt/.gitattributes b/.git-crypt/.gitattributes
deleted file mode 100644
index 665b10e8..00000000
--- a/.git-crypt/.gitattributes
+++ /dev/null
@@ -1,4 +0,0 @@
-# Do not edit this file.  To specify the files to encrypt, create your own
-# .gitattributes file in the directory where your files are.
-* !filter !diff
-*.gpg binary
diff --git a/.git-crypt/keys/default/0/9606FC749FCE16360723D4ADA5E94010C3A642AD.gpg b/.git-crypt/keys/default/0/9606FC749FCE16360723D4ADA5E94010C3A642AD.gpg
deleted file mode 100644
index d3c75f19..00000000
--- a/.git-crypt/keys/default/0/9606FC749FCE16360723D4ADA5E94010C3A642AD.gpg
+++ /dev/null
@@ -1 +0,0 @@
-^NxԞ@ejhF'ޠ<trӈ…&[@0fO{}
_*qŷ	1N ;(UG=#U	@AuV2|~X-@:PU!!0V,*W- E^د_FɌjqZ^2">59ѮWƭ&L!awt߯65MˌFP@Úe!]?+c.OYJƚY(tc'fr)%ZL
\ No newline at end of file
diff --git a/flake/default.nix b/flake/default.nix
index 1b0b2f40..f3bf346b 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -202,7 +202,6 @@ in {
 
         # secrets
         ragenix.packages."${system}".default
-        git-crypt
 
         # shell
         shfmt # TODO: Integrate this into nvim <2023-10-31>
diff --git a/hm/soispha/pkgs/default.nix b/hm/soispha/pkgs/default.nix
index a76740b6..c821cd94 100644
--- a/hm/soispha/pkgs/default.nix
+++ b/hm/soispha/pkgs/default.nix
@@ -128,7 +128,6 @@ with pkgs; let
     Programming = {
       GeneralTools = [
         git # the fast distributed version control system
-        git-crypt # mostly here to avoid problems in repositories, where the flake can't be loaded
         git-absorb # git commit --fixup, but automatic
         glow # Command-line markdown renderer
       ];
diff --git a/notes/git_crypt.md b/notes/git_crypt.md
index d78e6c46..b123a77b 100644
--- a/notes/git_crypt.md
+++ b/notes/git_crypt.md
@@ -7,14 +7,15 @@ sudo nix store delete --ignore-liveness <source_path>
 ```
 
 # How to remove git crypt [1]:
+
 To avoid multiple commits and moved around files the following worked for me:
+
 - checkout and unlock repo
 - remove `[filter "git-crypt"]` and `[diff "git-crypt"]` sections from `.git/config`
 - remove corresponding lines in `.gitattributes` and add changes to the index
-- remove symmetric key (if any) `rm .git/git-crypt -r`
-- remove (encrypted) path only from the index git rm --cached foobar
-- re-add local (unencrypted) path to the index git add foobar
+- remove symmetric key (if any) `rm --recursive .git/git-crypt`
+- remove (encrypted) path only from the index `git rm --cached foobar`
+- re-add local (unencrypted) path to the index `git add foobar`
 - commit and push the changes
 
-
 [1]: https://github.com/AGWA/git-crypt/issues/170#issuecomment-788820507
diff --git a/sys/nixpkgs/pkgs/scripts/default.nix b/sys/nixpkgs/pkgs/scripts/default.nix
index 69fba713..5279b241 100644
--- a/sys/nixpkgs/pkgs/scripts/default.nix
+++ b/sys/nixpkgs/pkgs/scripts/default.nix
@@ -108,7 +108,6 @@
             bat # used by batgrep
             gnused # required by batgrep
             git # needed to fetch through git
-            git-crypt # needed to unlock git-crypted repos
             ;
           inherit (prev.bat-extras) batgrep;
         };
@@ -242,7 +241,6 @@
         ];
         dependencies = with prev; [
           cocogitto
-          git-crypt
           rofi
           libnotify
         ];
@@ -339,7 +337,6 @@
           inherit
             (prev)
             git
-            git-crypt
             nixos-rebuild
             sudo
             openssh