From fb95429ee70414950085d9e72da156a05c56835e Mon Sep 17 00:00:00 2001 From: Tasia Iso Date: Mon, 24 Jun 2024 10:16:41 +0200 Subject: [PATCH] uhh --- common/base.nix | 3 +- common/services/autoupgrade.nix | 2 +- flake.lock | 43 +++++------------ flake.nix | 4 +- home/tasia/home.nix | 1 + hosts/yaseen/configuration.nix | 51 ++++++++++++++++++- stuff/cad.json | 86 ++++++++++++++++++++++----------- stuff/noscript.json | 31 ++++++++++-- 8 files changed, 155 insertions(+), 66 deletions(-) diff --git a/common/base.nix b/common/base.nix index 495712d..2417d43 100644 --- a/common/base.nix +++ b/common/base.nix @@ -69,8 +69,9 @@ "nvidia-settings" # osu! - "osu-lazer-bin-2024.412.1" "osu-lazer-bin" + + "android-studio-stable" ]; }; diff --git a/common/services/autoupgrade.nix b/common/services/autoupgrade.nix index f82c5f8..e04a6a7 100644 --- a/common/services/autoupgrade.nix +++ b/common/services/autoupgrade.nix @@ -40,7 +40,7 @@ script = '' 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 \ -H "Title: NixOS upgrade done" \ diff --git a/flake.lock b/flake.lock index 9aad6ba..367f22b 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1717527182, - "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", + "lastModified": 1718530513, + "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "owner": "nix-community", "repo": "home-manager", - "rev": "845a5c4c073f74105022533907703441e0464bc3", + "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "type": "github" }, "original": { @@ -59,11 +59,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718086528, - "narHash": "sha256-hoB7B7oPgypePz16cKWawPfhVvMSXj4G/qLsfFuhFjw=", + "lastModified": 1718835956, + "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "47b604b07d1e8146d5398b42d3306fdebd343986", + "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309", "type": "github" }, "original": { @@ -111,17 +111,16 @@ "nixpkgs": "nixpkgs", "stable": "stable", "tildefriends": "tildefriends", - "unstable": "unstable", "vedirect-reader": "vedirect-reader" } }, "stable": { "locked": { - "lastModified": 1718086528, - "narHash": "sha256-hoB7B7oPgypePz16cKWawPfhVvMSXj4G/qLsfFuhFjw=", + "lastModified": 1718835956, + "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "47b604b07d1e8146d5398b42d3306fdebd343986", + "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309", "type": "github" }, "original": { @@ -167,11 +166,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1718068746, - "narHash": "sha256-caqH+CsuzmJTQ8F1/sH+8q2whKT4nNTBFViMdTonauc=", + "lastModified": 1719169878, + "narHash": "sha256-lgW9JNrT6a6cqH1Y/FFYvjN+uCdRlCoFkkTP8RErSNc=", "ref": "main", - "rev": "c29378c2f88efa9329b62a68e6d219a04de20755", - "revCount": 1667, + "rev": "574292b7985caca6a786057e008d648fffdba5f6", + "revCount": 1697, "type": "git", "url": "https://dev.tildefriends.net/cory/tildefriends" }, @@ -181,22 +180,6 @@ "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": { "inputs": { "flake-utils": "flake-utils_2", diff --git a/flake.nix b/flake.nix index f812eca..e061f83 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ nixpkgs.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 = { # url = "github:nix-community/home-manager"; @@ -28,7 +28,7 @@ self, nixpkgs, stable, - unstable, + # unstable, # home-manager-unstable, home-manager, vedirect-reader, diff --git a/home/tasia/home.nix b/home/tasia/home.nix index 54abf7c..cad6cf4 100644 --- a/home/tasia/home.nix +++ b/home/tasia/home.nix @@ -16,6 +16,7 @@ "tss" "dialout" "vboxusers" + "adbusers" ]; initialPassword = "password123"; }; diff --git a/hosts/yaseen/configuration.nix b/hosts/yaseen/configuration.nix index 6c1b6f8..1b7181e 100644 --- a/hosts/yaseen/configuration.nix +++ b/hosts/yaseen/configuration.nix @@ -100,9 +100,58 @@ in { osu-lazer-bin 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 system.stateVersion = "23.11"; } diff --git a/stuff/cad.json b/stuff/cad.json index c508d11..1828d72 100644 --- a/stuff/cad.json +++ b/stuff/cad.json @@ -6,7 +6,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "cTG7a51In" + "id": "p1zksyCDw" }, { "expression": "*.bitwarden.com", @@ -16,13 +16,21 @@ "cookieNames": [], "id": "b36dgnk3oC" }, + { + "expression": "*.cohost.org", + "listType": "WHITE", + "storeId": "default", + "cleanSiteData": [], + "cookieNames": [], + "id": "2HVQewDL-" + }, { "expression": "*.deviantart.com", "listType": "WHITE", "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "JpncSszfQy" + "id": "pNE5X_o1nu" }, { "expression": "*.discord.com", @@ -30,7 +38,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "-nKl1MYRVg" + "id": "r9b8_sXAoz" }, { "expression": "*.firefox.com", @@ -38,7 +46,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "1y_aAjOYVL" + "id": "e3hwvnNl1u" }, { "expression": "*.gitea.com", @@ -46,7 +54,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "63XlO5_aHU" + "id": "lp8eKF_Edc" }, { "expression": "*.github.com", @@ -54,7 +62,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "VWGkAgBHbX" + "id": "gUj9zyl1Fr" }, { "expression": "*.google.com", @@ -62,7 +70,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "3oIpcYY72y" + "id": "lw5QqYJGH5" }, { "expression": "*.gravatar.com", @@ -70,7 +78,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "35SigCi2Rb" + "id": "IoTHdEQ-dh" }, { "expression": "*.kitsunes.chat", @@ -78,7 +86,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "TzeQjhAw-u" + "id": "KO--ZIFLCi" }, { "expression": "*.kitsunes.club", @@ -86,7 +94,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "EsAumZE9AF" + "id": "MKm4iEBTIx" }, { "expression": "*.labyrinth.zone", @@ -94,7 +102,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "RvbnLJXx54" + "id": "dtjlJIdFwQ" }, { "expression": "*.leboncoin.fr", @@ -104,13 +112,21 @@ "cookieNames": [], "id": "jRnGobVtTi" }, + { + "expression": "*.liberapay.com", + "listType": "WHITE", + "storeId": "default", + "cleanSiteData": [], + "cookieNames": [], + "id": "LmE2-isX-" + }, { "expression": "*.localhost", "listType": "WHITE", "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "qPMzJ629k2" + "id": "o8qkrgBYnT" }, { "expression": "*.neocities.org", @@ -118,7 +134,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "gc5fxz-fsN" + "id": "ZI23V1sj6r" }, { "expression": "*.nextdns.io", @@ -126,7 +142,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "lNWjRmBbqL" + "id": "0j9zoUMlCK" }, { "expression": "*.nixos.org", @@ -134,7 +150,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "ngMTHwUFyHD" + "id": "sMx3VB2CCdH" }, { "expression": "*.ppy.sh", @@ -142,7 +158,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "NxkUQjW7AOl" + "id": "w4fEeplb7le" }, { "expression": "*.proton.me", @@ -150,7 +166,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "MJqM2UC1Bij" + "id": "AYonUUH1nfv" }, { "expression": "*.protondb.com", @@ -158,7 +174,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "C258MPpLdK7" + "id": "tMGst7Wz3q0" }, { "expression": "*.puter.com", @@ -166,7 +182,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "sVNV7mLRD9L" + "id": "Psaow1NtgQc" }, { "expression": "*.reddit.com", @@ -174,7 +190,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "d5zcsrYn609" + "id": "2-L8wjBRbrw" }, { "expression": "*.roadmap.sh", @@ -184,13 +200,21 @@ "cookieNames": [], "id": "YGIXz9JIfgE" }, + { + "expression": "*.simplelogin.io", + "listType": "WHITE", + "storeId": "default", + "cleanSiteData": [], + "cookieNames": [], + "id": "hLMxuEZtR" + }, { "expression": "*.starlink.com", "listType": "WHITE", "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "Yplp5pBnkmf" + "id": "G8XRutIYTsQ" }, { "expression": "*.steamcommunity.com", @@ -198,7 +222,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "yO3S7VXSgqU" + "id": "kly90Zz2BRj" }, { "expression": "*.tailscale.com", @@ -206,7 +230,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "OD7bUCsEbvt" + "id": "0ertajKp_w-" }, { "expression": "*.tildefriends.net", @@ -214,7 +238,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "X8pZJv8W4pE" + "id": "h9HWRikuVxB" }, { "expression": "*.wetdry.world", @@ -222,7 +246,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "gG8C7R5r-Qi" + "id": "-fZohrAKEdz" }, { "expression": "*.wikipedia.org", @@ -230,7 +254,7 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "q9_Dh7OzKup" + "id": "IyPcXFE_8Za" }, { "expression": "127.0.0.1", @@ -238,7 +262,15 @@ "storeId": "default", "cleanSiteData": [], "cookieNames": [], - "id": "uA82qj9q2x0" + "id": "gPb2sZaOozd" + }, + { + "expression": "*.indeed.com", + "listType": "GREY", + "storeId": "default", + "cleanSiteData": [], + "cookieNames": [], + "id": "XW0CIntVU" } ] } \ No newline at end of file diff --git a/stuff/noscript.json b/stuff/noscript.json index e62d8e5..cef65ea 100644 --- a/stuff/noscript.json +++ b/stuff/noscript.json @@ -5,7 +5,8 @@ "frame", "fetch", "noscript", - "other" + "other", + "media" ], "temp": false }, @@ -61,7 +62,6 @@ "§:tinkerbetter.tube", "§:openpgp.org", "§:cern.ch", - "§:tilde.club", "§:indeed.com", "§:ko-fi.com", "§:cdn-cookieyes.com", @@ -107,11 +107,34 @@ "§:gitea.com", "§:opml.org", "§: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": [ "googletagmanager.com", - "privacy-center.org" + "privacy-center.org", + "googletagmanager.com" ], "custom": {} },