nixos 25.05 update

6 files changed, 28 insertions, 31 deletions

diff --git a/flake.lock b/flake.lock
index 371b9e3..a228fb1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -262,16 +262,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1747688870,
-        "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=",
+        "lastModified": 1749154018,
+        "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d5f1f641b289553927b3801580598d200a501863",
+        "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -279,7 +279,7 @@
     "hugo-congo": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-eLN3oHOtJRbHYaLr6CUhhRHFnSPTdAppv5AfSne8GUU=",
+        "narHash": "sha256-kGGExd0gbYhcY2IakyI7BXcVU0SyQa66M74vLK5+bj0=",
         "type": "file",
         "url": "https://github.com/jpanther/congo"
       },
@@ -333,11 +333,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749145600,
-        "narHash": "sha256-v2kY5RDk9oyo1x9m8u83GdklC96xlJ7ka1rrvZoYL78=",
+        "lastModified": 1749238452,
+        "narHash": "sha256-8qiKEWcxUrjpUpK+WyFNg/72C8rp70LUuyTD23T+SdQ=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "80b754e38e836777ad3a9d5d1ffc3491b0332471",
+        "rev": "c7225d73755a6c4c7c72f4d4f3925ea426e325a8",
         "type": "github"
       },
       "original": {
@@ -364,11 +364,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1749237813,
-        "narHash": "sha256-TDJHaf01IpP3dN+CC/GGuKRLPLFS9w4v9BufplyJkSY=",
+        "lastModified": 1749767250,
+        "narHash": "sha256-oWFxMzPIcp3ys4K0JXuAMPwGZcDqrKLSVgP4SPeP7cY=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "2794f485cb5d52b3ff572953ddcfaf7fd3c25182",
+        "rev": "d14f81e6ac3debd57f8e3e70ead5bb52606a8c90",
         "type": "github"
       },
       "original": {
@@ -663,16 +663,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748995628,
-        "narHash": "sha256-bFufQGSAEYQgjtc4wMrobS5HWN0hDP+ZX+zthYcml9U=",
+        "lastModified": 1749727998,
+        "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8eb3b6a2366a7095939cd22f0dc0e9991313294b",
+        "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -694,11 +694,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1749143949,
-        "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
+        "lastModified": 1749285348,
+        "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
+        "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 37c8b79..aab7306 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,11 +2,11 @@
   description = "NixOS configuration";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.11"; 
+      url = "github:nix-community/home-manager/release-25.05"; 
       # The `follows` keyword in inputs is used for inheritance.
       # Here, `inputs.nixpkgs` of home-manager isn't kept consistent with the `inputs.nixpkgs` of the current flake,
       # to not avoid problems caused by different versions of nixpkgs dependencies.
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 967de7c..e7435f2 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -68,15 +68,16 @@
         })
         # qutebrowser
         neofetch
-        yakuake
-        pass
+        kdePackages.yakuake
+        (pass.withExtensions (ext: with ext; [ pass-audit pass-otp pass-update]))
         passExtensions.pass-audit
         passExtensions.pass-otp
         passExtensions.pass-update
+        # pass
         btop
         cava
         helvum
-        filelight
+        kdePackages.filelight
         easyeffects
         mpv
         lutris
diff --git a/machines/betsy/default.nix b/machines/betsy/default.nix
index 19d3b35..4791186 100644
--- a/machines/betsy/default.nix
+++ b/machines/betsy/default.nix
@@ -93,7 +93,7 @@
   services.printing.enable = true;
 
   # Enable sound.
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
   # OR
   services.pipewire = {
   # enable = true;
diff --git a/machines/picast/default.nix b/machines/picast/default.nix
index ff10ad5..4d24de8 100644
--- a/machines/picast/default.nix
+++ b/machines/picast/default.nix
@@ -28,11 +28,7 @@
   # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
 
   # Set your time zone.
-<<<<<<< HEAD
-  time.timeZone = "US/Mountain";
-=======
   time.timeZone = "America/Denver";
->>>>>>> 7d7f5905769c488d2129b2ec0ade6451f0765d84
 
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix
index 3c95763..4a446c1 100644
--- a/modules/nixos/hyprland.nix
+++ b/modules/nixos/hyprland.nix
@@ -3,7 +3,7 @@
     enable = true;
     wlr.enable = true;
     extraPortals = [
-      pkgs.xdg-desktop-portal-kde
+      pkgs.kdePackages.xdg-desktop-portal-kde
       pkgs.xdg-desktop-portal-gnome
       (pkgs.xdg-desktop-portal-gtk.override {
         # Do not build portals that we already have.
@@ -75,7 +75,7 @@
     hyprpicker # color picker
 
     wf-recorder # screen recording
-    xwaylandvideobridge # lets xwayland programs see wayland applications for screensharing
+    kdePackages.xwaylandvideobridge # lets xwayland programs see wayland applications for screensharing
     grim # taking screenshots
     slurp # selecting a region to screenshot
     # TODO replace by 'flameshot gui --raw | wl-copy'
@@ -93,7 +93,7 @@
     networkmanagerapplet # provide GUI app: nm-connection-editor
 
     xfce.thunar # sfce4's file manager
-    polkit-kde-agent
+    kdePackages.polkit-kde-agent-1
   ];
   fonts.packages = with pkgs; [
     font-awesome # fixes waybar fonts