feat: update system

flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1705718133,
+        "lastModified": 1705874780,
-        "narHash": "sha256-G2ydoWQD6fNFKj57jyrz+1eqCwR5kreQLRiqodbSMec=",
+        "narHash": "sha256-PjJdC/7+BoPZ0DucSIFUaySmI7fWLGKsIhtZVgMFhzw=",
         "owner": "Aylur",
         "repo": "ags",
-        "rev": "ee76e6068c8510e17e9117c11ced2e6b1d8817dd",
+        "rev": "c706e43fab6f1845b6e16fa3106200ac801f6749",
         "type": "github"
       },
       "original": {
@@ -55,22 +55,6 @@
         "type": "github"
       }
     },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -118,29 +102,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1705309234,
+        "lastModified": 1701680307,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
         "type": "github"
       },
       "original": {
@@ -152,7 +118,7 @@
     "gitignore": {
       "inputs": {
         "nixpkgs": [
-          "kde2nix",
+          "nixvim",
           "pre-commit-hooks",
           "nixpkgs"
         ]
@@ -171,28 +137,6 @@
         "type": "github"
       }
     },
-    "gitignore_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "pre-commit-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1660459072,
-        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -200,11 +144,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705708511,
+        "lastModified": 1705879479,
-        "narHash": "sha256-3f4BkRY70Fj7yvuo87c4QQPAjnt571g2wJ50jY7hnYc=",
+        "narHash": "sha256-ZIohbyly1KOe+8I3gdyNKgVN/oifKdmeI0DzMfytbtg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ce4b88c465d928f4f8b75d0920f1788d5b65ca94",
+        "rev": "2d47379ad591bcb14ca95a90b6964b8305f6c913",
         "type": "github"
       },
       "original": {
@@ -221,11 +165,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705104164,
+        "lastModified": 1705879479,
-        "narHash": "sha256-pllCu3Hcm1wP/B0SUxgUXvHeEd4w8s2aVrEQRdIL1yo=",
+        "narHash": "sha256-ZIohbyly1KOe+8I3gdyNKgVN/oifKdmeI0DzMfytbtg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0912d26b30332ae6a90e1b321ff88e80492127dd",
+        "rev": "2d47379ad591bcb14ca95a90b6964b8305f6c913",
         "type": "github"
       },
       "original": {
@@ -243,11 +187,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1705738587,
+        "lastModified": 1705913207,
-        "narHash": "sha256-oIt4bUVXRR7qnBPizcPA7fTiZl4xz9QaSdzLNukjtkw=",
+        "narHash": "sha256-donM5hUaCylML0xwRZtH3SBSTBfdo7Ea3hJ+eiGZ/cI=",
         "owner": "hyprwm",
         "repo": "hyprland",
-        "rev": "f40e382fc6208d4fe2e53581ea27510cb62417dd",
+        "rev": "02b4a9bdede8ab0336e2e7ac52b39cab36208bb4",
         "type": "github"
       },
       "original": {
@@ -303,26 +247,6 @@
         "type": "github"
       }
     },
-    "kde2nix": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_3",
-        "pre-commit-hooks": "pre-commit-hooks"
-      },
-      "locked": {
-        "lastModified": 1705739123,
-        "narHash": "sha256-j9ZgSih8MIkm07ctB84Olrlp945Tx0xxJuaFsrTYNHE=",
-        "owner": "nix-community",
-        "repo": "kde2nix",
-        "rev": "3a4ab493a8f39080688f9738a98f93e9f089c704",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "kde2nix",
-        "type": "github"
-      }
-    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -331,11 +255,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1704277720,
+        "lastModified": 1705915768,
-        "narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=",
+        "narHash": "sha256-+Jlz8OAqkOwJlioac9wtpsCnjgGYUhvLpgJR/5tP9po=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4",
+        "rev": "1e706ef323de76236eb183d7784f3bd57255ec0b",
         "type": "github"
       },
       "original": {
@@ -360,22 +284,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1704874635,
-        "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1705133751,
@@ -394,27 +302,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1705496572,
+        "lastModified": 1705856552,
-        "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=",
+        "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19",
+        "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1705496572,
-        "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19",
         "type": "github"
       },
       "original": {
@@ -432,14 +324,14 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "pre-commit-hooks": "pre-commit-hooks_2"
+        "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1705648708,
+        "lastModified": 1705927744,
-        "narHash": "sha256-QjwL9+QuHT7hBteMosqHVhsdv93MpLjlgLnTG2XxZT0=",
+        "narHash": "sha256-ESHLUjPRApElOJuyXidapwredduuUmJlJ7EAmlFePSY=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "c5143dc519da82279de12df9068f570ea1ec2ca0",
+        "rev": "86d6ce5029c99362c96ccead428b366f81d5b8f0",
         "type": "github"
       },
       "original": {
@@ -451,36 +343,8 @@
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "flake-utils": [
+        "flake-utils": "flake-utils",
-          "kde2nix",
-          "flake-utils"
-        ],
         "gitignore": "gitignore",
-        "nixpkgs": [
-          "kde2nix",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable"
-      },
-      "locked": {
-        "lastModified": 1705229514,
-        "narHash": "sha256-itILy0zimR/iyUGq5Dgg0fiW8plRDyxF153LWGsg3Cw=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "ffa9a5b90b0acfaa03b1533b83eaf5dead819a05",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
-    "pre-commit-hooks_2": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_2",
-        "gitignore": "gitignore_2",
         "nixpkgs": [
           "nixvim",
           "nixpkgs"
@@ -491,11 +355,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705072518,
+        "lastModified": 1705757126,
-        "narHash": "sha256-90dERRuG781f0EWjn2AOtScZqsTcpIFLpY8TN2VbkL8=",
+        "narHash": "sha256-Eksr+n4Q8EYZKAN0Scef5JK4H6FcHc+TKNHb95CWm+c=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "274ae3979a0eacae422e1bbcf63b8b7a335e1114",
+        "rev": "f56597d53fd174f796b5a7d3ee0b494f9e2285cc",
         "type": "github"
       },
       "original": {
@@ -510,8 +374,7 @@
         "anyrun": "anyrun",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
-        "kde2nix": "kde2nix",
+        "nixpkgs": "nixpkgs_3",
-        "nixpkgs": "nixpkgs_4",
         "nixvim": "nixvim"
       }
     },
@@ -545,21 +408,6 @@
         "type": "github"
       }
     },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "wlroots": {
       "flake": false,
       "locked": {

flake.nix

@@ -15,7 +15,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hyprland.url = "github:hyprwm/hyprland";
-    kde2nix.url = "github:nix-community/kde2nix";
   };
 
   outputs = {
@@ -25,7 +24,6 @@
     nixvim,
     anyrun,
     hyprland,
-    kde2nix,
     ...
   } @ inputs: let
     inherit (nixpkgs.lib) genAttrs listToAttrs;
@@ -64,7 +62,6 @@
           ./modules/nixos/hid-fanatecff
           ./modules/nixos/gbmonctl
           ./hosts/${hostname}
-          kde2nix.nixosModules.plasma6
           home-manager.nixosModules.home-manager
           {
             _module.args = {inherit username;};

home/desktops/hyprland/ags/config.js

@@ -16,6 +16,7 @@ function mismatch() {
   return {};
 }
 
-export default v.ags === v.expected
+/*export default v.ags === v.expected
   ? (await import("./js/main.js")).default
-  : mismatch();
+  : mismatch();*/
+export default (await import("./js/main.js")).default;

home/desktops/hyprland/default.nix

@@ -172,13 +172,6 @@
 
   fonts.fontconfig.enable = true;
   home.packages = with pkgs; [
-    (callPackage ../../../overlays/wezterm {
-      Cocoa = pkgs.Cocoa;
-      CoreGraphics = pkgs.CoreGraphics;
-      Foundation = pkgs.Foundation;
-      System = pkgs.System;
-      UserNotifications = pkgs.UserNotifications;
-    })
     # fonts
     noto-fonts
     # essentials
@@ -260,10 +253,5 @@
       source = ./hypr/shaders;
       recursive = true;
     };
-
-    file.".config/wezterm" = {
-      source = ./wezterm;
-      recursive = true;
-    };
   };
 }

home/desktops/hyprland/wezterm/wezterm.lua

@@ -1,14 +0,0 @@
-local wezterm = require("wezterm")
-
-local config = {
-	font = wezterm.font("JetBrains Mono"),
-	enable_tab_bar = false,
-	display_pixel_geometry = "BGR",
-	freetype_load_target = "HorizontalLcd",
-	freetype_load_flags = "NO_HINTING",
-	freetype_render_target = "HorizontalLcd",
-	font_size = 13.0,
-	default_prog = { "/run/current-system/sw/bin/fish" },
-}
-
-return config

modules/nixos/threema-desktop/default.nix

@@ -0,0 +1,37 @@
+{
+reema Web is a web client for Threema, a privacy-focussed end-to-end encrypted mobile messenger hosted and developed in Switzerland";
+      homepage = "https://threema.ch/en/faq/threema_web";
+      license = licenses.agpl3;
+      maintainers = with maintainers; [theaninova];
+    };
+  };
+in
+  buildNpmPackage rec {
+    name = "threema-desktop";
+    version = "1.2.40";
+    src =
+      fetchFromGitHub {
+        owner = "threema-ch";
+        repo = "threema-web-electron";
+        rev = version;
+      }
+      + "/app";
+    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+    buildInputs = [
+      (threema-web.overrideAttrs {
+        patches = [
+          "${src}/../tools/patches/patch-looks.patch"
+          "${src}/../tools/patches/patch-user-agent.patch"
+        ];
+        postBuild = ''
+          # see tools/patches/post-patch-threema-web.sh
+          sed -i.bak -E "s/IN_MEMORY_SESSION_PASSWORD:(true|false|0|1|\!0|\!1)/IN_MEMORY_SESSION_PASSWORD:true/g" -- *.bundle.js
+        '';
+      })
+    ];
+    buildPhase = ''
+      run hook preBuild
+      ln -s ${threema-web}/share/threema-web ${src}/dependencies/threema-web/release/threema-web
+      run hook postBuild
+    '';
+  }

overlays/wezterm/default.nix

@@ -1,153 +0,0 @@
-{
-  stdenv,
-  rustPlatform,
-  lib,
-  fetchFromGitHub,
-  ncurses,
-  perl,
-  pkg-config,
-  python3,
-  fontconfig,
-  installShellFiles,
-  openssl,
-  libGL,
-  libX11,
-  libxcb,
-  libxkbcommon,
-  xcbutil,
-  xcbutilimage,
-  xcbutilkeysyms,
-  xcbutilwm,
-  wayland,
-  zlib,
-  CoreGraphics,
-  Cocoa,
-  Foundation,
-  System,
-  libiconv,
-  UserNotifications,
-  nixosTests,
-  runCommand,
-  vulkan-loader,
-}:
-rustPlatform.buildRustPackage rec {
-  pname = "wezterm";
-  version = "ff2743748c238e5cdd6e7cb4ed19517d08dd511f";
-
-  src = fetchFromGitHub {
-    owner = "wez";
-    repo = pname;
-    rev = version;
-    fetchSubmodules = true;
-    hash = "sha256-oogmLKoldUoAsLsDa+MmepWjVu/cuE8YjXrf+QyQ1Jo=";
-  };
-
-  postPatch = ''
-    echo ${version} > .tag
-
-    # tests are failing with: Unable to exchange encryption keys
-    rm -r wezterm-ssh/tests
-  '';
-
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "xcb-1.2.1" = "sha256-zkuW5ATix3WXBAj2hzum1MJ5JTX3+uVQ01R1vL6F1rY=";
-      "xcb-imdkit-0.2.0" = "sha256-L+NKD0rsCk9bFABQF4FZi9YoqBHr4VAZeKAWgsaAegw=";
-    };
-  };
-
-  nativeBuildInputs =
-    [
-      installShellFiles
-      ncurses # tic for terminfo
-      pkg-config
-      python3
-    ]
-    ++ lib.optional stdenv.isDarwin perl;
-
-  buildInputs =
-    [
-      fontconfig
-      zlib
-    ]
-    ++ lib.optionals stdenv.isLinux [
-      libX11
-      libxcb
-      libxkbcommon
-      openssl
-      wayland
-      xcbutil
-      xcbutilimage
-      xcbutilkeysyms
-      xcbutilwm # contains xcb-ewmh among others
-    ]
-    ++ lib.optionals stdenv.isDarwin [
-      Cocoa
-      CoreGraphics
-      Foundation
-      libiconv
-      System
-      UserNotifications
-    ];
-
-  buildFeatures = ["distro-defaults"];
-
-  env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework System";
-
-  postInstall = ''
-    mkdir -p $out/nix-support
-    echo "${passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages
-
-    install -Dm644 assets/icon/terminal.png $out/share/icons/hicolor/128x128/apps/org.wezfurlong.wezterm.png
-    install -Dm644 assets/wezterm.desktop $out/share/applications/org.wezfurlong.wezterm.desktop
-    install -Dm644 assets/wezterm.appdata.xml $out/share/metainfo/org.wezfurlong.wezterm.appdata.xml
-
-    install -Dm644 assets/shell-integration/wezterm.sh -t $out/etc/profile.d
-    installShellCompletion --cmd wezterm \
-      --bash assets/shell-completion/bash \
-      --fish assets/shell-completion/fish \
-      --zsh assets/shell-completion/zsh
-
-    install -Dm644 assets/wezterm-nautilus.py -t $out/share/nautilus-python/extensions
-  '';
-
-  preFixup =
-    lib.optionalString stdenv.isLinux ''
-      patchelf \
-        --add-needed "${libGL}/lib/libEGL.so.1" \
-        --add-needed "${vulkan-loader}/lib/libvulkan.so.1" \
-        $out/bin/wezterm-gui
-    ''
-    + lib.optionalString stdenv.isDarwin ''
-      mkdir -p "$out/Applications"
-      OUT_APP="$out/Applications/WezTerm.app"
-      cp -r assets/macos/WezTerm.app "$OUT_APP"
-      rm $OUT_APP/*.dylib
-      cp -r assets/shell-integration/* "$OUT_APP"
-      ln -s $out/bin/{wezterm,wezterm-mux-server,wezterm-gui,strip-ansi-escapes} "$OUT_APP"
-    '';
-
-  passthru = {
-    tests = {
-      all-terminfo = nixosTests.allTerminfo;
-      terminal-emulators = nixosTests.terminal-emulators.wezterm;
-    };
-    terminfo =
-      runCommand "wezterm-terminfo"
-      {
-        nativeBuildInputs = [ncurses];
-      } ''
-        mkdir -p $out/share/terminfo $out/nix-support
-        tic -x -o $out/share/terminfo ${src}/termwiz/data/wezterm.terminfo
-      '';
-  };
-
-  meta = with lib; {
-    description = "GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust";
-    homepage = "https://wezfurlong.org/wezterm";
-    license = licenses.mit;
-    mainProgram = "wezterm";
-    maintainers = with maintainers; [SuperSandro2000 mimame];
-  };
-}