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

modules/cli-tools.nix

@@ -24,5 +24,6 @@
     tldr
     file
     unzip
+    lsof
   ];
 }

modules/ecryptfs.nix

@@ -0,0 +1,10 @@
+{ pkgs, ...}:
+{
+  environment.systemPackages = with pkgs; [
+    ecryptfs
+  ];
+  security.pam.enableEcryptfs = true;
+
+  programs.ecryptfs.enable = true;
+  boot.kernelModules = ["ecryptfs"];
+}

modules/fh/forensik.nix

@@ -6,5 +6,6 @@
         binwalk
         sleuthkit
         samdump2
+        apktool
     ];
 }

modules/gpg.nix

@@ -5,7 +5,7 @@
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
-    pinentryFlavor = "qt";
+    #pinentryFlavor = "qt";
   };
   #environment.systemPackages = with pkgs; [
   #  pinentry-curses

modules/graphical/games.nix

@@ -10,7 +10,9 @@
     taisei
     osu-lazer-bin
     wineWowPackages.unstableFull
+    winetricks
     lutris
     prismlauncher
+    #libs
   ];
 }

modules/graphical/obs.nix

@@ -1,9 +1,10 @@
 { config, pkgs, ...}:
 {
-  boot = {
-    kernelModules = ["v4l2loopback"]; # Autostart kernel modules on boot
-    extraModulePackages = with config.boot.kernelPackages; [v4l2loopback]; # loopback module to make OBS virtual camera work
-  };
+  # borked in unstable branch
+  #boot = {
+  #  kernelModules = ["v4l2loopback"]; # Autostart kernel modules on boot
+  #  extraModulePackages = with config.boot.kernelPackages; [v4l2loopback]; # loopback module to make OBS virtual camera work
+  #};
 
   environment.systemPackages = with pkgs; [
     (wrapOBS {

modules/graphical/plasma.nix

@@ -2,10 +2,11 @@
 
 {
   services.xserver = {
-    layout = "at";
-    xkbVariant = "";
+    xkb.layout = "at";
+    xkb.variant = "";
     enable = true;
     displayManager.sddm.enable = true;
-    desktopManager.plasma6.enable = true;
+    #displayManager.sddm.wayland.enable = true;
   };
+  services.desktopManager.plasma6.enable = true;
 }

modules/nix/ld.nix

@@ -1,3 +1,40 @@
+{ pkgs, ... }:
 {
   programs.nix-ld.enable = true;
+#  programs.nix-ld.libraries = with pkgs; [
+#    nspr
+#    xorg.libXrandr
+#    xorg.libX11
+#    xorg.libXcomposite
+#    xorg.libXdamage
+#    xorg.libXfixes
+#    xorg.libXrender
+#    xorg.libXtst
+#    xorg.libXau
+#    xorg.libXdmcp
+#    expat
+#    libgcc.lib
+#    libglvnd
+#    zlib
+#    zstd
+#    stdenv.cc.cc
+#    curl
+#    openssl
+#    attr
+#    libssh
+#    bzip2
+#    libxml2
+#    acl
+#    libsodium
+#    util-linux
+#    xz
+#    systemd
+#    libkrb5
+#    glib
+#    nss
+#    freetype
+#    fontconfig.lib
+#    dbus.lib
+#    alsa-lib
+#  ];
 }