Merge branch 'master' of github.com:/kropatz/dotfiles

flake.nix

@@ -75,7 +75,7 @@
           ## Custom variables (e.g. ip, interface, etc)
           vars = import ./systems/userdata-default.nix // import ./systems/laptop/userdata.nix;
           pkgsVersion = nixpkgs;
-          inherit inputs;
+          inherit inputs outputs;
           inherit nix-colors;
         };
         modules = [
@@ -83,7 +83,6 @@
           ./users/kopatz
           ./modules/cli-tools.nix
           ./modules/ecryptfs.nix
-          ./modules/pentest.nix
           ./modules/graphical/audio.nix
           ./modules/graphical/code.nix
           ./modules/graphical/emulators.nix
@@ -92,6 +91,7 @@
           ./modules/graphical/hyprland.nix
           ./modules/graphical/ime.nix
           ./modules/graphical/shared.nix
+          ./modules/fh/scanning.nix
           ./modules/nix/ld.nix
           ./modules/nix/settings.nix
           ./modules/support/ntfs.nix

home-manager/hyprland-settings.nix

@@ -134,6 +134,7 @@
         bind = let
 	  rofi = "${pkgs.rofi-wayland}/bin/rofi";
 	  kitty = "${pkgs.kitty}/bin/kitty";
+	  #dolphin = "${pkgs.dolphin}/bin/dolphin";
 	  thunar = "${pkgs.xfce.thunar}/bin/thunar";
 	  wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy";
 	  wl-paste = "${pkgs.wl-clipboard}/bin/wl-paste";
@@ -258,7 +259,7 @@
         bind = $mainMod, D, exec, ${dunstctl} close-all
         # notes
 
-        bind = $mainMod, 1, exec, ${wl-paste} | xargs -I {} ${pdfgrep} -C 15 -h -i "{}" ~/Nextcloud/fh/pentest/folien/EHTT_ecampus.pdf| sed 's/[ \t]*$//' | ${wl-copy}
+        bind = $mainMod, 1, exec, ${wl-paste} | xargs -I {} grep -C 15 -h -i "{}" ~/Nextcloud/fh/pentest/folien/answers | ${wl-copy}
         bind = $mainMod, 2, exec, cat ~/Nextcloud/test.txt | ${wl-copy}
         bind = $mainMod, 3, exec, cat ~/Nextcloud/test.txt | ${wl-copy}
         bind = $mainMod, 4, exec, cat ~/Nextcloud/test.txt | ${wl-copy}

modules/fh/scanning.nix

@@ -5,5 +5,6 @@
         gobuster
         thc-hydra
         seclists
+        aircrack-ng
     ];
 }

modules/pentest.nix

@@ -1,7 +0,0 @@
-{
-    environment.systemPackages = [
-        nmap
-        hydra
-        gobuster
-    ]
-}

pkgs/tetrio-desktop/package.nix

@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s $out/opt/TETR.IO/TETR.IO $out/bin/tetrio
 
     substituteInPlace $out/share/applications/TETR.IO.desktop \
-      --replace-fail "Exec=/opt/TETR.IO/TETR.IO" "Exec=$out/bin/tetrio"
+      --replace "Exec=/opt/TETR.IO/TETR.IO" "Exec=$out/bin/tetrio"
 
     runHook postInstall
   '';

pkgs/tetrio-desktop/tetrio-plus.nix

@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
   version = "0.25.3";
 
   src = fetchzip {
-    url = "https://gitlab.com/UniQMG/tetrio-plus/-/jobs/6465395934/artifacts/raw/app.asar.zip";
-    hash = "sha256-24AD63YEypK7XUW6QnqJt56cUExIMrA2WgDi8jS5IFE=";
+    url = "https://gitlab.com/UniQMG/tetrio-plus/-/jobs/6517560474/artifacts/raw/app.asar.zip";
+    hash = "sha256-I7UvljloJyKrYpSuQ9V1ySSXKhYeJGDpex/K0R3iuCc=";
   };
 
   installPhase = ''