diff --git a/.githooks/pre-commit b/.githooks/pre-commit index 848d174..c0e7bb5 100755 --- a/.githooks/pre-commit +++ b/.githooks/pre-commit @@ -1 +1,2 @@ -nix fmt . +nix fmt +git add $(git diff --name-only --cached) diff --git a/flake.lock b/flake.lock index 509a430..a59f097 100644 --- a/flake.lock +++ b/flake.lock @@ -73,11 +73,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1673345971, - "narHash": "sha256-4DfFcKLRfVUTyuGrGNNmw37IeIZSoku9tgTVmu/iD98=", + "lastModified": 1673527292, + "narHash": "sha256-903EpRSDCfUvic7Hsiqwy+h7zlMTLAUbCXkEGGriCfM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "54644f409ab471e87014bb305eac8c50190bcf48", + "rev": "6a3f9996408c970b99b8b992b11bb249d1455b62", "type": "github" }, "original": { diff --git a/keys/ssh/rouven@thinkpad b/keys/ssh/rouven@thinkpad new file mode 100644 index 0000000..b0f503e --- /dev/null +++ b/keys/ssh/rouven@thinkpad @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDGP2m7ccMts/y/PFtYQraFQ7P7GEJlSGueM+9WS9UeT rouven@thinkpad diff --git a/secrets/thinkpad.yaml b/secrets/thinkpad.yaml index 305c37f..56258ef 100644 --- a/secrets/thinkpad.yaml +++ b/secrets/thinkpad.yaml @@ -1,4 +1,4 @@ -wireless-env: ENC[AES256_GCM,data:DqQjTyHIsw8zqn5O+85K4rXDWlXwuXafbs5uTdoFuV7rwkUdr+asIPTZMV+X8KILQA0rk7nwDO0+Cr8Z6sys43DQYJHZHyhPTQK0zQAhYg0rUHV9xEymTQ9mRVOe8kDuGKc5LDNrRO/UkCTJgkLRI6bble7xzYQoz43MmSDacZ6dtHrAGHq5xqHhpha1on7Xnar4BtFnmkdZaFuF0J9oGXNjmm8HYVSrZxB1EVSp9d4HjC48dXjz7rafTijr6VKj1929F9v3EXAiySOSonzUUC4y5HY7Z+pC0Yqnim3U3Q1X1/5Al98LiTVB,iv:uk5okfaDW0RPnd/gv3kMpMRvAXuRdhiTZH/pPLpnZ+w=,tag:4OjCgsbe1jX7asDUxmVfnw==,type:str] +wireless-env: ENC[AES256_GCM,data:41kibhCdfuOcBV817pd01I3Rpu0vu1WPOFyKnzGSzQi0i4KbmOrbwWV45RWMzHdLWdPNyqJPb7k8rLdbH/ZKdkK1pyLciHbAwUqIll68TxW4Lk6dPUmOk7OX/AAV2DxBZBZj+BbgGHzVTp5WOp/kEQ8LZa9thM8+qIFAsP42opKD5q6wxqSythebYlJ2zqYdmP0smivF6sqTNSrT/8apW8T8O95+zAoxAWl7ginqyprOWCmcR9X++XOaYwSjr4wCIPrTmSEJ,iv:x3pBK4TNldKa7AkYaZOOCM36Dgn6uDQMfpFGtGT9lZs=,tag:hrw/aOEbcVDhz+e2O4kFTw==,type:str] uni: zih: ENC[AES256_GCM,data:irxq42t4H+7E3YJjqbmyccw=,iv:f0E84HMBQN9TtR1BN56LTU4FLOkVWPFTUysQvu99nzs=,tag:BkNyAJAj+3tPF3Us4Vqg3w==,type:str] wireguard: @@ -20,8 +20,8 @@ sops: S0NwYWFQcmFtTm5zTEZLVXRtMi91Zk0K3ylHH4OXduJlJxepPz9GxBzVmKGpv9LL ApkEQxfPL4Bxrb2XOFLOYqJGv2SwxBv1QNYT7eTXRLTEsIXUHR0MGA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2022-12-30T21:43:40Z" - mac: ENC[AES256_GCM,data:cLTBLOLdEVHp+DqMMOzXMzI1D+EfBI2JuTIgO9VlnAcjzMV43xq18QAVu63mqL9QcKuuZ8Gr1Ix2o/jsXU3IaYYiGUFePWxkAN2umaHLAXWUEICu6OImJsbVq4uO7aqRbBF1UPLIuWNqJRtOE2R+sjW6seO1wzW6iLMi9Mbm1cI=,iv:9BclKbbFEWbC7HrFsZJzVYkBm6GfxKNe7lecK2KqPKU=,tag:tq5rx5sJH6GRPG2K/K45bA==,type:str] + lastmodified: "2023-01-14T10:27:33Z" + mac: ENC[AES256_GCM,data:rRIzDJCCmAY2f8Ufn0055hiPLpBbz9OWRYLzrI5byzTtXAeoXMwOM4oMJUFg3uIofgvOPbUB1OP/ZJNG3iYTkUy8sDuqzU1Oogp2ZIdwv7ke3lAVec+oT1WGMOOithoRtahs7aP3bggnboaov32YUwOH9JAerV1MkDA+OJNyTpA=,iv:+N8ylMN3tgtEmuN9jtXDTRKvM3JHZXJr3IaeXOERVHM=,tag:MGzcRwD6Ih9kqp4/65DGCw==,type:str] pgp: - created_at: "2022-12-27T16:39:15Z" enc: |- diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix index f49c1b2..09ca225 100644 --- a/users/rouven/modules/packages.nix +++ b/users/rouven/modules/packages.nix @@ -31,7 +31,6 @@ whatsapp-for-linux # games - minecraft prismlauncher # minecraft, but it actually works superTuxKart extremetuxracer @@ -50,6 +49,7 @@ nixpkgs-fmt virt-manager powerline-fonts + ventoy-bin # libs libyubikey diff --git a/users/rouven/modules/ssh/default.nix b/users/rouven/modules/ssh/default.nix index 4a20f62..0126c65 100644 --- a/users/rouven/modules/ssh/default.nix +++ b/users/rouven/modules/ssh/default.nix @@ -17,6 +17,12 @@ match = "Host raspi User git"; identityFile = "~/.ssh/git"; }; + "*" = { + identityFile = "~/.ssh/id_ed25519"; + }; }; + extraConfig = '' + IdentityFile ~/.ssh/id_ed25519 + ''; }; }