updates: nixpkgs, home-manager, secrix

flake.lock

@@ -81,11 +81,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765480374,
-        "narHash": "sha256-HlbvQAqLx7WqZFFQZ8nu5UUJAVlXiV/kqKbyueA8srw=",
+        "lastModified": 1781989573,
+        "narHash": "sha256-npfH7Zv7t1akX/ArqCNro4zU4ViPlghLaPnbEfHbCxk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "39cb677ed9e908e90478aa9fe5f3383dfc1a63f3",
+        "rev": "78e7d8b13ecd7f5256a5c11ce216876164099d9f",
         "type": "github"
       },
       "original": {
@@ -143,11 +143,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764234087,
-        "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=",
+        "lastModified": 1769813415,
+        "narHash": "sha256-nnVmNNKBi1YiBNPhKclNYDORoHkuKipoz7EtVnXO50A=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "032a1878682fafe829edfcf5fdfad635a2efe748",
+        "rev": "8946737ff703382fda7623b9fab071d037e897d5",
         "type": "github"
       },
       "original": {
@@ -158,11 +158,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1765186076,
-        "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",
+        "lastModified": 1781577229,
+        "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",
+        "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
         "type": "github"
       },
       "original": {
@@ -182,11 +182,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763909441,
-        "narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=",
+        "lastModified": 1775856943,
+        "narHash": "sha256-b7Mp7P+q2Md5AGt4rjHfMcBykzMumFTen10ST++AuTU=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4",
+        "rev": "a524a6160e6df89f7673ba293cf7d78b559eb1a5",
         "type": "github"
       },
       "original": {
@@ -259,11 +259,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763929380,
-        "narHash": "sha256-Yc7gZME/lcHoJH6bMPCG7CyjKWhOLJPqLI8MXtyKPHo=",
+        "lastModified": 1781802448,
+        "narHash": "sha256-fquZY1SFToXU+M5jBAiNGoMBUfXbDB036lS4K7M81FA=",
         "owner": "Platonic-Systems",
         "repo": "secrix",
-        "rev": "c6e3ca7af47c329dcf442a3d017ae171eee5612f",
+        "rev": "f79faf63b260e27c3a1a2ba047ac72963d5b0066",
         "type": "github"
       },
       "original": {

hosts/common-desktop.nix

@@ -7,12 +7,20 @@
     "sysrq_always_enabled=1"
   ];
 
-  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_17;
+  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_18;
   boot.loader = {
     efi.canTouchEfiVariables = true;
     timeout = 3;
     systemd-boot.enable = lib.mkDefault true;
   };
+  boot.kernel.sysctl = {
+    # https://wiki.archlinux.org/title/Zram#Optimizing_swap_on_zram
+    "vm.swappiness" = 180;
+    "vm.watermark_boost_factor" = 0;
+    "vm.watermark_scale_factor" = 125;
+    "vm.page-cluster" = 0;
+  };
+  zramSwap.enable = true;
 
   # https://nixos.wiki/wiki/Accelerated_Video_Playback
   hardware.graphics.enable = true;
@@ -30,8 +38,7 @@
   services.xserver.enable = false;
 
   # Enable the KDE Plasma Desktop Environment.
-  services.displayManager.sddm.enable = true;
-  services.displayManager.sddm.wayland.enable = true;
+  services.displayManager.plasma-login-manager.enable = true;
   services.desktopManager.plasma6.enable = true;
 
   # Enable CUPS to print documents.
@@ -65,11 +72,11 @@
   programs.wireshark.package = pkgs.wireshark; # wireshark-cli by default
   programs.bat.enable = true;
   programs.htop.enable = true;
+  programs.nix-ld.enable = true;
 
   # https://nixos.wiki/wiki/Docker
   virtualisation.docker.enable = true;
   virtualisation.docker.enableOnBoot = false;
-  virtualisation.docker.package = pkgs.docker_28;
 
   # https://github.com/flatpak/flatpak/issues/2861
   xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
@@ -85,6 +92,11 @@
     jetbrains-mono
    ];
 
+  # remove after bitwarden update
+  nixpkgs.config.permittedInsecurePackages = [
+    "electron-39.8.10"
+  ];
+
   environment.systemPackages = with pkgs; [
     dust
     eza
@@ -110,10 +122,10 @@
     powertop
     rbw
     restic
-    resticprofile
     rclone
     ripgrep-all
     rustscan
+    unrar
     whois
     wireguard-tools
     yt-dlp
@@ -133,22 +145,31 @@
       ];
     })
     nextcloud-client
+    # lutris
     lxqt.pavucontrol-qt
     pinentry-all
     tela-circle-icon-theme
+    typst
     virt-viewer
     waypipe
   ] ++ [
     # jetbrains.rust-rover
     # jetbrains.goland
     jetbrains.clion
-    jetbrains.idea-ultimate
-    jetbrains.pycharm-professional
+    jetbrains.idea
+    jetbrains.pycharm
     jetbrains.webstorm
     android-studio
     rustup
     zed-editor
     package-version-server # for zed
+    antigravity-cli
+    antigravity-fhs
+    codex
+    # codex-acp
+    github-copilot-cli
+    opencode
+    opencode-desktop
   ] ++ [
     # C
     gcc
@@ -159,6 +180,9 @@
     poetry
 
     # Haskell
+    cabal-install
+    haskell-language-server
+    # haskellPackages.hls-cabal-plugin
     haskellPackages.ghc
     haskellPackages.stack
 
@@ -170,16 +194,25 @@
     # Nix
     nil
     nixd
-    nixfmt-rfc-style
+    nixfmt
 
     # Gleam
     gleam
-    beamMinimal26Packages.erlang
+    beamMinimal28Packages.erlang
     
     # Racket
     racket
     
     # Ruby
     ruby
+
+    # Java
+    zulu
+  ] ++ [
+    jujutsu
+    lazyjj
+    jjui
+    # jj-fzf
+    gg-jj
   ];
 }

modules/router/services.nix

@@ -58,7 +58,7 @@ in
     enable = true;
     package = pkgs.caddy.withPlugins {
       plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
-      hash = "sha256-Dvifm7rRwFfgXfcYvXcPDNlMaoxKd5h4mHEK6kJ+T4A=";
+      hash = "sha256-Zls+5kWd/JSQsmZC4SRQ/WS+pUcRolNaaI7UQoPzJA0=";
     };
     virtualHosts."*.${domain}".extraConfig = ''
       encode