flake: update

flake.lock

@@ -162,11 +162,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715077503,
-        "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
+        "lastModified": 1718243258,
+        "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6e277d9566de9976f47228dd8c580b97488734d4",
+        "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3",
         "type": "github"
       },
       "original": {
@@ -198,11 +198,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1714906307,
-        "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=",
+        "lastModified": 1718318537,
+        "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588",
+        "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420",
         "type": "github"
       },
       "original": {
@@ -212,6 +212,21 @@
         "type": "github"
       }
     },
+    "nixpkgs-24_05": {
+      "locked": {
+        "lastModified": 1717144377,
+        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-24.05",
+        "type": "indirect"
+      }
+    },
     "nixpkgs-lib": {
       "locked": {
         "dir": "lib",
@@ -232,11 +247,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1714858427,
-        "narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=",
+        "lastModified": 1717880976,
+        "narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76",
+        "rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c",
         "type": "github"
       },
       "original": {
@@ -253,11 +268,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712935714,
-        "narHash": "sha256-zGo9wiDH+qn4Mky70CJEvST1gGgMM/VMajAjsgNdOqk=",
+        "lastModified": 1718784775,
+        "narHash": "sha256-tKanhhqgHdMBWS8KZ+ZYsefrQ8ipVn8NbXlSciaNc+c=",
         "ref": "refs/heads/master",
-        "rev": "ba6b926cc4f6d65015271ebe7edd22269af77840",
-        "revCount": 31,
+        "rev": "e3c064d3a995fe81731c8df7664d48b1106a707b",
+        "revCount": 33,
         "type": "git",
         "url": "https://git.project-cloud.net/asmir/nvim_flake"
       },
@@ -332,14 +347,15 @@
         "nixpkgs": [
           "nixpkgs"
         ],
+        "nixpkgs-24_05": "nixpkgs-24_05",
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1714720456,
-        "narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=",
+        "lastModified": 1718084203,
+        "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f",
+        "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b",
         "type": "gitlab"
       },
       "original": {
@@ -356,11 +372,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1715035358,
-        "narHash": "sha256-RY6kqhpCPa/q3vbqt3iYRyjO3hJz9KZnshMjbpPon8o=",
+        "lastModified": 1718137936,
+        "narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "893e3df091f6838f4f9d71c61ab079d5c5dedbd1",
+        "rev": "c279dec105dd53df13a5e57525da97905cc0f0d6",
         "type": "github"
       },
       "original": {

home/home.nix

@@ -1,10 +1,10 @@
 {
+  lib,
   pkgs,
-  config,
   ...
 }: let
   qutebrowser_firejail = pkgs.writeShellScriptBin "qutebrowser" ''
-    firejail -- ${pkgs.qutebrowser}/bin/qutebrowser "$@"
+    firejail -- ${lib.getExe pkgs.qutebrowser} "$@"
   '';
 in {
   imports = [./zsh.nix ./i3status-rust.nix ./sway.nix ./i3.nix ./home_packages.nix ./whatsapp-for-linux.nix];
@@ -18,6 +18,7 @@ in {
     enable = true;
     defaultApplications = {
       "application/pdf" = "sioyek.desktop";
+      "default-web-browser" = "org.qutebrowser.qutebrowser.desktop";
       "text/html" = "org.qutebrowser.qutebrowser.desktop";
       "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop";
       "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop";
@@ -29,7 +30,7 @@ in {
   fonts.fontconfig.enable = true;
 
   home.sessionVariables = rec {
-    BROWSER = "${qutebrowser_firejail}/bin/qutebrowser";
+    BROWSER = lib.getExe qutebrowser_firejail;
     DEFAULT_BROWSER = "${BROWSER}";
     EDITOR = "nvim";
     _JAVA_AWT_WM_NONREPARENTING = "1";
@@ -220,8 +221,8 @@ in {
     swayidle = let
       locker = pkgs.writeShellScriptBin "swaylock_fancy" ''
         TMP_FILE=$(${pkgs.coreutils}/bin/mktemp /tmp/.swaylock_ss_XXXXXX.jpg)
-        ${pkgs.grim}/bin/grim -t ppm - | ${pkgs.imagemagick}/bin/convert - -blur 0x12 "$TMP_FILE"
-        ${pkgs.swaylock}/bin/swaylock -f -i "$TMP_FILE"
+        ${lib.getExe pkgs.grim} -t ppm - | ${pkgs.imagemagick}/bin/convert - -blur 0x12 "$TMP_FILE"
+        ${lib.getExe pkgs.swaylock} -f -i "$TMP_FILE"
         ${pkgs.coreutils}/bin/rm "$TMP_FILE"
       '';
     in {

home/home_packages.nix

@@ -1,17 +1,18 @@
 {
+  lib,
   pkgs,
   inputs,
   system,
   ...
 }: let
   chromium_teams = pkgs.writeShellScriptBin "chromium_teams" ''
-    ${pkgs.chromium}/bin/chromium --socket=wayland org.chromium.Chromium --app=https://teams.microsoft.com/
+    ${lib.getExe pkgs.chromium} --socket=wayland org.chromium.Chromium --app=https://teams.microsoft.com/
   '';
   chromium_discord = pkgs.writeShellScriptBin "chromium_discord" ''
-    ${pkgs.chromium}/bin/chromium --socket=wayland org.chromium.Chromium --app=https://discordapp.com/channels/@me
+    ${lib.getExe pkgs.chromium} --socket=wayland org.chromium.Chromium --app=https://discordapp.com/channels/@me
   '';
   chromium_stackfield = pkgs.writeShellScriptBin "chromium_stackfield" ''
-    ${pkgs.chromium}/bin/chromium --socket=wayland org.chromium.Chromium --app=https://stackfield.com/
+    ${lib.getExe pkgs.chromium} --socket=wayland org.chromium.Chromium --app=https://stackfield.com/
   '';
   ssh_proxy = pkgs.writeShellScriptBin "ssh_proxy" ''
     if ${pkgs.coreutils}/bin/test $# -ne 1; then
@@ -19,7 +20,7 @@
       exit
     fi
     PROXY_PORT="1337"
-    ${pkgs.openssh}/bin/ssh -D "$PROXY_PORT" -q -N "$@"
+    ${lib.getExe pkgs.openssh} -D "$PROXY_PORT" -q -N "$@"
   '';
   wrap_sh = let
     bubblewrap = pkgs.callPackage ../packages/bubblewrap/default.nix {};

home/i3.nix

@@ -1,5 +1,4 @@
 {
-  config,
   lib,
   pkgs,
   ...

nixy/configuration.nix

@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   nix-xilinx,
   nvim,
   pkgs,
@@ -309,7 +308,6 @@
 
   services = {
     acpid.enable = true;
-    btrfs.autoScrub.enable = false;
     dbus.enable = true;
     fstrim.enable = true;
     fwupd.enable = true;
@@ -513,7 +511,6 @@
   virtualisation = {
     containers.storage.settings = {
       storage = {
-        #driver = lib.mkForce "btrfs";
         graphroot = "/var/lib/containers/storage";
         runroot = "/run/containers/storage";
       };