attempted to add a keybind to toggle touchpad

somehow i cant get the script to run when i use the touchpad, but hey,
its in the repo now and the licence has been updated so i can get around
to it later

also i removed the default fish greeting it was annoying me

LICENCE

@@ -1,3 +1,40 @@
+Copyright for portions of this repository are held by Diana, 2024 as part of the files available at https://github.com/dianaw353/dotfiles and are provided under the BSD license. See the below lincences for details.
+All other copyright for project Foo are held by Gabriella Bere, 2024.
+
+Licenses are specified as follows:
+
+file: 
+licence of file
+
+
+./scripts/hyprland/touchpad_toggle.sh:
+BSD 2-Clause License
+
+Copyright (c) 2024, Diana
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Everything else in this repo:
 MIT License
 
 Copyright (c) 2024 Gabriella Bere
@@ -7,3 +44,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

home-manager/fish.nix

@@ -0,0 +1,37 @@
+{ pkgs, ... }:
+{
+  programs.fish = {
+    enable = true;
+    generateCompletions = true;
+    shellAliases = {
+      ls = "eza -lh";
+      ip = "ip --color=auto";
+      nano = "nvim";
+      cd = "z";
+      cat = "bat";
+
+      # Aliases for my nixos workflow
+      nixos-switch = "sudo nixos-rebuild switch --flake ~/nixconf &| nom";
+      home-switch = "home-manager switch --flake ~/nixconf &| nom";
+      server-switch = "nixos-rebuild switch --flake ~/nixconf#biggerpi --target-host blue@biggerpi --use-remote-sudo &| nom";
+      home-manager-news = "home-manager news --flake ~/nixconf";
+    };
+    shellInit = "
+      set --global theme_virtual_env_prompt_enabled no
+      set --global VIRTUAL_ENV_DISABLE_PROMPT 1
+      set --global theme_env_packages_hide binutils-wrapper hyprland-qtutils pciutils pkgconf-wrapper
+      set fish_greeting \"\"
+    ";
+    plugins = [
+      {
+        name = "agnoster";
+        src = pkgs.fetchFromGitHub {
+          owner = "IBeTheBlueCat";
+          repo = "theme-agnoster";
+          rev = "c6b1e6b5671f75d30d2d81a11963ef445e78d8e6";
+          hash = "sha256-hO5ow+7nBqFeXWj8sjd6whuSYqsKYCpvcINU6zpAzsU=";
+        };
+      }
+    ];
+  };
+}

home-manager/home.nix

@@ -12,14 +12,14 @@
     ./waybar.nix
     ./swaync.nix
     ./hyprlock.nix
-    ./zsh.nix
+    ./fish.nix
     ./eza.nix
     ./nvf.nix
     ./nextcloud.nix
     ./git.nix
     ./stylix.nix
     ./direnv.nix
-    ./firefox.nix
+    ./floorp.nix
     ./zellij.nix
     ./obs-studio.nix
     ./packages.nix
@@ -30,7 +30,7 @@
   services.gnome-keyring.enable = true; # used for nextcloud-client
 
   home.sessionVariables = {
-    DEFAULT_BROWSER = "${lib.getExe pkgs.firefox}"; # even though im using floorp this still works, and pkgs.floorp doesnt
+    DEFAULT_BROWSER = "${lib.getExe pkgs.floorp}"; 
     # Allow XWayland apps to not be weird after turning off xwayland scaling in hyprland.conf
     GDK_SCALE = 1;
     XCURSOR_SIZE = 24;
@@ -38,6 +38,18 @@
     EDITOR = "nvim";
     NIXOS_OZONE_WL = 1;
     LD_LIBRARY_PATH = "${pkgs.libGL}/lib:${pkgs.gtk3}/lib:${pkgs.glib.out}/lib:${pkgs.xorg.libXtst}/lib";
+    scripts = "/home/blue/nixconf/scripts";
+  };
+
+  xdg.mimeApps = {
+    enable = true;
+    defaultApplications = {
+      "text/html" = "floorp.desktop";
+      "x-scheme-handler/http" = "floorp.desktop";
+      "x-scheme-handler/https" = "floorp.desktop";
+      "x-scheme-handler/about" = "floorp.desktop";
+      "x-scheme-handler/unknown" = "floorp.desktop";
+    };
   };
 
   # Let Home Manager install and manage itself.

home-manager/hyprland.nix

@@ -7,7 +7,7 @@
     systemd.variables = [ "--all" ];
     settings = {
       misc = {
-        enable_anr_dialog = false;
+        enable_anr_dialog = false; # disable application not repsonding dialog as it tends to just get in the way when trying to fix the unresponsive application
       };
       # Monitor config for home desk layout
       monitor = [
@@ -65,11 +65,13 @@
         "$mod, F, exec, floorp"
         "$mod, 1, exec, alacritty"
         "$mod, D, exec, vesktop"
-        "$mod, space, exec, zsh -c 'wofi --show drun, run'"
+        "$mod, space, exec, bash -c 'wofi --show drun, run'"
+
+        # Keybind for toggling touchpad
+        "$mod, j, exec, sh $scripts/hyprland/touchpad_toggle.sh"
 
         # Screenshot tool
-        ", Print, exec, grimblast copy area"
+        ", Print, exec, hyprshot -m region"
-        "SHIFT, Print, exec, grimblast save area"
 
         # Screen locking tool
         "$mod, l, exec, hyprlock"

home-manager/nvf.nix

@@ -1,7 +1,4 @@
-{
+{ pkgs, ... }:
-  pkgs,
-  ...
-}:
 {
   programs.nvf = {
     enable = true;
@@ -37,21 +34,19 @@
           java.enable = true;
         };
         autocomplete.blink-cmp.enable = true;
-        startPlugins = with pkgs.vimPlugins; [
+        notes.neorg = {
-          vimwiki
+          enable = true;
-        ];
+          treesitter = {
-        # the following doesnt seem to work, i fear i may have to properly package vimwiki but i dont want to do that right now so i will come back later
+            enable = true;
-        #        luaConfigRC = ''
+            norgPackage = pkgs.tree-sitter-grammars.tree-sitter-norg;
-        #
+          };
-        #	  -- set vimwiki settings that I want
+          setupOpts.load = {
-        #          set nocompatible
+            "core.defaults".enable = true;
-        #          filetype plugin on
+            "core.concealer".config = {
-        #          syntax on
+              conceallevel = 3;
-        #
+            };
-        #          let g:vimwiki_list = [{'path': '~/Notes/',
+          };
-        #                                \ 'syntax': 'markdown', 'ext': 'md'}]
+        };
-        #          let g:vimwiki_global_ext = 0
-        #        ''; # Required settings for vimwiki
       };
     };
   };

home-manager/packages.nix

@@ -2,7 +2,7 @@
 {
   # packages that i dont need to use a module for
   home.packages = with pkgs; [
-    grimblast # Screenshot tool
+    hyprshot # Screenshot tool
     powerline-fonts # Fonts
     nix-output-monitor # Provides a dependency graph for nix builds
     bitwarden-desktop # Integrates with bitwarden extension
@@ -34,6 +34,8 @@
     tenacity # small DAW
     davinci-resolve # video editor
     libreoffice # office suite
+    zoom-us # proprietary meeting app
+    libnotify # notification server useful in scripting
  
     # Audio Plugins
     calf

home-manager/zellij.nix

@@ -2,7 +2,7 @@
 {
   programs.zellij = {
     enable = true;
-    enableZshIntegration = true;
+    enableFishIntegration = true;
     exitShellOnExit = true;
     attachExistingSession = true;
   };

home-manager/zsh.nix

@@ -1,43 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-
-{
-  programs.zsh = {
-    enable = true;
-    autocd = true;
-    dotDir = ".config/zsh";
-    autosuggestion.enable = true;
-    enableCompletion = true;
-    shellAliases = {
-      ls = "eza -lh";
-      ip = "ip --color=auto";
-      nano = "nvim";
-      cd = "z";
-      cat = "bat";
-
-      # Aliases for my nixos workflow
-      switch = "sudo nixos-rebuild switch --flake ~/nixconf |& nom";
-      homeswitch = "home-manager switch --flake ~/nixconf |& nom";
-      serverswitch = "nixos-rebuild switch --flake ~/nixconf#biggerpi --target-host blue@biggerpi --use-remote-sudo |& nom";
-    };
-
-    plugins = with pkgs; [
-      {
-        name = "zsh-syntax-highlighting";
-        src = fetchFromGitHub {
-          owner = "zsh-users";
-          repo = "zsh-syntax-highlighting";
-          rev = "0.6.0";
-          sha256 = "0zmq66dzasmr5pwribyh4kbkk23jxbpdw4rjxx0i7dx8jjp2lzl4";
-        };
-        file = "agkozak-zsh-prompt.plugin.zsh";
-      }
-    ];
-    oh-my-zsh = {
-      enable = true;
-      theme = "agnoster";
-    };
-  };
-}

hosts/gabbielaptop/configuration.nix

@@ -116,19 +116,6 @@
     };
   };
 
-  musnix.enable = true;
-
-  # pam.services = [
-  #   { name = "gnome_keyring"
-  #     text = ''
-  #       auth     optional    ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
-  #       session  optional    ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
-  #
-  #       password  optional    ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
-  #     '';
-  #   }
-  # ];
-
   services.gnome.gnome-keyring.enable = true;
 
   nix.settings.trusted-users = [
@@ -136,7 +123,7 @@
     "blue"
   ];
 
-  programs.zsh.enable = true;
+  programs.fish.enable = true;
   users.users.blue = {
     isNormalUser = true;
     description = "Gabriella Bere";
@@ -146,12 +133,11 @@
       "dialout"
       "audio"
     ];
-    shell = pkgs.zsh;
+    shell = pkgs.fish;
   };
 
   # Enable fingerprint daemon
   services.fprintd.enable = true;
-  #  services.fprintd.tod.enable = true;
 
   # Enable bluetooth and blueman
   hardware.bluetooth = {
@@ -178,6 +164,8 @@
   programs.steam.remotePlay.openFirewall = true;
   programs.gamemode.enable = true;
 
+  # Enable musnix for realtime audio and other such useful things
+  musnix.enable = true;
   # Open ports in the firewall.
   networking.firewall.allowedTCPPorts = [
     43391 # used to forward minecraft traffic to minecraft.gabbie.blue:33991

scripts/hyprland/touchpad_toggle.sh

@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+
+#
+# Script to toggle a given device.
+# Use the following command to choose what device you want to toggle:
+#   hyprctl devices
+#
+# Courtesy of r/hyprland Reddit community:
+#   https://reddit.com/r/hyprland/comments/11kr8bl/hotkey_disable_touchpad/
+#   https://reddit.com/r/hyprland/comments/1bqohmd/dynamically_enabledisable_device/
+#
+# Ported, generalized, improved and overengineered by Bahar Kurt for
+# Diana's dotfiles.
+#
+
+# HACK: Try to set a nonexistent config under "device:" so that
+# Hyprland refreshes all properties inside.
+hyprctl keyword device:a true > /dev/null 2>&1
+
+# Set device to be toggled
+export HYPRLAND_DEVICE="$(hyprctl devices | grep touchpad | sed '/2-synaptics-touchpad/d; s/.*	//')"
+export HYPRLAND_VARIABLE="device[${HYPRLAND_DEVICE}]:enabled"
+
+if [ -z "$XDG_RUNTIME_DIR" ]; then
+  export XDG_RUNTIME_DIR=/run/user/$(id -u)
+fi
+
+# Check if device is currently enabled
+export STATUS_FILE="$XDG_RUNTIME_DIR/touchpad.status"
+
+# Try to get the touchpad status from status file.
+if [ -f "$STATUS_FILE" ]; then
+  export TOUCHPAD_ENABLED="$(cat "$STATUS_FILE")"
+fi
+
+# Toggle the touchpad
+if [ "$TOUCHPAD_ENABLED" != "false" ]; then
+  # The touchpad is known to be, or assumed to be, enabled (not disabled).
+  export PREVIOUS_STATUS="true"
+  export TOUCHPAD_ENABLED="false"
+  # Try to disable the touchpad. If it fails, set the new status to enabled.
+  hyprctl --batch -r -- keyword "$HYPRLAND_VARIABLE" $TOUCHPAD_ENABLED || export TOUCHPAD_ENABLED="true"
+else
+  # The touchpad is known to be disabled.
+  export PREVIOUS_STATUS="false"
+  export TOUCHPAD_ENABLED="true"
+  # Try to enable the touchpad. If it fails, set the new status to disabled.
+  hyprctl --batch -r -- keyword "$HYPRLAND_VARIABLE" $TOUCHPAD_ENABLED || export TOUCHPAD_ENABLED="false"
+fi
+
+# Write the new touchpad status into the status file.
+echo "$TOUCHPAD_ENABLED" > "$STATUS_FILE"
+
+# Generate the notification message.
+export NOTIFMSG="Touchpad "
+
+if [ "$TOUCHPAD_ENABLED" == "$PREVIOUS_STATUS" ]; then
+  export NOTIFMSG+="could not be "
+  # Touchpad could not be...
+fi
+
+if [ "$PREVIOUS_STATUS" == "true" ]; then
+  export NOTIFMSG+="disabled."
+  # Touchpad (could not be) disabled.
+else
+  export NOTIFMSG+="enabled."
+  # Touchpad (could not be) enabled.
+fi
+
+notify-send -u normal "$NOTIFMSG"