diff --git a/common/components/de/hyprland.nix b/common/components/de/hyprland.nix index 9ea6a49..35e68fd 100644 --- a/common/components/de/hyprland.nix +++ b/common/components/de/hyprland.nix @@ -16,7 +16,7 @@ starship helix - qutebrowser + #qutebrowser zathura mpv imv diff --git a/common/services/adguardhome.nix b/common/services/adguardhome.nix index 96e7d02..7e4c079 100644 --- a/common/services/adguardhome.nix +++ b/common/services/adguardhome.nix @@ -1,6 +1,9 @@ { # Ad-blocking DNS server - # Web UI available at http://localhost:3000 + # Web UI available at one of: + # https://localhost + # http://localhost + # http://localhost:3000 services.adguardhome.enable = true; networking.nameservers = ["127.0.0.1"]; diff --git a/common/services/ssh.sh b/common/services/ssh.sh new file mode 100755 index 0000000..41dd404 --- /dev/null +++ b/common/services/ssh.sh @@ -0,0 +1,12 @@ + +if [[ -n $SSH_CONNECTION ]] ; then + curl \ + -H "Title: New SSH session" \ + -H "Priority: urgent" \ + -H "Tags: urgent" \ + -d "$(cat /etc/hostname ): ssh sessifsfsqqfqsqsfon ($SSH_CONNECTION)" \ + ntfy.sh/tasiaiso_alerts &> /dev/null # Please don't make me learn how to manage secrets +fi + + +/run/current-system/sw/bin/zsh \ No newline at end of file diff --git a/common/services/sshd.nix b/common/services/sshd.nix index e06e6da..ba77a13 100644 --- a/common/services/sshd.nix +++ b/common/services/sshd.nix @@ -41,6 +41,8 @@ X11Forwarding no AllowAgentForwarding no AllowStreamLocalForwarding no + + # ForceCommand /home/tasia/Desktop/nixos-config/common/services/ssh.sh ''; }; diff --git a/flake.lock b/flake.lock index f4b375f..225543b 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1714679908, - "narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=", + "lastModified": 1715077503, + "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", "owner": "nix-community", "repo": "home-manager", - "rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848", + "rev": "6e277d9566de9976f47228dd8c580b97488734d4", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714635257, - "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", + "lastModified": 1714906307, + "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", + "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "type": "github" }, "original": { @@ -46,11 +46,11 @@ }, "stable": { "locked": { - "lastModified": 1714685007, - "narHash": "sha256-Q4ddhb5eC5pwci0QhAapFwnsc8X8H9ZMQiWpsofBsDc=", + "lastModified": 1714971268, + "narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "383ffe076d9b633a2e97b6e4dd97fc15fcf30159", + "rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c", "type": "github" }, "original": { @@ -62,11 +62,11 @@ }, "unstable": { "locked": { - "lastModified": 1714635257, - "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", + "lastModified": 1714906307, + "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", + "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "type": "github" }, "original": { diff --git a/hosts/new-phoenix/configuration.nix b/hosts/new-phoenix/configuration.nix index 82a7186..7d88042 100644 --- a/hosts/new-phoenix/configuration.nix +++ b/hosts/new-phoenix/configuration.nix @@ -16,7 +16,6 @@ in { ../../common/hardware/ssd.nix ../../common/hardware/btrfs.nix - ../../common/services/adguardhome.nix ../../common/services/syncthing.nix ../../home/tasia-but-old-username/home.nix @@ -26,7 +25,7 @@ in { hostName = "phoenix"; firewall.allowedTCPPorts = [ - # 8384 # syncthing web UI + 8384 # syncthing web UI 12345 # tildefriends 13378 # audiobookshelf ]; diff --git a/stuff/noscript.json b/stuff/noscript.json index f3dc4d0..ff19bbe 100644 --- a/stuff/noscript.json +++ b/stuff/noscript.json @@ -45,7 +45,14 @@ "§:proton.me", "§:kitsunes.club", "§:tailscale.com", - "§:nextdns.io" + "§:nextdns.io", + "§:opencollective.com", + "§:liberapay.com", + "§:keyoxide.org", + "§:openpgp.org", + "§:cern.ch", + "§:tilde.club", + "§:indeed.com" ], "untrusted": [], "custom": {} diff --git a/stuff/proofs.md b/stuff/proofs.md new file mode 100644 index 0000000..8bb6f8e --- /dev/null +++ b/stuff/proofs.md @@ -0,0 +1,8 @@ +proof@ariadne.id=https://opencollective.com/tasiaiso +proof@ariadne.id=https://dev.tildefriends.net/tasiaiso/keyoxide_proof +proof@ariadne.id=https://kitsunes.club/@tasiaiso +proof@ariadne.id=https://discourse.nixos.org/u/tasiaiso +proof@ariadne.id=https://gist.github.com/tasiaiso/a21124a1f59021bc23deb3b3fd2ae44d +proof@ariadne.id=https://gitea.com/tasiaiso/keyoxide_proof +proof@ariadne.id=https://liberapay.com/tasiaiso +proof@ariadne.id=openpgp4fpr:A485B7C43AEC514B50A00F96857B004418AA6255