nix: update to lockfile version

nixcfgs/flake.nix

@@ -27,8 +27,7 @@
     };
   };
 
-  outputs =
+  outputs = {
-    {
     self,
     nixpkgs,
     nix-flatpak,
@@ -39,36 +38,33 @@
     winboat,
     caelestia-shell,
     ...
-    }@inputs:
+  } @ inputs: let
-    let
     overlays = [
       nur.overlays.default
       (final: prev: {
         winboat = winboat.packages.x86_64-linux.winboat;
+        caelestia-shell = caelestia-shell.packages.x86_64-linux.caelestia-shell;
       })
     ];
-      forSystem =
+    forSystem = system:
-        system:
       import nixpkgs {
         inherit system overlays;
         config.allowUnfree = true;
       };
-      specialArgs = { inherit inputs; };
+    specialArgs = {inherit inputs overlays;};
     nixosHosts = [
       "zp"
       "zephyrus"
       "nixvirt"
     ];
 
-      mkNixosSystem =
+    mkNixosSystem = hostname:
-        hostname:
       nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         inherit specialArgs;
-          modules = [ ./hosts/${hostname} ];
+        modules = [./hosts/${hostname} {nixpkgs.overlays = overlays;}];
       };
-    in
+  in {
-    {
     # This will automatically generate nixOS config for `nixosHosts'
     # Include the module ./hosts/${hostname} by default.
     nixosConfigurations = nixpkgs.lib.genAttrs nixosHosts mkNixosSystem;

nixcfgs/hosts/zephyrus/default.nix

@@ -14,6 +14,7 @@
     ../../modules/nixos/chromium.nix
     ../../modules/nixos/obs-studio.nix
     ../../modules/nixos/wine.nix
+    ../../modules/nixos/gnome-keyring.nix
     ../../modules/nixos/desktop/kde.nix
     ../../modules/nixos/desktop/hyprland.nix
     ../../modules/nixos/display-manager/sddm.nix

nixcfgs/modules/home/gnome-keyrings.nix

@@ -1,6 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-
-{
   home.packages = with pkgs; [
     gcr
   ];

nixcfgs/modules/nixos/desktop/hyprland.nix

@@ -1,22 +1,18 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  inputs,
-  ...
-}: {
   programs.hyprland = {
     enable = true;
     withUWSM = false;
     xwayland.enable = true;
   };
 
-  environment.systemPackages = [
+  environment.systemPackages = with pkgs; [
-    inputs.caelestia-shell.packages.x86_64-linux.default
+    caelestia-shell
-    pkgs.mako
+    mako
-    pkgs.rofi-wayland
+    rofi
-    pkgs.xdg-desktop-portal-wlr
+    xdg-desktop-portal-wlr
-    pkgs.xdg-desktop-portal-hyprland
+    xdg-desktop-portal-hyprland
-    pkgs.hyprpolkitagent
+    hyprpolkitagent
-    pkgs.cliphist
+    cliphist
-    pkgs.grimblast
+    grimblast
   ];
 }

nixcfgs/modules/nixos/fonts.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: let
-  pkgs,
-  config,
-  ...
-}: let
   fontPkgs = [
     pkgs.maple-mono.NF
     pkgs.sarasa-gothic
@@ -51,7 +47,7 @@ in {
         fontPkgs
         ++ [
           # Add cursor supports
-          pkgs.libsForQt5.breeze-qt5
+          pkgs.kdePackages.breeze
         ]; # with pkgs; [
       #   libsForQt5.breeze-qt5
 

nixcfgs/modules/nixos/gnome-keyring.nix

@@ -0,0 +1,7 @@
+{pkgs, ...}: {
+  services.gnome.gnome-keyring.enable = true;
+  services.gnome.gcr-ssh-agent.enable = true;
+  programs.ssh = {
+    enableAskPassword = true;
+  };
+}

nixcfgs/modules/nixos/libvirt.nix

@@ -11,15 +11,15 @@
       package = pkgs.qemu_kvm;
       runAsRoot = true;
       swtpm.enable = true;
-      ovmf = {
+      # ovmf = {
-        enable = true;
+      #   enable = true;
-        packages = [
+      #   packages = [
-          (pkgs.OVMF.override {
+      #     (pkgs.OVMF.override {
-            secureBoot = true;
+      #       secureBoot = true;
-            tpmSupport = true;
+      #       tpmSupport = true;
-          }).fd
+      #     }).fd
-        ];
+      #   ];
-      };
+      # };
     };
   };
   users.users.js0ny = {

nixcfgs/modules/nixos/rime.nix

@@ -13,7 +13,7 @@
     type = "fcitx5";
     fcitx5 = {
       waylandFrontend = true;
-      plasma6Support = true;
+      # plasma6Support = true;
       addons = with pkgs; [
         fcitx5-rime
         kdePackages.fcitx5-configtool