gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

all: Attempt to move back towards buildability in CI. Update.

Browse source
This commit is contained in:
kat witch 2021-09-25 23:29:15 +01:00
parent edf1786377
commit 392bd30b66
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
11 changed files with 60 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/hosts/goliath.nix
View file

@ -112,6 +112,7 @@
".config/Mumble" ".config/Mumble"
".config/Element" ".config/Element"
".config/hedgedoc" ".config/hedgedoc"
".ApacheDirectoryStudio"
".gnupg" ".gnupg"
".mozilla" ".mozilla"
"neorg" "neorg"
@ -123,7 +124,7 @@
]; ];
files = [ files = [
".ssh/known_hosts" ".ssh/known_hosts"
".zsh_history" ".zsh_history"
]; ];
}; };
}; };

3
config/profiles/vfio/profile.nix
View file

@ -60,6 +60,9 @@ in
security.wrappers = { security.wrappers = {
qemu-bridge-helper = { qemu-bridge-helper = {
source = "${pkgs.qemu-vfio}/libexec/qemu-bridge-helper"; source = "${pkgs.qemu-vfio}/libexec/qemu-bridge-helper";
capabilities = "cap_net_admin+ep";
owner = "root";
group = "root";
}; };
}; };

10
config/services/synapse.nix
View file

@ -19,7 +19,11 @@ with lib;
path = "secrets/mautrix-telegram"; path = "secrets/mautrix-telegram";
inherit field; inherit field;
}) [ "api-hash" "api-id" "as-token" "hs-token" ] }) [ "api-hash" "api-id" "as-token" "hs-token" ]
// { // (mapListToAttrs (field:
nameValuePair "synapse-saml2-${field}" {
path = "secrets/synapse-saml2-${field}";
}) ["cert" "key"])
// {
matrix-registration = { matrix-registration = {
path = "secrets/matrix-registration"; path = "secrets/matrix-registration";
}; };
@ -43,13 +47,13 @@ with lib;
}; };
secrets.files.saml2-cert = { secrets.files.saml2-cert = {
source = config.kw.secrets.repo.synapse-cert.source; text = tf.variables.synapse-saml2-cert.ref;
owner = "matrix-synapse"; owner = "matrix-synapse";
group = "matrix-synapse"; group = "matrix-synapse";
}; };
secrets.files.saml2-privkey = { secrets.files.saml2-privkey = {
source = config.kw.secrets.repo.synapse-key.source; text = tf.variables.synapse-saml2-key.ref;
owner = "matrix-synapse"; owner = "matrix-synapse";
group = "matrix-synapse"; group = "matrix-synapse";
}; };

9
config/users/kat/dev/packages.nix
View file

@ -1,5 +1,12 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
home.packages = with pkgs; [ hyperfine hexyl tokei nixpkgs-fmt pandoc ]; home.packages = with pkgs; [
hyperfine
hexyl
tokei
nixpkgs-fmt
pandoc
apache-directory-studio
];
} }

6
config/users/kat/gui/firefox/default.nix
View file

@ -20,11 +20,6 @@ in
ff-main = "firefox -P main"; ff-main = "firefox -P main";
}; };
programs.browserpass = {
enable = true;
browsers = [ "firefox" ];
};
home.sessionVariables = { home.sessionVariables = {
XDG_CURRENT_DESKTOP = "sway"; XDG_CURRENT_DESKTOP = "sway";
}; };
@ -40,7 +35,6 @@ in
a11ycss a11ycss
canvasblocker canvasblocker
view-image view-image
pkgs.nur.repos.crazazy.firefox-addons.new-tab-override
wappalyzer wappalyzer
auto-tab-discard auto-tab-discard
bitwarden bitwarden

2
config/users/kat/gui/packages.nix
View file

@ -3,7 +3,7 @@
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
_1password _1password
bpytop btop
bitwarden bitwarden
element-wayland element-wayland
exiftool exiftool

12
config/users/kat/personal/pass.nix
View file

@ -1,12 +0,0 @@
{ config, pkgs, ... }:
{
programs.password-store = {
enable = true;
package = pkgs.pass-wayland.withExtensions (exts: [ exts.pass-otp exts.pass-import ]);
settings = {
PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store";
PASSWORD_STORE_CLIP_TIME = "60";
};
};
}

8
config/users/kat/sway/waybar/default.nix
View file

@ -7,7 +7,7 @@
enable = true; enable = true;
settings = [{ settings = [{
modules-left = [ "sway/workspaces" "sway/mode" "sway/window" ]; modules-left = [ "sway/workspaces" "sway/mode" "sway/window" ];
modules-center = [ "clock" "clock#arc" "clock#miku" "clock#hex" ]; modules-center = [ "clock" "clock#s" "clock#arc" "clock#miku" "clock#hex" ];
modules-right = [ modules-right = [
"pulseaudio" "pulseaudio"
"cpu" "cpu"
@ -102,6 +102,12 @@
]; ];
interval = 1; interval = 1;
}; };
"clock#s" = {
format = "-{:%H}";
tooltip = true;
timezone = "America/Chicago";
tooltip-format = "{:%A, %F %R %z (%Z)}";
};
"clock#arc" = { "clock#arc" = {
format = "-{:%H}"; format = "-{:%H}";
tooltip = true; tooltip = true;

5
config/users/kat/sway/waybar/waybar.sass
View file

@ -21,6 +21,9 @@
@extend %extend_1 @extend %extend_1
background: $base00t background: $base00t
color: $base07 color: $base07
&.s
background: $base0Ft
&.arc &.arc
background: $base0Bt background: $base0Bt
@ -28,7 +31,7 @@
background: $base0Ct background: $base0Ct
&.hex &.hex
background: $base0Ft background: $base0Et
#memory #memory
@extend %extend_1 @extend %extend_1

54
nix/sources.json
View file

@ -17,10 +17,10 @@
"homepage": null, "homepage": null,
"owner": "arcnmx", "owner": "arcnmx",
"repo": "nixexprs", "repo": "nixexprs",
"rev": "548465ad8718af6523196904c4f226c14b9f314a", "rev": "644cbe7b32387839ae9d289aa29e4621485e1c1c",
"sha256": "0d3r820pjgzdqc225h8p16awf80p0m6ci8f7np8fzwxsd8pql6m8", "sha256": "18sx6khfh6m72wcnj09q67qzhc7q87wg4w0jy285y8klwymk061g",
"type": "tarball", "type": "tarball",
"url": "https://github.com/arcnmx/nixexprs/archive/548465ad8718af6523196904c4f226c14b9f314a.tar.gz", "url": "https://github.com/arcnmx/nixexprs/archive/644cbe7b32387839ae9d289aa29e4621485e1c1c.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"ci": { "ci": {
@ -41,10 +41,10 @@
"homepage": "", "homepage": "",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "89334d9994e9ad0cfaa0ec502f5fa95a43974ef8", "rev": "aa581fc7bce89b3abc60124de8dcc3b7c7a9277c",
"sha256": "14vzfapq87xarpqfilbmi72dls77acv3hxa8m15p72h8q3xbgxsb", "sha256": "160v5hsswcvyai1hc6r0gs00z9gm30qgqlgy0sk1x8iwcqslx3wz",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nix-community/emacs-overlay/archive/89334d9994e9ad0cfaa0ec502f5fa95a43974ef8.tar.gz", "url": "https://github.com/nix-community/emacs-overlay/archive/aa581fc7bce89b3abc60124de8dcc3b7c7a9277c.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"hexchen": { "hexchen": {
@ -65,10 +65,10 @@
"homepage": "https://nix-community.github.io/home-manager/", "homepage": "https://nix-community.github.io/home-manager/",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "562449b50354ac224adc4265803cba40b931ae7b", "rev": "b0651cc2173427857b172604f85da6afe69e1d41",
"sha256": "1fi17lslfxzwc2rq8kgvzhlnygcyngxlj3p2nqdfhz7dc4ws5hif", "sha256": "1pnb2wrqfb25bz9widhk4j526w4z99havgqdmq49y3lyjv3jf5gp",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nix-community/home-manager/archive/562449b50354ac224adc4265803cba40b931ae7b.tar.gz", "url": "https://github.com/nix-community/home-manager/archive/b0651cc2173427857b172604f85da6afe69e1d41.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"impermanence": { "impermanence": {
@ -89,10 +89,10 @@
"homepage": null, "homepage": null,
"owner": "kittywitch", "owner": "kittywitch",
"repo": "nixexprs", "repo": "nixexprs",
"rev": "0386c0fb902050dbac5de5e7f8a6554d55a46ed5", "rev": "33418f835c61697569feb9d8753134f7c4143d5a",
"sha256": "1fd7ndmwz9wqzvaimrbyzbscfsz8l3j9cqqyyq14xbw78zg4zi8w", "sha256": "023wma4xv5pshjfdvv9r67nbzwryh0m38vprnnf7ikl1g29a53wi",
"type": "tarball", "type": "tarball",
"url": "https://github.com/kittywitch/nixexprs/archive/0386c0fb902050dbac5de5e7f8a6554d55a46ed5.tar.gz", "url": "https://github.com/kittywitch/nixexprs/archive/33418f835c61697569feb9d8753134f7c4143d5a.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"niv": { "niv": {
@ -101,10 +101,10 @@
"homepage": "https://github.com/nmattia/niv", "homepage": "https://github.com/nmattia/niv",
"owner": "nmattia", "owner": "nmattia",
"repo": "niv", "repo": "niv",
"rev": "e0ca65c81a2d7a4d82a189f1e23a48d59ad42070", "rev": "65a61b147f307d24bfd0a5cd56ce7d7b7cc61d2e",
"sha256": "1pq9nh1d8nn3xvbdny8fafzw87mj7gsmp6pxkdl65w2g18rmcmzx", "sha256": "17mirpsx5wyw262fpsd6n6m47jcgw8k2bwcp1iwdnrlzy4dhcgqh",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nmattia/niv/archive/e0ca65c81a2d7a4d82a189f1e23a48d59ad42070.tar.gz", "url": "https://github.com/nmattia/niv/archive/65a61b147f307d24bfd0a5cd56ce7d7b7cc61d2e.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nix-dns": { "nix-dns": {
@ -113,10 +113,10 @@
"homepage": "", "homepage": "",
"owner": "kirelagin", "owner": "kirelagin",
"repo": "nix-dns", "repo": "nix-dns",
"rev": "c27914e527b79912ddc86a0f0f1ae5bd6a325519", "rev": "d47378a4272ca826d770bb22242e5fbb814063b5",
"sha256": "0zvg92fjrfmdylk8ic3b2srsrqc8ii94a1ir0v5sknjyxvy5f3rf", "sha256": "19jb4xgi7v1hp5q2cs0v76n316imis1ijd6ag4v8ikgysmrnkliy",
"type": "tarball", "type": "tarball",
"url": "https://github.com/kirelagin/nix-dns/archive/c27914e527b79912ddc86a0f0f1ae5bd6a325519.tar.gz", "url": "https://github.com/kirelagin/nix-dns/archive/d47378a4272ca826d770bb22242e5fbb814063b5.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nix-doom-emacs": { "nix-doom-emacs": {
@ -147,10 +147,10 @@
"homepage": "", "homepage": "",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "79c444b5bdeaba142d128afddee14c89ecf2a968", "rev": "51bcdc4cdaac48535dabf0ad4642a66774c609ed",
"sha256": "1qpkmv90b7sf2dvrc24nm8x2ws78w4aif1qi1zlglqssxfy888jm", "sha256": "0zpf159nlpla6qgxfgb2m3c2v09fz8jilc21zwymm59qrq6hxscm",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nixos/nixpkgs/archive/79c444b5bdeaba142d128afddee14c89ecf2a968.tar.gz", "url": "https://github.com/nixos/nixpkgs/archive/51bcdc4cdaac48535dabf0ad4642a66774c609ed.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nur": { "nur": {
@ -159,10 +159,10 @@
"homepage": "https://nur.nix-community.org/", "homepage": "https://nur.nix-community.org/",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "63428f64647f25a2d28c7dd2886c276c6d736879", "rev": "06aecedb3f99c7252e6054d22f30558ab3873657",
"sha256": "1m15lg8mwqvvnmj33jnkpmlw938xzq25zb77pmipkfdg33kpmh2c", "sha256": "072n6axsz17plkkpb0m43xhsr47xcdsghn98n7n55dpmya2h9j5j",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nix-community/NUR/archive/63428f64647f25a2d28c7dd2886c276c6d736879.tar.gz", "url": "https://github.com/nix-community/NUR/archive/06aecedb3f99c7252e6054d22f30558ab3873657.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"tf-nix": { "tf-nix": {
@ -171,10 +171,10 @@
"homepage": null, "homepage": null,
"owner": "arcnmx", "owner": "arcnmx",
"repo": "tf-nix", "repo": "tf-nix",
"rev": "89425927260e687e424a71f0357d6fda9ddd1812", "rev": "c34e28c7481e92e444ea40eeefd555a62a83ed93",
"sha256": "1m6krfjjf89l4rw526w9465h7brhc8wwrwkwxp8628rypaxvgyb0", "sha256": "1i0phw3s9d4j7hpq5qqxvkxx4chknnnlfi2cyyx983dgki5y7949",
"type": "tarball", "type": "tarball",
"url": "https://github.com/arcnmx/tf-nix/archive/89425927260e687e424a71f0357d6fda9ddd1812.tar.gz", "url": "https://github.com/arcnmx/tf-nix/archive/c34e28c7481e92e444ea40eeefd555a62a83ed93.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
} }
} }

2
overlays/exprs

@ -1 +1 @@
Subproject commit 0386c0fb902050dbac5de5e7f8a6554d55a46ed5 Subproject commit 33418f835c61697569feb9d8753134f7c4143d5a