Update and cleanup

This commit is contained in:
Agatha Lovelace 2024-01-30 23:16:56 +01:00
parent c2a3667552
commit 264896aba7
Signed by: sorceress
GPG Key ID: 01D0B3AB10CED4F8
4 changed files with 57 additions and 43 deletions

View File

@ -1,4 +1,4 @@
{ pkgs, config, ... }: { pkgs, ... }:
let let
config = pkgs.writeText "config.kdl" '' config = pkgs.writeText "config.kdl" ''
status-text "hi there! i like to know people following me on here status-text "hi there! i like to know people following me on here

View File

@ -159,10 +159,6 @@
forwardX11 = true; forwardX11 = true;
forwardX11Trusted = true; forwardX11Trusted = true;
forwardAgent = true; forwardAgent = true;
remoteForwards = [{
bind.address = "/run/user/1000/gnupg/S.gpg-agent";
host.address = "/run/user/1000/gnupg/S.gpg-agent.extra";
}];
extraOptions."TCPKeepAlive" = "yes"; extraOptions."TCPKeepAlive" = "yes";
}; };

View File

@ -194,11 +194,11 @@
"utils": "utils_3" "utils": "utils_3"
}, },
"locked": { "locked": {
"lastModified": 1687004839, "lastModified": 1704635792,
"narHash": "sha256-2DxUHOyJ9FY6zibWabHEpecmv7ImsQFDbuND/eweDJM=", "narHash": "sha256-18cwml0k6g7wWkPlFtORFt/eVf6vxu/g2fEr8LrEQIE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "a131f680ddb64f4dd8a2761c41af3980c17aad30", "rev": "fa324fbf2651f33f1d3557c058f5fbf8e985e624",
"revCount": 5, "revCount": 6,
"type": "git", "type": "git",
"url": "https://git.xenua.me/xenua/fedi-frq-friend" "url": "https://git.xenua.me/xenua/fedi-frq-friend"
}, },
@ -217,11 +217,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1702485432, "lastModified": 1705976678,
"narHash": "sha256-3wcT7NGgH1Du9w+acJEnrorr49g2c2040m00FNNFLWs=", "narHash": "sha256-gPVkZJ4XbdJ5JWltoMHfJbmgbgsgYi/hE2zkj/njUjM=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "7c55190806f31595e18da2b56c8ca54d8f5b33b7", "rev": "ae8042bb83e34b7cf085ec8792fcbf529896d998",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -237,11 +237,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1702195709, "lastModified": 1705659542,
"narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=", "narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6761b8188b860f374b457eddfdb05c82eef9752f", "rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -374,11 +374,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1679567394, "lastModified": 1698420672,
"narHash": "sha256-ZvLuzPeARDLiQUt6zSZFGOs+HZmE+3g4QURc8mkBsfM=", "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "naersk", "repo": "naersk",
"rev": "88cd22380154a2c36799fe8098888f0f59861a15", "rev": "aeb58d5e8faead8980a807c840232697982d47b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -440,11 +440,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1702272962, "lastModified": 1705883077,
"narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", "narHash": "sha256-ByzHHX3KxpU1+V0erFy8jpujTufimh6KaS/Iv3AciHk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d", "rev": "5f5210aa20e343b7e35f40c033000db0ef80d7b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -499,11 +499,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1702346276, "lastModified": 1705916986,
"narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=", "narHash": "sha256-iBpfltu6QvN4xMpen6jGGEb6jOqmmVQKUrXdOJ32u8w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7", "rev": "d7f206b723e42edb09d9d753020a84b3061a79d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -514,11 +514,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1680273054, "lastModified": 1704161960,
"narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=", "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3364b5b117f65fe1ce65a3cdd5612a078a3b31e3", "rev": "63143ac2c9186be6d9da6035fa22620018c85932",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -592,11 +592,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1699986787, "lastModified": 1704167711,
"narHash": "sha256-eYlLWibKtHN/uWJQLzOMRXpoTbO6VcFTfVY4dpgdJcQ=", "narHash": "sha256-kFDq+kf/Di/P8bq5sUP8pVwRkrSVrABksBjMPmLic3s=",
"owner": "the-argus", "owner": "the-argus",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "3c702af1f717b7876fac08809201b1368d0d956c", "rev": "1325416f951d6a82cfddb1289864ad782e2b87c4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -726,6 +726,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_8": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"url-eater": { "url-eater": {
"inputs": { "inputs": {
"naersk": "naersk_4", "naersk": "naersk_4",
@ -735,11 +750,11 @@
"utils": "utils_5" "utils": "utils_5"
}, },
"locked": { "locked": {
"lastModified": 1691162641, "lastModified": 1705955798,
"narHash": "sha256-j2LTtFVXtVhuwtp0ETYLD8Ra9izW4BiW2k+ttGh2Vag=", "narHash": "sha256-lN3AnOCz5thhFhnj8xN7KuuUrAbG9FrvUcNJ3Ys45NU=",
"owner": "AgathaSorceress", "owner": "AgathaSorceress",
"repo": "url-eater", "repo": "url-eater",
"rev": "605b5f5388e6f31c7c5306a21f8a8c5ac4b15096", "rev": "3ea3d1363d61654d489f31578994bcb799b683b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -821,12 +836,15 @@
} }
}, },
"utils_5": { "utils_5": {
"inputs": {
"systems": "systems_7"
},
"locked": { "locked": {
"lastModified": 1678901627, "lastModified": 1701680307,
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -837,7 +855,7 @@
}, },
"utils_6": { "utils_6": {
"inputs": { "inputs": {
"systems": "systems_7" "systems": "systems_8"
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1681202837,
@ -859,11 +877,11 @@
"utils": "utils_6" "utils": "utils_6"
}, },
"locked": { "locked": {
"lastModified": 1689340601, "lastModified": 1704387018,
"narHash": "sha256-15P2VwCiGFQSDG7g8Y+Bv2zW1GUJ3i3skrwCblpojdg=", "narHash": "sha256-ng+S3lDHgAu0FApVV74omIkYOQft1Vgh2rHpYxnhV6A=",
"ref": "refs/heads/mistress", "ref": "refs/heads/mistress",
"rev": "60ebc18af7416d624883bea57a27db95e718a562", "rev": "bd6a6777ad2faf3779caaeb359354dff047066a4",
"revCount": 19, "revCount": 20,
"type": "git", "type": "git",
"url": "https://git.lain.faith/sorceress/vampysite" "url": "https://git.lain.faith/sorceress/vampysite"
}, },

View File

@ -66,7 +66,7 @@
./hosts/${hostname}/configuration.nix ./hosts/${hostname}/configuration.nix
./common/options.nix ./common/options.nix
(import "${home-manager}/nixos") (import "${home-manager}/nixos")
url-eater.nixosModule url-eater.nixosModules.default
colorpickle.nixosModules.default colorpickle.nixosModules.default
spicetify-nix.nixosModule spicetify-nix.nixosModule
]; ];
@ -110,7 +110,7 @@
''; '';
}); });
colorpickle = colorpickle.packages.${final.system}.default; colorpickle = colorpickle.packages.${final.system}.default;
frq-friend = frq-friend.defaultPackage.${final.system}; frq-friend = frq-friend.packages.${final.system}.default;
vampysite = vampysite.packages.${final.system}.default; vampysite = vampysite.packages.${final.system}.default;
spicetify-pkgs = spicetify-nix.packages.${final.system}.default; spicetify-pkgs = spicetify-nix.packages.${final.system}.default;
matrix-ril100 = matrix-ril100.packages.${final.system}.default; matrix-ril100 = matrix-ril100.packages.${final.system}.default;