From d9bfcbd7064b04cb24ef1c73618debb8297f8629 Mon Sep 17 00:00:00 2001
From: Felix Suchert <dev@felixsuchert.de>
Date: Fri, 13 Jan 2023 16:07:38 +0100
Subject: [PATCH] update packages to nixos 22.11

---
 entropy/kanshi/config                    |  3 +-
 entropy/nixos/configuration.nix          | 37 +++++++++++++++++++++---
 entropy/nixos/hardware-configuration.nix |  1 +
 entropy/nixos/modules/kde.nix            |  3 --
 entropy/sway/config                      |  6 ++++
 5 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/entropy/kanshi/config b/entropy/kanshi/config
index ef1f093..9dca6fd 100644
--- a/entropy/kanshi/config
+++ b/entropy/kanshi/config
@@ -3,7 +3,8 @@ profile office {
     # output eDP-1 disable
     # output "Dell Inc. DELL U2415 08DXD6121ARL" mode 1920x1200 position 0,0 transform 90
     # output "Dell Inc. DELL S3221QS 4HMVTB3" mode 3840x2160@30Hz position 1200,400 scale 1.25
-    output "Dell Inc. DELL S3221QS 4HMVTB3" mode 3840x2160@30Hz position 1920,0 scale 1.25
+    # output "Dell Inc. DELL S3221QS 4HMVTB3" mode 3840x2160@30Hz position 1920,0 scale 1.25
+    output "Dell Inc. DELL S3221QS 4HMVTB3" mode 3840x2160@30Hz position 1920,0 scale 1
     # output "Dell Inc. DELL S3221QS 4HMVTB3" mode 2560x1440 position 1920,0
     # output "Dell Inc. DELL U2419HC 6Z7JSS2" mode 1920x1080 position 1920,420
     # output "Dell Inc. DELL U2419HC 879JSS2" mode 1920x1080 position 3840,0 transform 90
diff --git a/entropy/nixos/configuration.nix b/entropy/nixos/configuration.nix
index 098c39c..2ca8d7d 100644
--- a/entropy/nixos/configuration.nix
+++ b/entropy/nixos/configuration.nix
@@ -79,6 +79,35 @@ in
   # enable touchpad support
   services.xserver.libinput.enable = true;
 
+  # ------------ Nix Config ---------------------------------------------------
+  nix =  {
+    package = pkgs.nixFlakes;
+	 # the builders-use-substitutes is optional; useful when the builder has a faster internet connection than yours
+    extraOptions = ''
+      experimental-features = nix-command flakes
+	   builders-use-substitutes = true
+    '';
+    buildMachines = [{
+	 hostName = "elm";
+    sshUser = "builder";
+	 system = "x86_64-linux";
+	 # if the builder supports building for multiple architectures, 
+	 # replace the previous line by, e.g.,
+	 # systems = ["x86_64-linux" "aarch64-linux"];
+	 maxJobs = 1;
+	 speedFactor = 2;
+	 supportedFeatures = [ "big-parallel" "kvm" ];
+	 mandatoryFeatures = [ ];
+     publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUNXTk9oL3ozQjZmSXRGd2lTenlqeDBUTnIveUl6bHNsazdEeEtNcE5sdmwgcm9vdEBlbG0K";
+     sshKey = "/home/felix/.ssh/id_ed25519";
+	}] ;
+
+    distributedBuilds = true;
+    settings.trusted-users = [
+      "root"
+      "@wheel"
+    ];
+  };
 
   # ------------ security -----------------------------------------------------
   # Define a user account. Don't forget to set a password with ‘passwd’.
@@ -130,7 +159,7 @@ in
     bat
     lsd
     ripgrep
-    sshfs
+    #sshfs
     ncdu
     tldr
     unzip
@@ -142,6 +171,8 @@ in
     mosh
     tmux
     libqalculate
+    ## shell extras
+    nushell
     ## password management
     pass
     pinentry-curses
@@ -212,12 +243,11 @@ in
     ## video and media applications
     unstable.zoom-us
     teams
-    youtube-dl
     mpv
-    streamlink
     ffmpeg-full
     musikcube
     ## messenger
+    #unstable.ferdium
     slack
     tdesktop
     signal-desktop
@@ -229,7 +259,6 @@ in
   services.dbus.enable = true;
   xdg.portal = {
     enable = true;
-    gtkUsePortal = true;
     extraPortals = with pkgs; [
       xdg-desktop-portal-wlr
       xdg-desktop-portal-kde
diff --git a/entropy/nixos/hardware-configuration.nix b/entropy/nixos/hardware-configuration.nix
index 2fd5174..42ec3a6 100644
--- a/entropy/nixos/hardware-configuration.nix
+++ b/entropy/nixos/hardware-configuration.nix
@@ -38,6 +38,7 @@
   # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
   # networking.interfaces.wwan0.useDHCP = lib.mkDefault true;
 
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   # high-resolution display
diff --git a/entropy/nixos/modules/kde.nix b/entropy/nixos/modules/kde.nix
index d0a5417..4c07da6 100644
--- a/entropy/nixos/modules/kde.nix
+++ b/entropy/nixos/modules/kde.nix
@@ -14,9 +14,6 @@
 
     # I'd like a log please
     logFile = "/var/log/Xorg.0.log";
-
-    # graphics
-    useGlamor = true;
   };
 
   environment.etc."X11/xinit/xinitrc".text = ''
diff --git a/entropy/sway/config b/entropy/sway/config
index 0bb877e..056e5e3 100644
--- a/entropy/sway/config
+++ b/entropy/sway/config
@@ -149,6 +149,12 @@ input "2:7:SynPS/2_Synaptics_TouchPad" {
     bindsym $mod+Shift+Down move down
     bindsym $mod+Shift+Up move up
     bindsym $mod+Shift+Right move right
+
+    # Move the workspace to another monitor
+    bindsym $mod+Control+Shift+$left move workspace to output left
+    bindsym $mod+Control+Shift+$down move workspace to output down
+    bindsym $mod+Control+Shift+$up move workspace to output up
+    bindsym $mod+Control+Shift+$right move workspace to output right
 #
 # Workspaces:
 #