diff --git a/common.nix b/common.nix index ca9a791..06dda09 100644 --- a/common.nix +++ b/common.nix @@ -41,8 +41,8 @@ with builtins; services = { openssh = { - passwordAuthentication = false; - kbdInteractiveAuthentication = false; + settings.PasswordAuthentication = false; + settings.KbdInteractiveAuthentication = false; enable = true; }; }; @@ -63,10 +63,10 @@ with builtins; home.sessionVariables.TZ = nixosConfig.time.timeZone; }; - nixpkgs.config.packageOverrides = pkgs: { - sudo = pkgs.sudo.override { withInsults = true; }; - }; - security.sudo.extraConfig = "Defaults insults"; + #nixpkgs.config.packageOverrides = pkgs: { + #sudo = pkgs.sudo.override { withInsults = true; }; + #}; + #security.sudo.extraConfig = "Defaults insults"; diff --git a/potatobook-g/configuration.nix b/potatobook-g/configuration.nix index 775df49..ace2196 100644 --- a/potatobook-g/configuration.nix +++ b/potatobook-g/configuration.nix @@ -111,13 +111,12 @@ # _JAVA_OPTIONS = "-Dsun.java2d.uiScale=2"; # }; - hardware.bluetooth.enable = true; - hardware.keyboard.uhk.enable = true; + hardware.keyboard.uhk.enable = true; + hardware.enableRedistributableFirmware = true; - # missing: menu-qalc picom-jonaburg environment.systemPackages = with pkgs; [ - # TODO: clean up. + android-tools ]; environment.pathsToLink = [ @@ -126,6 +125,8 @@ services.blueman.enable = true; + programs.adb.enable = true; + services.gnome.gnome-keyring.enable = true; programs.seahorse.enable = true; security.pam.services.jade.enableGnomeKeyring = true; diff --git a/scripts/desktop/searchwolf.nix b/scripts/desktop/searchwolf.nix index ea51e27..b2928f1 100644 --- a/scripts/desktop/searchwolf.nix +++ b/scripts/desktop/searchwolf.nix @@ -1,30 +1,2 @@ { pkgs, ... }: -pkgs.writeShellScriptBin "searchwolf" '' - echo "retv $ROFI_RETV" - if [ x"$@" = x"exit" ]; then - exit 0 - fi - - case $ROFI_RETV in - 0) - ;; - 1) - if [ $ROFI_DATA = x"" ]; then - exit 0 - fi - coproc ( librewolf --new-tab "$(echo $ROFI_DATA | jq -r.[''${@%%.*}])" > /dev/null 2>&1 ) - exit 0 - ;; - 2) - ddgrout=$(ddgr --json --num=25 "$@") - - for i in $(echo $ddgrout | jq -r 'keys | @sh'); do - title=$(echo $ddgrout | jq -r .[$i].title) - url=$(echo $ddgrout | jq -r .[$i].url) - echo "$i. $title ($url)" - done - - echo -e "\0data\x1f$(echo $ddgrout | jq -r .[].url | jq -sRc '. | split("\n") | [ .[] | select(length > 0) ]')" - ;; - esac -'' +pkgs.writeShellScriptBin "searchwolf" builtins.readFile ./searchwolf.sh diff --git a/scripts/desktop/searchwolf.sh b/scripts/desktop/searchwolf.sh new file mode 100644 index 0000000..d142d44 --- /dev/null +++ b/scripts/desktop/searchwolf.sh @@ -0,0 +1,28 @@ + + echo "retv $ROFI_RETV" + if [ x"$@" = x"exit" ]; then + exit 0 + fi + + case $ROFI_RETV in + 0) + ;; + 1) + if [ $ROFI_DATA = x"" ]; then + exit 0 + fi + coproc ( librewolf --new-tab "$(echo $ROFI_DATA | jq -r.[${@%%.*}])" > /dev/null 2>&1 ) + exit 0 + ;; + 2) + ddgrout=$(ddgr --json --num=25 "$@") + + for i in $(echo $ddgrout | jq -r 'keys | @sh'); do + title=$(echo $ddgrout | jq -r .[$i].title) + url=$(echo $ddgrout | jq -r .[$i].url) + echo "$i. $title ($url)" + done + + echo -e "\0data\x1f$(echo $ddgrout | jq -r .[].url | jq -sRc '. | split("\n") | [ .[] | select(length > 0) ]')" + ;; + esac