From 69ccdcb3949f9739e0cb6b8d4cd76828eb70ecd6 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 12 Mar 2024 16:04:12 +0300 Subject: [PATCH] ayugram --- flake.nix | 1 + home/home.nix | 2 +- home/scripts.nix | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 8b4cff8..3c33837 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,7 @@ telegram-desktop-patched-unstable.url = "github:shwewo/telegram-desktop-patched"; agenix.url = "github:ryantm/agenix"; agenix.inputs.darwin.follows = ""; + ayugram-desktop.url = "github:shwewo/ayugram-desktop"; }; outputs = inputs @ { nixpkgs, nixpkgs-stable, nixpkgs-unstable, home-manager, home-manager-unstable, firefox, anyrun, agenix, ... }: { diff --git a/home/home.nix b/home/home.nix index 1ae34d8..75cab7a 100644 --- a/home/home.nix +++ b/home/home.nix @@ -49,7 +49,7 @@ wl-clipboard-x11 (callPackage ../derivations/audiorelay.nix { }) (callPackage ../derivations/spotify.nix { }) - (callPackage ../derivations/nu_plugin_dns.nix { }) + #(callPackage ../derivations/nu_plugin_dns.nix { }) xorg.xwininfo jq ]) ++ (with unstable; [ diff --git a/home/scripts.nix b/home/scripts.nix index 1ccb780..b8cb0a7 100644 --- a/home/scripts.nix +++ b/home/scripts.nix @@ -5,14 +5,14 @@ let #!/usr/bin/env bash default_interface=$(${pkgs.iproute2}/bin/ip route show default | ${pkgs.gawk}/bin/awk '/default/ {print $5}') - interfaces=$(${pkgs.iproute2}/bin/ip -o -4 addr show | ${pkgs.gawk}/bin/awk '$4 ~ /\/24/ {print $2}' | sed -e ':a' -e 'N' -e '$!ba' -e 's/\n/|/g') + interfaces=$(${pkgs.iproute2}/bin/ip -o -4 addr show | ${pkgs.gawk}/bin/awk '$4 ~ /\/24/ {print $2}' | grep -v "wlp1s0" | sed -e ':a' -e 'N' -e '$!ba' -e 's/\n/|/g') # The difference between default_interface and and default chose option is that default_interface is used to get dhcp from it, and default is for leave network as is without tweaking it (e.g. VPN/proxy/whatever) result=$(${pkgs.gnome.zenity}/bin/zenity --forms --title="Configuration" \ --text="Please configure your settings" \ --add-combo="Browser:" --combo-values="google_chrome|ungoogled_chromium|firefox" \ - --add-combo="Network Interface:" --combo-values="default|"$interfaces \ + --add-combo="Network Interface:" --combo-values="wlp1s0|default|"$interfaces \ --add-combo="DNS Server:" --combo-values="dhcp|1.1.1.1|8.8.8.8|77.88.8.1") if [[ -z $result ]]; then