This commit is contained in:
Tasia Iso 2024-06-24 10:16:41 +02:00
parent 3f6324c205
commit fb95429ee7
Signed by: tasiaiso
SSH key fingerprint: SHA256:KiRjUay5C9i6objsEOIycygBHn54pDBB3Lj7fyJ0Elw
8 changed files with 155 additions and 66 deletions

View file

@ -69,8 +69,9 @@
"nvidia-settings" "nvidia-settings"
# osu! # osu!
"osu-lazer-bin-2024.412.1"
"osu-lazer-bin" "osu-lazer-bin"
"android-studio-stable"
]; ];
}; };

View file

@ -40,7 +40,7 @@
script = '' script = ''
set -eu set -eu
${pkgs.nixos-rebuild}/bin/nixos-rebuild switch -L --flake git+https://gitea.com/tasiaiso/nixos-config --upgrade ${pkgs.nixos-rebuild}/bin/nixos-rebuild boot -L --flake git+https://gitea.com/tasiaiso/nixos-config --upgrade
${pkgs.curl}/bin/curl \ ${pkgs.curl}/bin/curl \
-H "Title: NixOS upgrade done" \ -H "Title: NixOS upgrade done" \

View file

@ -43,11 +43,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717527182, "lastModified": 1718530513,
"narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "845a5c4c073f74105022533907703441e0464bc3", "rev": "a1fddf0967c33754271761d91a3d921772b30d0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -59,11 +59,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1718086528, "lastModified": 1718835956,
"narHash": "sha256-hoB7B7oPgypePz16cKWawPfhVvMSXj4G/qLsfFuhFjw=", "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "47b604b07d1e8146d5398b42d3306fdebd343986", "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -111,17 +111,16 @@
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"stable": "stable", "stable": "stable",
"tildefriends": "tildefriends", "tildefriends": "tildefriends",
"unstable": "unstable",
"vedirect-reader": "vedirect-reader" "vedirect-reader": "vedirect-reader"
} }
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1718086528, "lastModified": 1718835956,
"narHash": "sha256-hoB7B7oPgypePz16cKWawPfhVvMSXj4G/qLsfFuhFjw=", "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "47b604b07d1e8146d5398b42d3306fdebd343986", "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,11 +166,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1718068746, "lastModified": 1719169878,
"narHash": "sha256-caqH+CsuzmJTQ8F1/sH+8q2whKT4nNTBFViMdTonauc=", "narHash": "sha256-lgW9JNrT6a6cqH1Y/FFYvjN+uCdRlCoFkkTP8RErSNc=",
"ref": "main", "ref": "main",
"rev": "c29378c2f88efa9329b62a68e6d219a04de20755", "rev": "574292b7985caca6a786057e008d648fffdba5f6",
"revCount": 1667, "revCount": 1697,
"type": "git", "type": "git",
"url": "https://dev.tildefriends.net/cory/tildefriends" "url": "https://dev.tildefriends.net/cory/tildefriends"
}, },
@ -181,22 +180,6 @@
"url": "https://dev.tildefriends.net/cory/tildefriends" "url": "https://dev.tildefriends.net/cory/tildefriends"
} }
}, },
"unstable": {
"locked": {
"lastModified": 1718160348,
"narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "57d6973abba7ea108bac64ae7629e7431e0199b6",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"vedirect-reader": { "vedirect-reader": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",

View file

@ -5,7 +5,7 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
stable.url = "github:nixos/nixpkgs/nixos-24.05"; stable.url = "github:nixos/nixpkgs/nixos-24.05";
unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# home-manager-unstable = { # home-manager-unstable = {
# url = "github:nix-community/home-manager"; # url = "github:nix-community/home-manager";
@ -28,7 +28,7 @@
self, self,
nixpkgs, nixpkgs,
stable, stable,
unstable, # unstable,
# home-manager-unstable, # home-manager-unstable,
home-manager, home-manager,
vedirect-reader, vedirect-reader,

View file

@ -16,6 +16,7 @@
"tss" "tss"
"dialout" "dialout"
"vboxusers" "vboxusers"
"adbusers"
]; ];
initialPassword = "password123"; initialPassword = "password123";
}; };

View file

@ -100,9 +100,58 @@ in {
osu-lazer-bin osu-lazer-bin
prismlauncher prismlauncher
procs sherlock
whois
android-tools
]; ];
programs.adb.enable = true;
services.grafana = {
enable = false;
settings.server = {
domain = "grafana.enry";
http_port = 2342;
http_addr = "0.0.0.0";
};
};
services.prometheus = {
enable = false;
port = 9000;
retentionTime = "60d";
exporters = {
node = {
enable = false;
enabledCollectors = ["systemd"];
port = 9002;
};
};
scrapeConfigs = [
{
job_name = "enry";
static_configs = [
{
targets = ["127.0.0.1:${toString config.services.prometheus.exporters.node.port}"];
}
];
}
{
job_name = "monitor";
static_configs = [
{
targets = ["127.0.0.1:8080"];
}
];
}
];
};
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
system.stateVersion = "23.11"; system.stateVersion = "23.11";
} }

View file

@ -6,7 +6,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "cTG7a51In" "id": "p1zksyCDw"
}, },
{ {
"expression": "*.bitwarden.com", "expression": "*.bitwarden.com",
@ -16,13 +16,21 @@
"cookieNames": [], "cookieNames": [],
"id": "b36dgnk3oC" "id": "b36dgnk3oC"
}, },
{
"expression": "*.cohost.org",
"listType": "WHITE",
"storeId": "default",
"cleanSiteData": [],
"cookieNames": [],
"id": "2HVQewDL-"
},
{ {
"expression": "*.deviantart.com", "expression": "*.deviantart.com",
"listType": "WHITE", "listType": "WHITE",
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "JpncSszfQy" "id": "pNE5X_o1nu"
}, },
{ {
"expression": "*.discord.com", "expression": "*.discord.com",
@ -30,7 +38,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "-nKl1MYRVg" "id": "r9b8_sXAoz"
}, },
{ {
"expression": "*.firefox.com", "expression": "*.firefox.com",
@ -38,7 +46,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "1y_aAjOYVL" "id": "e3hwvnNl1u"
}, },
{ {
"expression": "*.gitea.com", "expression": "*.gitea.com",
@ -46,7 +54,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "63XlO5_aHU" "id": "lp8eKF_Edc"
}, },
{ {
"expression": "*.github.com", "expression": "*.github.com",
@ -54,7 +62,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "VWGkAgBHbX" "id": "gUj9zyl1Fr"
}, },
{ {
"expression": "*.google.com", "expression": "*.google.com",
@ -62,7 +70,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "3oIpcYY72y" "id": "lw5QqYJGH5"
}, },
{ {
"expression": "*.gravatar.com", "expression": "*.gravatar.com",
@ -70,7 +78,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "35SigCi2Rb" "id": "IoTHdEQ-dh"
}, },
{ {
"expression": "*.kitsunes.chat", "expression": "*.kitsunes.chat",
@ -78,7 +86,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "TzeQjhAw-u" "id": "KO--ZIFLCi"
}, },
{ {
"expression": "*.kitsunes.club", "expression": "*.kitsunes.club",
@ -86,7 +94,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "EsAumZE9AF" "id": "MKm4iEBTIx"
}, },
{ {
"expression": "*.labyrinth.zone", "expression": "*.labyrinth.zone",
@ -94,7 +102,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "RvbnLJXx54" "id": "dtjlJIdFwQ"
}, },
{ {
"expression": "*.leboncoin.fr", "expression": "*.leboncoin.fr",
@ -104,13 +112,21 @@
"cookieNames": [], "cookieNames": [],
"id": "jRnGobVtTi" "id": "jRnGobVtTi"
}, },
{
"expression": "*.liberapay.com",
"listType": "WHITE",
"storeId": "default",
"cleanSiteData": [],
"cookieNames": [],
"id": "LmE2-isX-"
},
{ {
"expression": "*.localhost", "expression": "*.localhost",
"listType": "WHITE", "listType": "WHITE",
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "qPMzJ629k2" "id": "o8qkrgBYnT"
}, },
{ {
"expression": "*.neocities.org", "expression": "*.neocities.org",
@ -118,7 +134,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "gc5fxz-fsN" "id": "ZI23V1sj6r"
}, },
{ {
"expression": "*.nextdns.io", "expression": "*.nextdns.io",
@ -126,7 +142,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "lNWjRmBbqL" "id": "0j9zoUMlCK"
}, },
{ {
"expression": "*.nixos.org", "expression": "*.nixos.org",
@ -134,7 +150,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "ngMTHwUFyHD" "id": "sMx3VB2CCdH"
}, },
{ {
"expression": "*.ppy.sh", "expression": "*.ppy.sh",
@ -142,7 +158,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "NxkUQjW7AOl" "id": "w4fEeplb7le"
}, },
{ {
"expression": "*.proton.me", "expression": "*.proton.me",
@ -150,7 +166,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "MJqM2UC1Bij" "id": "AYonUUH1nfv"
}, },
{ {
"expression": "*.protondb.com", "expression": "*.protondb.com",
@ -158,7 +174,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "C258MPpLdK7" "id": "tMGst7Wz3q0"
}, },
{ {
"expression": "*.puter.com", "expression": "*.puter.com",
@ -166,7 +182,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "sVNV7mLRD9L" "id": "Psaow1NtgQc"
}, },
{ {
"expression": "*.reddit.com", "expression": "*.reddit.com",
@ -174,7 +190,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "d5zcsrYn609" "id": "2-L8wjBRbrw"
}, },
{ {
"expression": "*.roadmap.sh", "expression": "*.roadmap.sh",
@ -184,13 +200,21 @@
"cookieNames": [], "cookieNames": [],
"id": "YGIXz9JIfgE" "id": "YGIXz9JIfgE"
}, },
{
"expression": "*.simplelogin.io",
"listType": "WHITE",
"storeId": "default",
"cleanSiteData": [],
"cookieNames": [],
"id": "hLMxuEZtR"
},
{ {
"expression": "*.starlink.com", "expression": "*.starlink.com",
"listType": "WHITE", "listType": "WHITE",
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "Yplp5pBnkmf" "id": "G8XRutIYTsQ"
}, },
{ {
"expression": "*.steamcommunity.com", "expression": "*.steamcommunity.com",
@ -198,7 +222,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "yO3S7VXSgqU" "id": "kly90Zz2BRj"
}, },
{ {
"expression": "*.tailscale.com", "expression": "*.tailscale.com",
@ -206,7 +230,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "OD7bUCsEbvt" "id": "0ertajKp_w-"
}, },
{ {
"expression": "*.tildefriends.net", "expression": "*.tildefriends.net",
@ -214,7 +238,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "X8pZJv8W4pE" "id": "h9HWRikuVxB"
}, },
{ {
"expression": "*.wetdry.world", "expression": "*.wetdry.world",
@ -222,7 +246,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "gG8C7R5r-Qi" "id": "-fZohrAKEdz"
}, },
{ {
"expression": "*.wikipedia.org", "expression": "*.wikipedia.org",
@ -230,7 +254,7 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "q9_Dh7OzKup" "id": "IyPcXFE_8Za"
}, },
{ {
"expression": "127.0.0.1", "expression": "127.0.0.1",
@ -238,7 +262,15 @@
"storeId": "default", "storeId": "default",
"cleanSiteData": [], "cleanSiteData": [],
"cookieNames": [], "cookieNames": [],
"id": "uA82qj9q2x0" "id": "gPb2sZaOozd"
},
{
"expression": "*.indeed.com",
"listType": "GREY",
"storeId": "default",
"cleanSiteData": [],
"cookieNames": [],
"id": "XW0CIntVU"
} }
] ]
} }

View file

@ -5,7 +5,8 @@
"frame", "frame",
"fetch", "fetch",
"noscript", "noscript",
"other" "other",
"media"
], ],
"temp": false "temp": false
}, },
@ -61,7 +62,6 @@
"§:tinkerbetter.tube", "§:tinkerbetter.tube",
"§:openpgp.org", "§:openpgp.org",
"§:cern.ch", "§:cern.ch",
"§:tilde.club",
"§:indeed.com", "§:indeed.com",
"§:ko-fi.com", "§:ko-fi.com",
"§:cdn-cookieyes.com", "§:cdn-cookieyes.com",
@ -107,11 +107,34 @@
"§:gitea.com", "§:gitea.com",
"§:opml.org", "§:opml.org",
"§:crowdsupply.com", "§:crowdsupply.com",
"§:sigbovik.org" "§:sigbovik.org",
"§:discord.com",
"§:discordapp.com",
"§:discordapp.net",
"§:ppy.sh",
"§:vantaa.black",
"§:mynixos.com",
"enry",
"§:coursera.org",
"§:bitwarden.com",
"§:firefox.com",
"§:grammarly.com",
"§:as207960.net",
"§:glauca.digital",
"§:haveibeenpwned.com",
"§:twitch.tv",
"§:bandcamp.com",
"§:bcbits.com",
"§:angblev.com",
"§:asciinema.org",
"§:jquery.com",
"§:bootstrapcdn.com",
"§:leboncoin.fr"
], ],
"untrusted": [ "untrusted": [
"googletagmanager.com", "googletagmanager.com",
"privacy-center.org" "privacy-center.org",
"googletagmanager.com"
], ],
"custom": {} "custom": {}
}, },