This commit is contained in:
2023-05-04 14:08:51 +00:00
parent 9d851a27fd
commit 076bca4e45
4 changed files with 152 additions and 129 deletions

View File

@@ -2,7 +2,17 @@
for file in secrets/user_dotfiles/sstent@StuPC/keybase/*; do sops -e --input-type binary -i $file; done `for file in secrets/user_dotfiles/sstent@StuPC/keybase/*; do sops -e --input-type binary -i $file; done`
home-manager remove-generations {1..54} `home-manager remove-generations {1..54}`
# python reqs from poetry (project.toml)
`poetry export --without-hashes --format=requirements.txt > requirements.txt`
# Python From requirements.txt
`nix-shell -p '(callPackage (fetchTarball https://github.com/DavHau/mach-nix/tarball/master) {}).mach-nix'`
`mach-nix env ./env -r requirements.txt`
`nix-shell ./env`

View File

@@ -55,7 +55,7 @@
programs.home-manager.enable = true; programs.home-manager.enable = true;
home.packages = with pkgs; [ home.packages = with pkgs; [
autossh autossh
# azure-cli azure-cli
ansible ansible
# sshpass # sshpass
(import ./python-packages.nix { pkgs = pkgs; }) (import ./python-packages.nix { pkgs = pkgs; })
@@ -95,6 +95,7 @@ programs = {
man.enable = true; man.enable = true;
nix-index.enable = true; nix-index.enable = true;
yt-dlp.enable = true; yt-dlp.enable = true;
<<<<<<< HEAD
zsh = { zsh = {
enable = true; enable = true;
enableAutosuggestions = true; enableAutosuggestions = true;
@@ -130,6 +131,9 @@ programs = {
]; ];
}; };
=======
>>>>>>> c466ca6 (sync)
bash = { bash = {
enable = true; enable = true;
historyControl = [ "ignorespace" ]; historyControl = [ "ignorespace" ];

View File

@@ -12,6 +12,10 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = [
pkgs.ffmpeg # for replaygain
];
sops = { sops = {
secrets.discogs_json = { secrets.discogs_json = {
@@ -147,7 +151,12 @@ in {
"inline" "inline"
"discogs" "discogs"
"mbcollection" "mbcollection"
"replaygain"
"info"
]; ];
replaygain = {
backend = "ffmpeg";
};
rewrite = { rewrite = {
"artist Björk & Tríó Guðmundar Ingólfssonar" = "Björk"; "artist Björk & Tríó Guðmundar Ingólfssonar" = "Björk";
"artist Brant Bjork and The Low Desert Punk Band" = "Brant Bjork"; "artist Brant Bjork and The Low Desert Punk Band" = "Brant Bjork";

View File

@@ -1,5 +1,5 @@
{ {
"data": "ENC[AES256_GCM,data:kWL5nhaq1F5KzKpY5g85V68p2TcndKuIi9WmyQwL/A5p0/2BaAZnX/6V1lACVmdzRll147fjIjjTDexbPJCVIpGaTKepFf16cu7YTg5I80bNagaBfo+JmqFZd62lEfypKupedx0HYwc3QWwhiUATsfwDa2xTTjQTXln0nJHJFwmnE4iHpEpUNhSoOPVUj4qtbnD2XMD9ykSNXXDAyNTVRUJaBbo8pooh7PCDeYT9xdZntTXd+2+tP9DUqq8W8T03Gq5YKbjXu1ww4dzaFAoiqD371GzRs+1wPd2skM7VdmhBJg9F0JpRFFWlzGanPmODVxDd2jsQzeBK9uInjugdNEcAnqf7RMqYRMWE3FRGepfp6YWVneLmRseccG4xAatNPB0sEDN/NqCSn3H7WN2p4zoE5frfGJzJxSaAMR/D+9uzqvXKXnxr1wepwBcz+Fef0iWcDHGHtO3v01IjHcA/6FOTJFsRrvf4eTpw4aqMR606u6/lprifw0IXZ96lrFPozVDi0qFczEmX1aNfCAZCAdtaM1mU5OmX7nNJZ+g3lV/ZCLYpvHRuv2BLe08qr2/Qui1kN+3V6RaZ5tmYU0aZAI0N+4K/yt8uIukS5nnaLgX5cEmEr66nV7rNLudWadIYVgIum3i+Nz29nxcMZE2Hc0b298J+bNVSL/MsOF4v/vN7pgLar8MjD3WJtAVBe4Stfp0Mw2ngCdD57zNprGSIDGYMnX/VkPeJ2KhebwWza9xP0iOdNNRJMIzI35MX/gJuIeLJQJ77dxfzVhSZ5BB3W50NCaM3AZNeDIhoXXvBKcU1fypO2KTpFIsMBVeCOY1ee7U5YFh2Rqrb6MGTDeRdsJ7gfK2jEUYCjvb+kIZUdFjJ3EtdVakSYWpmrvGPYkxFeVUx2hgelZtFxhWwN6BVM+bkGiwfSq1Ex4xgOZcPJ7s5wAu9cYK6t6ibY+lxpnwZLHrHJIyCscsyD+twTD6VzA0gkXqPzh4HpmWXYNbcoVeN5BitA8gUWDSO86kHPaXO7OnSvpOwU/U5VRYBeLSh+1LUKWY28nIQ1B9DwCLri5VNkrLRVsk3zEAFoD+Afz9tfDPrGvyFMCM0WMAiqhMt/TNWhXdMmAlt4B77We9FvV7Nz/PSMQ0eowItAkyXgnOazs2/fQHoFAGIl+8pkY0xRq9S+nPHKiueB+6w+9qOZOhmKrvBRgY7lNQLNdCyIfRcSszS8e9TwN86I7PCBT4dPtKEidKowlrZU9k40Fz0M3hP8tAb2/YjYStXE1Dr5OSppOUknl3/XPyQW5+ZYtGMv550+YwlYKY+Nitj8G1PTT8tDBzz1CYt9EaXrJHJFpCr9LizGn8lr5GekhUZQUvdfWsG+LcR9bCzAIRx,iv:gCGBCu+4FdMj3g8pWXms/lW69s6WXZUM0e943krVvWI=,tag:YMHLTZ6upjlblY5+qwPH0w==,type:str]", "data": "ENC[AES256_GCM,data:FPFwVL3VY3xVfqZ6SCaEUIdVnSSzOAs1moKbWsWi5hn0BciVTQoxftKIYX/3zJcGY9LONzsl949VcRNdRpl8hMngLPQ9I3h80g9FDBLYzjbB/cwypnuuJA67up/rbFQoQBAhhCjK1jRh7FQTokD8ecqOj5AO/0REpVMul6IOqZMcFp4JfMKpTNsf17RqaaMH3eBGpYyKZ0rUU5NhaLc9FqBNjJYkxlGWSDdw9rJup47QwwyFPe+FbLq7cGf2Tq4WmGVvwcbiX/Ngo3nWWSod0pcXQ+6r6l9HqUupK73gmbAUQt85LOY19bTlmdUxM2/SOIPurSuJtZhpWWBEwdfGwYCc6CsPLj5aGU3eFS17tL5Nm5JVwd7rSQ+tj2MNtlCQfscfVvTg0+u/eUf79kLceE+azeFtbwA8U69aB5MBIQ+Y+cQVytISAxjJLFabGzc0PKVH0MANbKPzoXnme71ADojgWl1pPhnJBe6C37qBtm3IihTPJXa5vNfMj6iZxGroOVsEvdXfXbUGH9/1zyYXhBEcy2BGQDjWOMMbwMWNaMCcP3k3Cq5haEhy08xvIUhPakeDzzjJLvPi82kDmtKaD0pVY9Ym/8VPlIhmyrhoKC/pJhsd8O9KuCRTMp/tP6Pgf0pSOYhfC7Wvm4XVczwbcebLBXOlDpJXoOa6F4fqUDUo0Z0y6tAwjUfhuz5D074GlefQSJL7pC31d4dCAlFVykXKKKktFkRGSHIy8l3964htw+Xa78VyvCPZrKfWU0usaOFdZ1/5DHpq9nV1VLYESCygktEmseFhpDX4G5SLztB6txSy+dlSTwj1ARWdWCFuLDPLsuoF9k1zUNmAVJxpYTs7sDGaeyLnMz/hnumbY0EaaGXlY6YYfxX4286/eXQajpixy8peeYCGoNTwRkRPkur7Hids3K4SktcB1jXEuZWEnNe0LfrhePMI5VKW1M2QIJVJmG8GXvKdW298WKCVq3SL+EWn5dQnPHNuPEYv35cRnmshBfCJAS+kUkR+l97yN+QPWNtaJsdC1fRsA/zvtofyV89yNzqvnqXnbbBU6gahdTwgnc06kOridDDQlb3W4nU+RdnLfINnTLdZ5h1f+S1mn+EOpIVJ6+zJcqVVt2RdfrC3x4Nly8R08Q2bVG5OJCYasxOAiJH0IwO8nsjUusH4nehUUqJ66Gzg3k4OMydw2zh4iJJeHVdwa3FCbc71HagbeohTx+XA2DCCRnkQwgI+QkColUIXYx6q5CtzRAe4m6Qpgq8htBEWMnq2a0iAdDRASXxKvVST9TMitnVp6NdjPzRIXUma6x/hNmYo70Mj0qX8zun2Mn8K9qKvO4+oBIaHBdr148TnAVKiLTfht19/qekYea4dVAOMXNwSNWh2AZbhQTO+KMq+bdU+qcvT9t3ddvMjZURAa1F5Vck8V/+GZV+xNwXrhH8y7WxOFA5TrInnpCAKAqJXz35zYrW3k/rEqhaGE9XsKzg0,iv:DxJeRxDb7SkqXvYJpDljssmL/JRy4PnGKIXckeUcSM8=,tag:AqtC4nCe0ewrK/fDBuNiYA==,type:str]",
"sops": { "sops": {
"kms": null, "kms": null,
"gcp_kms": null, "gcp_kms": null,
@@ -15,8 +15,8 @@
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFaC9WNUNZTG1GYnJIK203\nYW1tNXVwdGh6WXVZTEJCVm9mMkFjeG1pTG1jCmltdU1YeThoTkZsVmpvRVpTTVlK\ncllNbUpZaTZjNkNCbnJYMUxxVkVxcVkKLS0tIDNocDd0V3JoWTNndzV5V3VYaWFY\nQnBXQWVPSmljV0ZIMTQ3aUZYNlZ5K1EK+J13LdXi47ylyZDDNDHtor48dqp6nC7H\ne5M/VESLNcw9l0cbORSSfbAnlFC8Pp8o9IWB/iCW9GDHwVdM5oDG7Q==\n-----END AGE ENCRYPTED FILE-----\n" "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFaC9WNUNZTG1GYnJIK203\nYW1tNXVwdGh6WXVZTEJCVm9mMkFjeG1pTG1jCmltdU1YeThoTkZsVmpvRVpTTVlK\ncllNbUpZaTZjNkNCbnJYMUxxVkVxcVkKLS0tIDNocDd0V3JoWTNndzV5V3VYaWFY\nQnBXQWVPSmljV0ZIMTQ3aUZYNlZ5K1EK+J13LdXi47ylyZDDNDHtor48dqp6nC7H\ne5M/VESLNcw9l0cbORSSfbAnlFC8Pp8o9IWB/iCW9GDHwVdM5oDG7Q==\n-----END AGE ENCRYPTED FILE-----\n"
} }
], ],
"lastmodified": "2023-02-26T17:30:05Z", "lastmodified": "2023-03-09T17:27:24Z",
"mac": "ENC[AES256_GCM,data:CCD1HSLYfT+9Ia03bNPSfBrLtmagcr/krC57k5X8nUfYY4tuIjXNC4i5KMQ9EEviMS3oz24HwvqXq1TOF/dCsBGKLSHgwCYPw7kSJFok6iXBdalwovfjQF/sGub83D6r+3MYfpLshq84C9WGRD1AVhZzJMFK1QM47iKLzEXutLE=,iv:FBwx5cdsSM5IATMbu4lrTs05iSjA4c0pn/qjs4g68rU=,tag:ONon6HUv1yr5scVoNsTD4w==,type:str]", "mac": "ENC[AES256_GCM,data:6IBw0m1ascgNp7Bd9w5bnvm0jyIrqX4ymIhoyuBDYgl/LeKwMsJWboSaP7Gmy6Y30drbo91QovA1VT+4AfggDG4UgPiLddx8Bv8ybavXGFlNiV9cQSKo2Y3I4E2tR7Q0zdoTQ2AUmXDuLVjBS7gtxBDTzkEgT6Sln1+TH1F9O6I=,iv:BYtss6rtT5s7S+edttY0u8XgnIuX6NNk2OiuC+TXKog=,tag:3ppc6QRUJ5eJgP/ttvyDuw==,type:str]",
"pgp": null, "pgp": null,
"unencrypted_suffix": "_unencrypted", "unencrypted_suffix": "_unencrypted",
"version": "3.7.3" "version": "3.7.3"