Compare commits

..

No commits in common. "840689110e567a5d5bef11e9c11c454ba4dd1809" and "73fc0bd445b340a5e3661c0c288a42df5ab1159c" have entirely different histories.

3 changed files with 65 additions and 40 deletions

View file

@ -60,11 +60,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715865404, "lastModified": 1714641030,
"narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -106,6 +106,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -157,11 +175,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715930644, "lastModified": 1715486357,
"narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -178,11 +196,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715901937, "lastModified": 1715653378,
"narHash": "sha256-eMyvWP56ZOdraC2IOvZo0/RTDcrrsqJ0oJWDC76JTak=", "narHash": "sha256-6kbg/PI3+SBP17f4T0js3CBsMLVtlD0JqJhDKgzk1mQ=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "ffc01182f90118119930bdfc528c1ee9a39ecef8", "rev": "de8b0d60d6fd34f35abffc46adc94ebaa6996ce2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -193,11 +211,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716137900, "lastModified": 1715787315,
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -208,11 +226,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1716061101, "lastModified": 1715458492,
"narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", "narHash": "sha256-q0OFeZqKQaik2U8wwGDsELEkgoZMK7gvfF6tTXkpsqE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", "rev": "8e47858badee5594292921c2668c11004c3b0142",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -237,11 +255,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1716294469, "lastModified": 1715951001,
"narHash": "sha256-1RdJkVa+axdzLhbeoWJoC3BPODxfx+/Rv7HE+e4CK/Y=", "narHash": "sha256-GTFt0SfwKXPHYuaeY3nKKyYOc0EtAcmr9vP86xC7beY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "1c9f2a23a6cb9406c35980f4af1a4356f56771e9", "rev": "3766e3633586ef9fac02f0347509171f0a4794b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -253,6 +271,7 @@
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_2",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
@ -264,11 +283,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715870890, "lastModified": 1715609711,
"narHash": "sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0=", "narHash": "sha256-/5u29K0c+4jyQ8x7dUIEUWlz2BoTSZWUP2quPwFCE7M=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "fa606cccd7b0ccebe2880051208e4a0f61bfc8c1", "rev": "c182c876690380f8d3b9557c4609472ebfa1b141",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -293,11 +312,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1716244104, "lastModified": 1715482972,
"narHash": "sha256-XXbqfkyWe0d0O+zqRQWi2oXi6wYDmTzXedFkBRwx1VI=", "narHash": "sha256-y1uMzXNlrVOWYj1YNcsGYLm4TOC2aJrwoUY1NjQs9fM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "fddd52460e3332eedd8a0043af5675338a5b3e0b", "rev": "b6cb5de2ce57acb10ecdaaf9bbd62a5ff24fa02e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -321,6 +340,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -329,11 +363,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715940852, "lastModified": 1714058656,
"narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -38,7 +38,6 @@
wget wget
wl-clipboard wl-clipboard
zellij zellij
zulip
zulip-term zulip-term
]; ];
@ -97,10 +96,6 @@
flags = [ flags = [
"--disable-up-arrow" "--disable-up-arrow"
]; ];
settings = {
auto_sync = true;
key_path = config.sops.secrets.atuin_key.path;
};
}; };
bat = { bat = {
enable = true; enable = true;
@ -346,10 +341,6 @@
extraPlugins = with pkgs.vimPlugins; [ extraPlugins = with pkgs.vimPlugins; [
]; ];
}; };
nnn = {
enable = true;
extraPackages = with pkgs; [ ffmpegthumbnailer mediainfo sxiv ];
};
mbsync = { mbsync = {
enable = true; enable = true;
}; };
@ -420,7 +411,7 @@
age.keyFile = "${config.xdg.configHome}/sops/age/keys.txt"; age.keyFile = "${config.xdg.configHome}/sops/age/keys.txt";
defaultSopsFile = ./secrets/secrets.yaml; defaultSopsFile = ./secrets/secrets.yaml;
secrets = { secrets = {
atuin_key = {}; just_a_test = {};
"mail/privat/address" = {}; "mail/privat/address" = {};
"mail/privat/username" = {}; "mail/privat/username" = {};
"mail/privat/password" = {}; "mail/privat/password" = {};

View file

@ -1,4 +1,4 @@
atuin_key: ENC[AES256_GCM,data:dkSZVAweY+pfQnnC9pUWCcM5e00zqJCZ3KHeYSfiBc+zeAulL1dZbCCmImGx3gyfhQ6F198mqBGg0foNnO7myjdrKeI=,iv:E9elbdtfQyaeqKNEbo5/gbGS+X1TBrwDxL0VyJ2tS+Y=,tag:FdV9vXVTuHyamPk7TzSEeQ==,type:str] just_a_test: ENC[AES256_GCM,data:HDhSG6BejOadBaeW,iv:idSJWRevqi4h/gaTREOt5tGfamRcxSUSmaelgyZUmu0=,tag:jo5lugFHpdjGeo/RtN86DA==,type:str]
tailscale_auth_key: ENC[AES256_GCM,data:1zT4rp8bxLLllmSPzC/n+Kg4m//zVynXdX8JnyO5G6mHdUrl46yYuWeyx4HNSRJmBicjVCvLMSnNeVMktg==,iv:cyInU7JNrTAnYtgF5e9jt+WKvNrumaWmRofr7++JQWA=,tag:ztKvGc1t8qeFKMbSbaq5Tw==,type:str] tailscale_auth_key: ENC[AES256_GCM,data:1zT4rp8bxLLllmSPzC/n+Kg4m//zVynXdX8JnyO5G6mHdUrl46yYuWeyx4HNSRJmBicjVCvLMSnNeVMktg==,iv:cyInU7JNrTAnYtgF5e9jt+WKvNrumaWmRofr7++JQWA=,tag:ztKvGc1t8qeFKMbSbaq5Tw==,type:str]
mail: mail:
privat: privat:
@ -33,8 +33,8 @@ sops:
SEFxb2UwbDFiSG5QdzVWRk02b3lIZDQKYF4Vv3FwvKv3uwACRXb/jwD6Q5rh39Yu SEFxb2UwbDFiSG5QdzVWRk02b3lIZDQKYF4Vv3FwvKv3uwACRXb/jwD6Q5rh39Yu
w7J86gsX7Yh9Wm65y+CW1JE8EN72mhBbYwve3lK8twDjxmLhYOMjIg== w7J86gsX7Yh9Wm65y+CW1JE8EN72mhBbYwve3lK8twDjxmLhYOMjIg==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-05-22T07:53:28Z" lastmodified: "2024-05-19T16:46:00Z"
mac: ENC[AES256_GCM,data:T0gcJp4lIFyEkseXovSRlBYunlLNTE4yYJmD203brJ0GuQ50pOyJbbwjTaQF/4LQ4w6qgnE4/Yim5L0moXWGkWdyyvrwT2Ln69hFKnbQxHCfiTVgWF4fMTT0qaLOZgd+KKPnUuObeaPWbzkZVya72LAWvDd34KgRhVAvrQsoRVg=,iv:zJYE3iQbZCOigYxOJDf9Chd6JIxOiR8Nn429SSOqWQw=,tag:XmB0ah3HwX+SaC0m6XKENA==,type:str] mac: ENC[AES256_GCM,data:xEOM5qqtGEeCmOi+z+MdZ3h4jLjj9aLn6EFGmvHkLsZCG4DWCc7KTaSOTyTVRnpsL/Nsuhqj88QNaM+ekBPA3120C64IKM6J/ZEfOriLfrmL8uzwMXPPqTMkCDs3ALNNontMl/zUL0LYGJ5bcraIQr0DBaup0DuRD5zcGVjUUCs=,iv:2/WrjzoKNCTfwogz0ITC+FeSg/gPCTTR1s+OtIJ3Esc=,tag:flAkHZ9+jIsEsQXChCc0vQ==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.8.1 version: 3.8.1