Merge

shared/dwm.nix

@@ -3,7 +3,7 @@ let
   dwm = pkgs.dwm.overrideAttrs (old: {
     src = builtins.fetchGit {
       url = "https://github.com/FredzyW/dwm-conf.git";
-      rev = "964a3b9c94e780636a1a4ef01afb90ab8de4bb6d";
+      rev = "696050185fa48575e53157e83d46ae0613733446";
     };
     nativeBuildInputs = with pkgs; [ 
       xorg.libX11.dev

shared/fish.nix

@@ -39,7 +39,7 @@
 	  ];
 	  shellAbbrs = {
 		  homec="nvim ~/nix/config/home.nix";
-		  ls="exa -lag --header";
+		  ls="exa -l --no-time --no-permissions --no-user";
 		  dev="nix develop --command fish";
 		  spot="steam-run ~/program/spotify_player";
 		  sc="sc-im";
@@ -48,6 +48,8 @@
 		  home="home-manager switch --flake $HM_DIR";
 		  reb="sudo nixos-rebuild switch --flake $SYSTEM_DIR";
 		  cam="jira issue create && jira issue assign && jira issue move";
+		  vpnup="sudo VPN_PROTOCOL=wireguard DISABLE_IPV6=yes DIP_TOKEN=no AUTOCONNECT=true PIA_PF=false PIA_DNS=true PIA_USER=p4558499 PIA_PASS=vUZA6Nfzci ~/program/manual-connections/run_setup.sh";
+		  vpndown="wg-quick down pia";
 	  };
 	  interactiveShellInit = ''
 		set fish_greeting # Disable greeting

shared/mpv.nix

@@ -0,0 +1,24 @@
+{ pkgs, lib, myhostname, ... }:
+{
+	programs.mpv = {
+	  enable = true;
+
+	  package = (
+		pkgs.mpv-unwrapped.wrapper {
+		  scripts = with pkgs.mpvScripts; [
+			uosc
+			sponsorblock
+		  ];
+
+		  mpv = pkgs.mpv-unwrapped.override {
+		  };
+		}
+	  );
+
+	  config = {
+		profile = "high-quality";
+		ytdl-format = "bestvideo+bestaudio";
+		cache-default = 4000000;
+	  };
+	};
+}

shared/ssh.nix

@@ -79,6 +79,17 @@
         port = 22;
         user = "ifacts";
         identityFile = "/home/fw/.ssh/ifacts-ssh-key";
+	};
+      "kobo" = {
+        hostname = "192.168.1.192";
+        port = 22;
+        user = "root";
+      };
+      "disa" = {
+        hostname = "192.168.1.242";
+        port = 22;
+        user = "disah";
+        identityFile = "/home/fw/.ssh/id_rsa";
       };
     };
   };

shared/zathura.nix

@@ -4,6 +4,10 @@
     enable = true;
     options = {
       selection-clipboard = "clipboard";
+	  font = "FiraCodeNerdFont Normal 12";
     };
+	extraConfig = ''
+		include catppuccin-latte
+	'';
   };
 }