Update phanpy and nixpkgs

Move most things to Cloudflare R2, whilst gotosocial goes to local.

Reviewed-on: #5
Co-authored-by: Natsu Kagami <nki@nkagami.me>
Co-committed-by: Natsu Kagami <nki@nkagami.me>

flake.lock

@@ -817,15 +817,15 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1723503926,
+        "lastModified": 1729298361,
-        "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
+        "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
-        "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
+        "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
       }
     },
     "lix-module": {
@@ -838,15 +838,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1723510904,
+        "lastModified": 1729360442,
-        "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
+        "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=",
-        "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
+        "rev": "9098ac95768f7006d7e070b88bae76939f6034e6",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"
       }
     },
     "mpd-mpris": {
@@ -1022,11 +1022,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1728409405,
+        "lastModified": 1730272153,
-        "narHash": "sha256-kk530XBUGDpt0DQbyUb3yDpSddPqF9PA5KTo/nsmmg0=",
+        "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1366d1af8f58325602280e43ed6233849fb92216",
+        "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53",
         "type": "github"
       },
       "original": {
@@ -1166,11 +1166,11 @@
     },
     "nixpkgs_9": {
       "locked": {
-        "lastModified": 1726838390,
+        "lastModified": 1731239293,
-        "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=",
+        "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101",
+        "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884",
         "type": "github"
       },
       "original": {
@@ -1549,11 +1549,11 @@
         "rust-overlay": "rust-overlay_4"
       },
       "locked": {
-        "lastModified": 1728746553,
+        "lastModified": 1730740980,
-        "narHash": "sha256-BlZpmTt6wyMIpJvd5nEWGgqJQbtjVTzBlYYQVShZ7Io=",
+        "narHash": "sha256-Z/RLbhlBxdNPZt/DeROPBV7bLQgpmamjcB0rdQrQoNw=",
         "owner": "natsukagami",
         "repo": "youmubot",
-        "rev": "c5354e30ad40f67938deed1deb5ea92bb168a586",
+        "rev": "803d718c7ad34d3780ae6c2911ca0682b2417cc4",
         "type": "github"
       },
       "original": {

flake.nix

@@ -31,7 +31,7 @@
     };
     arion.url = github:hercules-ci/arion;
     lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 

home/common-linux.nix

@@ -39,7 +39,7 @@ in
     systemd.user.startServices = "sd-switch";
 
     # Audio stuff!
-    services.easyeffects.enable = true;
+    # services.easyeffects.enable = true;
 
     # Bluetooth controls
     # services.mpris-proxy.enable = true;

home/modules/linux/graphical/default.nix

@@ -66,7 +66,7 @@ in
       # Audio
       qpwgraph # Pipewire graph
 
-      zotero_7
+      unstable.zotero
       libreoffice
 
       mpv # for anki
@@ -76,6 +76,7 @@ in
       tdesktop
       whatsapp-for-linux
       slack
+      zoom-us
 
       librewolf
 

home/modules/linux/graphical/wayland.nix

@@ -61,6 +61,12 @@ let
     '';
     xdg.dataFile."dbus-1/services/org.freedesktop.Notifications.service".source = "${pkgs.kdePackages.plasma-workspace}/share/dbus-1/services/org.kde.plasma.Notifications.service";
   };
+
+  rofi-rbw-script = pkgs.writeShellApplication {
+    name = "rofi-rbw-script";
+    runtimeInputs = with pkgs; [ rofi wtype rofi-rbw ];
+    text = "rofi-rbw";
+  };
 in
 with lib;
 {
@@ -69,6 +75,7 @@ with lib;
     # Additional packages
     home.packages = with pkgs; [
       wl-clipboard # Clipboard management
+      rofi-rbw-script
 
       # Mimic the clipboard stuff in MacOS
       (pkgs.writeShellScriptBin "pbcopy" ''
@@ -79,6 +86,16 @@ with lib;
       '')
     ];
 
+    programs.rofi = {
+      enable = true;
+      package = pkgs.rofi-wayland;
+      cycle = true;
+      font = "monospace";
+      terminal = "${lib.getExe config.programs.kitty.package}";
+      theme = "Paper";
+      plugins = with pkgs; [ rofi-bluetooth rofi-calc rofi-rbw rofi-power-menu ];
+    };
+
     home.sessionVariables = {
       ANKI_WAYLAND = "1";
     };

home/modules/programs/my-sway/default.nix

@@ -45,12 +45,6 @@ let
     ${pkgs.grim}/bin/grim -g (${pkgs.slurp}/bin/slurp) - | ${pkgs.swappy}/bin/swappy -f -
   '';
 
-  rofi-rbw-script = pkgs.writeShellApplication {
-    name = "rofi-rbw-script";
-    runtimeInputs = with pkgs; [ rofi wtype rofi-rbw ];
-    text = "rofi-rbw";
-  };
-
   ignored-devices = [ "Surface_Headphones" ];
   playerctl = "${pkgs.playerctl}/bin/playerctl --ignore-player=${strings.concatStringsSep "," ignored-devices}";
 
@@ -223,7 +217,7 @@ in
         # Launcher
         "${mod}+space" = "exec rofi -show drun";
         "${mod}+tab" = "exec ${./rofi-window.py}";
-        "${mod}+shift+p" = "exec ${lib.getExe rofi-rbw-script}";
+        "${mod}+shift+p" = "exec rofi-rbw-script";
       } // {
         ## Splits
         "${mod}+v" = "split v";
@@ -781,14 +775,9 @@ in
     # For waybar
     font-awesome
   ]);
+
   config.programs.rofi = mkIf cfg.enable {
-    enable = true;
+    font = lib.mkForce "monospace ${toString cfg.fontSize}";
-    package = pkgs.rofi-wayland;
-    cycle = true;
-    font = "monospace ${toString cfg.fontSize}";
-    terminal = cfg.terminal;
-    theme = "Paper";
-    plugins = with pkgs; [ rofi-bluetooth rofi-calc rofi-rbw rofi-power-menu ];
   };
 }
 

modules/personal/fonts/default.nix

@@ -10,7 +10,7 @@ with lib;
       ibm-plex
       (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
       noto-fonts
-      noto-fonts-cjk
+      (pkgs.noto-fonts-cjk-sans or pkgs.noto-fonts-cjk)
       merriweather
       corefonts
       font-awesome