From 14d9f649aa69f1741aac509daec679116e35d12c Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Mon, 26 May 2025 23:13:25 +0100 Subject: [PATCH] fixed update warnings and pinned versions stylix and home manager now pinned to 25.05, stable nixpkgs also updated --- flake.nix | 10 +++++----- home-manager/home.nix | 1 + home-manager/nvf.nix | 1 - 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 27daa98..8066bcd 100644 --- a/flake.nix +++ b/flake.nix @@ -2,15 +2,15 @@ description = "main system and home configuration flake"; inputs = { - # NixOS official package source, using the nixos-24.11 branch as stable and nixos-unstable as default - nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; + # NixOS official package source, using the nixos-25.05 branch as stable and nixos-unstable as default + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-master.url = "github:NixOS/nixpkgs/master"; nur.url = "github:nix-community/NUR"; # Home manager using nixos-unstable home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -43,7 +43,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; # Automatic themeing (using home-manager module) - stylix.url = "github:danth/stylix"; + stylix.url = "github:nix-community/stylix/release-25.05"; musnix.url = "github:musnix/musnix"; }; @@ -145,7 +145,7 @@ modules = [ ./home-manager/home.nix inputs.nvf.homeManagerModules.default - inputs.stylix.homeManagerModules.stylix # Not compatible with NixOS module as they will interfere with one another, use this when building on a non-NixOS machine + inputs.stylix.homeModules.stylix inputs.nix-flatpak.homeManagerModules.nix-flatpak ]; }; diff --git a/home-manager/home.nix b/home-manager/home.nix index a1309bf..7483e70 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -42,6 +42,7 @@ telegram-desktop # Telegram messenger client pavucontrol # Useful audio control GUI stable.prismlauncher # Minecraft launcher + virt-manager # QEMU manager # Audio Plugins calf diff --git a/home-manager/nvf.nix b/home-manager/nvf.nix index ba5b52c..31d6410 100644 --- a/home-manager/nvf.nix +++ b/home-manager/nvf.nix @@ -22,7 +22,6 @@ }; globals.mapleader = " "; languages = { - enableLSP = true; enableDAP = true; enableExtraDiagnostics = true; enableFormat = true;