From 5447796ecf08eac08380470f2560fcb471a5eef6 Mon Sep 17 00:00:00 2001
From: Felix Wittwer <dev@felixwittwer.de>
Date: Thu, 10 Mar 2022 13:24:15 +0100
Subject: [PATCH] Update vimrc and other files

---
 entropy/.vimrc                  |  4 +--
 entropy/kanshi/config           |  5 ++++
 entropy/nixos/configuration.nix | 43 +++++++++++++++++++++++++++++----
 entropy/nixos/modules/r.nix     |  2 ++
 4 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/entropy/.vimrc b/entropy/.vimrc
index 671b7bd..35a43b5 100644
--- a/entropy/.vimrc
+++ b/entropy/.vimrc
@@ -4,9 +4,9 @@ syntax on
 " enable autocompletion of ale
 let g:ale_completion_enabled = 1
 " disable latex linting from ale as i've got my own plugin for that
-let g:ale_linters = { 'tex': [], 'haskell': ['hls', 'hindent'], 'rust': ['rls'] }
+let g:ale_linters = { 'tex': [], 'haskell': ['hls', 'hindent'], 'rust': ['analyzer'] }
 "let g:ale_fixers = {'haskell': ['hindent']}
-let g:ale_fixers = { 'haskell': ['hls', 'hindent'], 'rust': ['rls'] }
+"let g:ale_fixers = { 'haskell': ['hls', 'hindent'], 'rust': ['analyzer'] }
 
 
 " Initialize plugin system
diff --git a/entropy/kanshi/config b/entropy/kanshi/config
index b474642..29cb223 100644
--- a/entropy/kanshi/config
+++ b/entropy/kanshi/config
@@ -10,6 +10,11 @@ profile home-docked {
     output "Hewlett Packard HP ZR2440w CN43361P3M" mode 1920x1200 position 1920,0 transform 90
 }
 
+profile home-single-monitor {
+    output eDP-1 mode 3840x2160 position 0,840 scale 2
+    output "Hewlett Packard HP ZR2440w CN43361P3M" mode 1920x1200 position 1920,0 transform 90
+}
+
 profile home {
     output eDP-1 mode 3840x2160 position 0,0 scale 2
     output HDMI-A-2 mode 1920x1200 position 1920,0
diff --git a/entropy/nixos/configuration.nix b/entropy/nixos/configuration.nix
index fc64dd4..c4b26c9 100644
--- a/entropy/nixos/configuration.nix
+++ b/entropy/nixos/configuration.nix
@@ -4,6 +4,12 @@
 
 { config, pkgs, ... }:
 
+let
+  # use unstable nixpkgs for some specific packages that are still in-dev: 
+  # sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable
+  # sudo nix-channel --update
+  unstable = import <nixos-unstable> { config = config.nixpkgs.config; };
+in
 {
   imports =
     [ # Include the results of the hardware scan.
@@ -11,6 +17,7 @@
 
       ./modules/audio.nix
       ./modules/video.nix
+      #./modules/v4l2loopback.nix
       ./modules/virtualisation.nix
 
       # Desktop configuration
@@ -35,6 +42,9 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
+  # ------------ hardware -----------------------------------------------------
+  hardware.keyboard.zsa.enable = true;
+
   # ------------ networking ---------------------------------------------------
   networking.hostName = "entropy"; # Define your hostname.
   networking.wireless = {
@@ -148,6 +158,8 @@
     usbutils
     moreutils
     file
+    ## firmware tool for keyboard
+    wally-cli
     ## audio management
     pavucontrol
     ## password management
@@ -160,10 +172,15 @@
     msmtp
     neomutt urlview
     notmuch
-    ## programming languages and compilers
+    ## Rust
     rustup
     cargo-flamegraph
     cargo-watch
+
+    unstable.rust-analyzer
+    unstable.helix
+ 
+    ## other programming languages and compilers
     stack
     haskell-language-server
     gcc
@@ -192,6 +209,8 @@
     ## file managers
     ranger
     xfce.thunar
+    ## file sharing
+    nextcloud-client
     ## document viewers
     pdfpc
     zathura
@@ -211,6 +230,8 @@
     streamlink
     ffmpeg-full
     musikcube
+    obs-studio
+    obs-studio-plugins.wlrobs
     ## messenger
     slack
     tdesktop
@@ -218,12 +239,24 @@
     weechat
     ## networking
     openconnect
-
-    ## maybe screensharing???
-    pipewire
-    xdg-desktop-portal-wlr
   ];
 
+  xdg.portal = {
+    #enable = true;
+    gtkUsePortal = true;
+    wlr = {
+      enable = true;
+      settings = {
+        screencast = {
+          output_name = "eDP-1";
+          max_fps = 30;
+          chooser_type = "simple";
+          chooser_cmd = "${pkgs.slurp}/bin/slurp -f %o -or";
+        };
+      };
+    };
+  };
+
   # install fonts
   fonts.fonts = with pkgs; [
     font-awesome
diff --git a/entropy/nixos/modules/r.nix b/entropy/nixos/modules/r.nix
index dd63e88..91543a7 100644
--- a/entropy/nixos/modules/r.nix
+++ b/entropy/nixos/modules/r.nix
@@ -8,6 +8,7 @@
         ggplot2
         rlang
         lazyeval
+        patchwork
       ];
     };
     rstudioEnv = rstudioWrapper.override {
@@ -16,6 +17,7 @@
         tidyverse
         rlang
         lazyeval
+        patchwork
       ];
     };
   in