flake.lock: update

default.nix

@@ -5,8 +5,4 @@ in
 {
   ci.check = getPackage "ci-check";
   formatter = getPackage "formatter";
-  systems = {
-    nixos = builtins.mapAttrs (_: system: system.result) nilla.systems.nixos;
-    darwin = builtins.mapAttrs (_: system: system.result) nilla.systems.darwin;
-  };
 }

flake.lock

@@ -180,6 +180,24 @@
         "type": "github"
       }
     },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1722555600,
+        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems_2"
@@ -401,6 +419,25 @@
         "type": "github"
       }
     },
+    "niko-nur": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1723663703,
+        "narHash": "sha256-ubPcnvjRQCzZgaYTWOKd82xXwJKmOaPjStUOUkyRTSs=",
+        "owner": "nrabulinski",
+        "repo": "nur-packages",
+        "rev": "567fd42dc54f71ce1705180ad7f35f786f00ed9a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nrabulinski",
+        "repo": "nur-packages",
+        "type": "github"
+      }
+    },
     "nilla": {
       "flake": false,
       "locked": {
@@ -419,11 +456,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748662220,
+        "lastModified": 1723603349,
-        "narHash": "sha256-7gGa49iB9nCnFk4h/g9zwjlQAyjtpgcFkODjcOQS0Es=",
+        "narHash": "sha256-VMg6N7MryOuvSJ8Sj6YydarnUCkL7cvMdrMcnsJnJCE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "59138c7667b7970d205d6a05a8bfa2d78caa3643",
+        "rev": "daf7bb95821b789db24fc1ac21f613db0c1bf2cb",
         "type": "github"
       },
       "original": {
@@ -449,6 +486,34 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1722555339,
+        "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1748662220,
+        "narHash": "sha256-7gGa49iB9nCnFk4h/g9zwjlQAyjtpgcFkODjcOQS0Es=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "59138c7667b7970d205d6a05a8bfa2d78caa3643",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "racket": {
       "inputs": {
         "nixpkgs": [
@@ -484,8 +549,9 @@
         "lix-module": "lix-module",
         "mailserver": "mailserver",
         "nh": "nh",
+        "niko-nur": "niko-nur",
         "nilla": "nilla",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "racket": "racket",
         "treefmt": "treefmt",
         "wrapper-manager": "wrapper-manager",

flake.nix

@@ -47,6 +47,9 @@
       url = "gitlab:famedly/conduit?ref=next";
       flake = false;
     };
+    niko-nur = {
+      url = "github:nrabulinski/nur-packages";
+    };
     attic = {
       url = "git+https://git.lix.systems/nrabulinski/attic.git";
       flake = false;

modules/home/desktop/default.nix

@@ -8,10 +8,7 @@
 {
   _file = ./default.nix;
 
-  imports = [
+  imports = [ ./zellij.nix ];
-    ./zellij.nix
-    ./qutebrowser.nix
-  ];
 
   options.settei.desktop = {
     enable = lib.mkEnableOption "Common configuration for desktop machines";
@@ -29,6 +26,46 @@
 
     fonts.fontconfig.enable = true;
 
-    programs.firefox.enable = true;
+    programs.firefox = {
+      enable = true;
+      # package = lib.mkIf pkgs.stdenv.isDarwin pkgs.firefox-unwrapped;
+    };
+
+    programs.qutebrowser = {
+      enable = true;
+      package =
+        if pkgs.stdenv.isDarwin then inputs'.niko-nur.packages.qutebrowser-bin else pkgs.qutebrowser;
+      searchEngines = {
+        r = "https://doc.rust-lang.org/stable/std/?search={}";
+        lib = "https://lib.rs/search?q={}";
+        nip = "https://jisho.org/search/{}";
+      };
+      settings = {
+        tabs = {
+          indicator.width = 3;
+        };
+
+        fonts = {
+          default_family = "IosevkaTerm Nerd Font";
+          default_size = "13px";
+        };
+
+        content = {
+          canvas_reading = true;
+          blocking.method = "both";
+          javascript.clipboard = "access";
+        };
+      };
+      # Workaround because the nix module doesn't properly handle options that expect a dict
+      extraConfig = ''
+        c.tabs.padding = { 'top': 5, 'bottom': 5, 'right': 10, 'left': 10 }
+        c.statusbar.padding = { 'top': 5, 'bottom': 5, 'right': 10, 'left': 10 }
+      '';
+      keyBindings = {
+        passthrough = {
+          "<Ctrl-Escape>" = "mode-leave";
+        };
+      };
+    };
   };
 }

modules/home/desktop/qutebrowser.nix

@@ -1,38 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.qutebrowser = {
-    # TODO: Enable again
-    enable = pkgs.stdenv.isLinux;
-    searchEngines = {
-      r = "https://doc.rust-lang.org/stable/std/?search={}";
-      lib = "https://lib.rs/search?q={}";
-      nip = "https://jisho.org/search/{}";
-    };
-    settings = {
-      tabs = {
-        indicator.width = 3;
-      };
-
-      fonts = {
-        default_family = "IosevkaTerm Nerd Font";
-        default_size = "13px";
-      };
-
-      content = {
-        canvas_reading = true;
-        blocking.method = "both";
-        javascript.clipboard = "access";
-      };
-    };
-    # Workaround because the nix module doesn't properly handle options that expect a dict
-    extraConfig = ''
-      c.tabs.padding = { 'top': 5, 'bottom': 5, 'right': 10, 'left': 10 }
-      c.statusbar.padding = { 'top': 5, 'bottom': 5, 'right': 10, 'left': 10 }
-    '';
-    keyBindings = {
-      passthrough = {
-        "<Ctrl-Escape>" = "mode-leave";
-      };
-    };
-  };
-}