1 files changed, 51 insertions, 8 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 9dbe4634..991d7f7f 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -10,6 +10,43 @@ let
     mimeType = "text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;";
     exec = "${config.home-manager.users.${userName}.programs.emacs.package}/bin/emacsclient -a \"\" %F";
   };
+  emacsScratch = pkgs.stdenv.mkDerivation rec {
+    pname = "scratch";
+    version = "0077334cc299aa7885f804d88f52cdb1b35caf71";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "ffevotte";
+      repo = "scratch.el";
+      rev = version;
+      sha256 = "sha256-FUkKJ+1COGzgllzzv51yUIjMZI6slOFVExdwWl2ZEBA=";
+    };
+
+    phases = [ "installPhase" ];
+
+    installPhase = ''
+      mkdir -p $out/share/emacs/site-lisp
+      cp $src/scratch.el $out/share/emacs/site-lisp/default.el
+    '';
+  };
+  muteScript = pkgs.stdenv.mkDerivation {
+    name = "mute";
+    src = ./scripts/mute.zsh;
+
+    buildInputs = with pkgs; [ makeWrapper ];
+
+    phases = [ "installPhase" ];
+
+    installPhase = ''
+      mkdir -p $out/bin
+      install -m 0755 $src $out/bin/mute
+      wrapProgram $out/bin/mute \
+        --prefix PATH : ${pkgs.zsh}/bin \
+        --prefix PATH : ${pkgs.findutils}/bin \
+        --prefix PATH : ${pkgs.util-linux}/bin \
+        --prefix PATH : ${pkgs.coreutils}/bin \
+        --prefix PATH : ${pkgs.pulseaudio}/bin
+    '';
+  };
 in {
   imports = with flake.nixosModules.userProfiles.${userName}; [
     mpv
@@ -20,8 +57,8 @@ in {
       ssh = {
         matchBlocks = import ./ssh-hosts.nix; # customUtils.recImport { dir = ./ssh-hosts; };
         extraConfig = ''
-          Match host uniworx3.ifi.lmu.de,uniworx4.ifi.lmu.de,uni2workgw.ifi.lmu.de,blackbeard.tcs.ifi.lmu.de,gitlab2.rz.ifi.lmu.de,oregon.tcs.ifi.lmu.de !exec "nc -z -w 1 %h %p &>/dev/null"
-            ProxyJump gate
+          Match host uniworx3.ifi.lmu.de,uniworx4.ifi.lmu.de,uniworx5.ifi.lmu.de,uni2workgw.ifi.lmu.de,blackbeard.tcs.ifi.lmu.de,gitlab2.rz.ifi.lmu.de,oregon.tcs.ifi.lmu.de !exec "nc -z -w 1 %h %p &>/dev/null"
+            ProxyJump gate2
 
           Host *
         '';
@@ -33,8 +70,8 @@ in {
           evil evil-dvorak evil-magit undo-tree magit haskell-mode
           nix-mode yaml-mode json-mode shakespeare-mode
           smart-mode-line highlight-parentheses highlight-symbol
-          notmuch ag sass-mode lua-mode fira-code-mode
-          use-package use-package-ensure-system-package git-gutter
+          notmuch ag sass-mode lua-mode fira-code-mode use-package
+          use-package-ensure-system-package git-gutter emacsScratch
         ];
       };
       firefox = {
@@ -97,12 +134,18 @@ in {
         docs = "$HOME/documents";
         dl = "$HOME/Downloads";
         flk = "$HOME/config/nixos-flakes";
+        fsk-timi = "$HOME/projects/21s/fsk-timi";
+      };
+
+      obs-studio = {
+        enable = true;
+        plugins = with pkgs; [obs-v4l2sink];
       };
     };
 
     services = {
       dunst = {
-        settings = import ./dunst-settings.nix;
+        settings = import ./dunst-settings.nix inputs;
         iconTheme = cfg.gtk.iconTheme;
         enable = true;
       };
@@ -130,8 +173,8 @@ in {
       sxhkd = {
         enable = true;
         keybindings = {
-          "button8" = "${pkgs.pulseaudio}/bin/pacmd set-source-mute @DEFAULT_SOURCE@ 0";
-          "@button8" = "${pkgs.pulseaudio}/bin/pacmd set-source-mute @DEFAULT_SOURCE@ 1";
+          "button8" = "${muteScript}/bin/mute unmute";
+          "@button8" = "${muteScript}/bin/mute mute";
           "button9" = "${pkgs.pulseaudio}/bin/pacmd set-sink-mute @DEFAULT_SINK@ 1";
           "@button9" = "${pkgs.pulseaudio}/bin/pacmd set-sink-mute @DEFAULT_SINK@ 0";
         };
@@ -179,7 +222,7 @@ in {
         google-play-music-desktop-player qt5ct playerctl evince
         thunderbird zulip zoom-us steam steam-run wireshark skype
         virt-manager rclone cached-nix-shell xournal discord xmonad
-        worktime fira-code-symbols emacsclientDesktopItem
+        worktime fira-code-symbols emacsclientDesktopItem libreoffice
       ];
 
       file = {