From e432555146db6511e6bbeb3f44c362fbcccc08a7 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Wed, 8 Nov 2023 14:58:04 +0100
Subject: Update

---
 flake.lock         | 42 +++++++++++++++++++++---------------------
 gui/apps/dev.nix   |  4 ++--
 gui/apps/web.nix   | 10 +++-------
 gui/conf/xmonad.hs |  2 +-
 4 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/flake.lock b/flake.lock
index a8ed802..d7d6d32 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1693479240,
-        "narHash": "sha256-jEQfzL3ZPiRr2B+J//VYlsvkQYWGznyvuaVPQcJvkL0=",
+        "lastModified": 1699436319,
+        "narHash": "sha256-gRYGKnYfXE1dugjGJ0Xx5P3x3BOT505gxEFxDBohSiM=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "47c9976307a563c6c80250669e47c4b10a4801aa",
+        "rev": "dc09405b5f031852d3e930b1fa91e973b5206ef8",
         "type": "github"
       },
       "original": {
@@ -26,11 +26,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1692799911,
-        "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
         "type": "github"
       },
       "original": {
@@ -61,11 +61,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1693208669,
-        "narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=",
+        "lastModified": 1695108154,
+        "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c",
+        "rev": "07682fff75d41f18327a871088d20af2710d4744",
         "type": "github"
       },
       "original": {
@@ -97,11 +97,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1693377291,
-        "narHash": "sha256-vYGY9bnqEeIncNarDZYhm6KdLKgXMS+HA2mTRaWEc80=",
+        "lastModified": 1699099776,
+        "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e7f38be3775bab9659575f192ece011c033655f0",
+        "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
         "type": "github"
       },
       "original": {
@@ -113,11 +113,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1693341273,
-        "narHash": "sha256-wrsPjsIx2767909MPGhSIOmkpGELM9eufqLQOPxmZQg=",
+        "lastModified": 1699291058,
+        "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2ab91c8d65c00fd22a441c69bbf1bc9b420d5ea1",
+        "rev": "41de143fda10e33be0f47eab2bfe08a50f234267",
         "type": "github"
       },
       "original": {
@@ -205,11 +205,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1693341273,
-        "narHash": "sha256-wrsPjsIx2767909MPGhSIOmkpGELM9eufqLQOPxmZQg=",
+        "lastModified": 1699291058,
+        "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2ab91c8d65c00fd22a441c69bbf1bc9b420d5ea1",
+        "rev": "41de143fda10e33be0f47eab2bfe08a50f234267",
         "type": "github"
       },
       "original": {
@@ -236,11 +236,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1693355128,
-        "narHash": "sha256-+ZoAny3ZxLcfMaUoLVgL9Ywb/57wP+EtsdNGuXUJrwg=",
+        "lastModified": 1699343069,
+        "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a63a64b593dcf2fe05f7c5d666eb395950f36bc9",
+        "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d",
         "type": "github"
       },
       "original": {
diff --git a/gui/apps/dev.nix b/gui/apps/dev.nix
index c56b346..0937cde 100644
--- a/gui/apps/dev.nix
+++ b/gui/apps/dev.nix
@@ -6,12 +6,12 @@
     # UI dev utilities (language environments are maintained in project specific nix-shells)
       hotspot
       kcachegrind
-      pkgs-unstable.paraview
+      paraview
       meld
     # language utilities
       artha
     # calculator
-      speedcrunch
+      qalculate-gtk
     # ctag to override the emacs provided ones (placeholder)
       universal-ctags
       fzf
diff --git a/gui/apps/web.nix b/gui/apps/web.nix
index 22c5d45..e4de814 100644
--- a/gui/apps/web.nix
+++ b/gui/apps/web.nix
@@ -2,13 +2,9 @@
 
 {
   home = {
-    packages = with pkgs-unstable; [
-      tdesktop
-
-      zotero
-
-      teams
-
+    packages = [
+      pkgs-unstable.tdesktop
+      pkgs-unstable.zotero
       pkgs.tigervnc
       pkgs.remmina
     ];
diff --git a/gui/conf/xmonad.hs b/gui/conf/xmonad.hs
index 65c2d13..d64cbd4 100644
--- a/gui/conf/xmonad.hs
+++ b/gui/conf/xmonad.hs
@@ -115,7 +115,7 @@ scratchpads host =
        (customFloating $ hideScreenBorder host sideBarLeft)
   , NS "literature"    "zotero"                                                (className =? "Zotero")
        (customFloating $ hideScreenBorder host dropDownLarge)
-  , NS "calculator"    "speedcrunch"                                           (className =? "SpeedCrunch")
+  , NS "calculator"    "qalculate-gtk"                                             (title =? "Qalculate!")
        (customFloating $ hideScreenBorder host sideBarLeft)
   , NS "messaging"     "telegram-desktop"                                      ((className =? "TelegramDesktop") <&&> (title /=? "Media viewer"))
        (customFloating $ hideScreenBorder host sideBarRight)
-- 
cgit v1.2.3