update 25.05

Author: micartey

flake.lock

@@ -2,11 +2,11 @@
   description = "daniel";
 
   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";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -23,7 +23,6 @@
 
     nix-alien.url = "github:thiagokokada/nix-alien";
 
-    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
     catppuccin.url = "github:catppuccin/nix";
 
     neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
@@ -37,7 +36,7 @@
       ...
     }@inputs:
     let
-      stateVersion = "24.11";
+      stateVersion = "25.05";
       system = "x86_64-linux";
 
       pkgs-unstable = import nixpkgs-unstable {

flake.nix

@@ -110,6 +110,7 @@
     pkgs.spotify
 
     pkgs.openscad-unstable
+    pkgs.bambu-studio
     pkgs.kicad
 
     # password

home-manager/desktop/app.nix

@@ -1,6 +1,6 @@
 {
-  inputs,
   pkgs,
+  lib,
   ...
 }:
 
@@ -10,8 +10,6 @@ let
   ctrlMod = "CTRL";
 in
 {
-  imports = [ inputs.hyprland.homeManagerModules.default ];
-
   # Copy wallpapers to local directory
   home.file = {
     wallpapers = {
@@ -436,7 +434,7 @@ in
   # notifications
   services.swaync = {
     enable = true;
-    style = builtins.readFile ../../dots/swaync/theme.css;
+    style = lib.mkForce (builtins.readFile ../../dots/swaync/theme.css);
   };
 
   # auto mount removable drives
@@ -473,7 +471,7 @@ in
     pkgs.catppuccin-cursors.mochaMauve
 
     # miscellaneous
-    pkgs.xwaylandvideobridge
+    pkgs.kdePackages.xwaylandvideobridge
     pkgs.xdg-utils
   ];
 }

home-manager/desktop/hyprland.nix

@@ -29,7 +29,7 @@ in
     syntaxHighlighting.enable = true;
     autosuggestion.enable = true;
 
-    initExtra = ''
+    initContent = ''
       if [ "$(tty)" = "/dev/tty1" ]; then
         exec Hyprland &> /dev/null
       fi

home-manager/shell.nix

@@ -4,12 +4,8 @@
   fonts = {
     enableDefaultPackages = true;
     packages = with pkgs; [
-      (nerdfonts.override {
-        fonts = [
-          "JetBrainsMono"
-          "SpaceMono"
-        ];
-      })
+      nerd-fonts.jetbrains-mono
+      nerd-fonts.space-mono
       helvetica-neue-lt-std
     ];
   };

hosts/fonts.nix

@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }:
+{ ... }:
 
 {
   nix.settings = {
@@ -8,11 +8,7 @@
 
   programs.hyprland = {
     enable = true;
-    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-
     xwayland.enable = true;
-    portalPackage =
-      inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
   };
 
   environment.variables = {

modules/desktop/hyprland.nix

@@ -1,13 +1,15 @@
-{ pkgs, inputs, ... }:
+{ ... }:
 
-let
-  pkgs-unstable = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system};
-in
+# let
+#   pkgs-unstable = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system};
+# in
 {
-  hardware.graphics = {
-    package = pkgs-unstable.mesa;
+  hardware.graphics.enable = true;
 
-    enable32Bit = true;
-    package32 = pkgs-unstable.pkgsi686Linux.mesa;
-  };
+  # hardware.graphics = {
+  # package = pkgs-unstable.mesa;
+
+  # enable32Bit = true;
+  # package32 = pkgs-unstable.pkgsi686Linux.mesa;
+  # };
 }

modules/drivers/opengl.nix

@@ -6,8 +6,8 @@
     6002
   ];
 
-  hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
+
   services.pipewire = {
     enable = true;
 
@@ -27,7 +27,7 @@
     pulse.enable = true;
     jack.enable = true;
   };
-  services.libinput.enable = true;
 
+  services.libinput.enable = true;
   environment.systemPackages = [ pkgs.alsa-utils ];
 }