update nixpkgs

Signed-off-by: John Titor <[email protected]>

flake.nix

@@ -1,13 +1,11 @@
 {
-  description = "Flake of JohnRTitor (Hyprland, Secure-Boot)";
+  description = "NixOS configuration of JohnRTitor (Hyprland, Secure-Boot)";
 
   # Main sources and repositories
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable"; # Unstable NixOS system (default)
     nixpkgs-edge.url = "nixpkgs/nixos-unstable-small"; # For latest packages
     nixpkgs-master.url = "nixpkgs/master"; # Testing branch of nixpkgs
-    nixpkgs-cava-fix.url = "github:nixos/nixpkgs/staging-next-24.11";
-    nixpkgs-libreoffice-pin.url = "nixpkgs/8487207876bffcf99e92aea3b853998bbeb474f0";
 
     flake-parts = {
       url = "github:hercules-ci/flake-parts"; # Flake parts for easy flake management
@@ -30,20 +28,26 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-parts.follows = "flake-parts";
     };
-    nix-flatpak.url = "github:gmodena/nix-flatpak/v0.4.1"; # Declarative Flatpak support for NixOS
+    nix-flatpak.url = "github:gmodena/nix-flatpak/v0.5.1"; # Declarative Flatpak support for NixOS
 
     ## DESKTOP ENVIRONMENT ##
     hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; # Hyprland, a Wayland WM, use git submodules too
-    rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor";
+    rose-pine-hyprcursor = {
+      url = "github:ndom91/rose-pine-hyprcursor";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     ## MISC PACKAGES ##
 
     ucodenix.url = "github:e-tho/ucodenix";
     nix-vscode-extensions = {
-      url = "github:nix-community/nix-vscode-extensions"; # Grab latest VScode extensions as a package
+      url = "github:nix-community/nix-vscode-extensions"; # Grab latest VScode extensions as a package;
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    nur = {
+      url = "github:nix-community/NUR"; # Nix User Repository, for community packages
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nur.url = "github:nix-community/NUR"; # Nix User Repository, for community packages
   };
   outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} {imports = [./flake];};
 

flake/default.nix

@@ -54,9 +54,7 @@ in
     packages = {
       fhs-shell = pkgs.callPackage ../pkgs/fhs-shell.nix {};
       weather-python-script = pkgs.callPackage ../pkgs/weather-python-script.nix {};
-      adminer-pematon-with-adminer-theme = pkgs.callPackage ../pkgs/adminer-pematon-with-adminer-theme {
-        inherit (pkgs-master) adminer-pematon;
-      };
+      adminer-pematon-with-adminer-theme = pkgs.callPackage ../pkgs/adminer-pematon-with-adminer-theme {};
     };
   };
 }

flake/hosts.nix

@@ -20,7 +20,7 @@ in {
           ../default-host/configuration.nix # main nix configuration
           inputs.determinate.nixosModules.default # new nix by determinant systems
           inputs.chaotic.nixosModules.default # chaotic nix bleeding edge packages
-          inputs.nur.nixosModules.nur # NUR - NixOS user repository
+          inputs.nur.modules.nixos.default # NUR - NixOS user repository
           inputs.ucodenix.nixosModules.ucodenix # ucodeNix - CPU microcode updates
           inputs.nix-flatpak.nixosModules.nix-flatpak # nix-flatpak, allows flatpak declaratively
 

home-manager/alacritty.nix

@@ -8,7 +8,7 @@
   programs.alacritty.enable = true;
   programs.alacritty.settings = {
     # SETTINGS START
-    live_config_reload = true;
+    general.live_config_reload = true;
 
     bell = {
       animation = "EaseOutExpo";
@@ -96,7 +96,7 @@
       semantic_escape_chars = ",│`|:\"' ()[]{}<>";
     };
 
-    shell = {
+    terminal.shell = {
       program =
         if (userSettings.shell == "zsh")
         then "/run/current-system/sw/bin/zsh"

modules-overlays/default.nix

@@ -12,7 +12,6 @@
 
   nixpkgs.overlays = [
     (final: prev: {
-      cava = inputs.nixpkgs-cava-fix.legacyPackages.${pkgs.system}.cava;
     })
   ];
 }

pkgs/fhs-shell.nix

@@ -1,7 +1,7 @@
 {pkgs, ...}: let
   base = pkgs.appimageTools.defaultFhsEnvArgs;
 in
-  pkgs.buildFHSUserEnv (
+  pkgs.buildFHSEnv (
     base
     // {
       name = "fhs"; # provides fhs command to enter in a FHS environment

pkgs/user-packages.nix

@@ -89,6 +89,7 @@
         "github-copilot"
         "nixidea"
       ])
+      scilab-bin
 
       # whatsapp-for-linux
       libreoffice-fresh

system/boot/lanzaboote.nix

@@ -10,7 +10,7 @@
   # lanzaboote for secureboot
   boot.lanzaboote = {
     enable = true;
-    pkiBundle = "/etc/secureboot";
+    pkiBundle = "/var/lib/sbctl";
   };
 
   # sbctl - a frontend to create, enroll manage keys

system/hardware/graphics.nix

@@ -5,7 +5,7 @@
   pkgs-edge,
   ...
 }: let
-  nur-amdgpu = config.nur.repos.materus;
+  nur-amdgpu = pkgs.nur.repos.materus;
 in {
   hardware.amdgpu = {
     initrd.enable = true;

system/hyprland/default.nix

@@ -14,7 +14,7 @@
   pkgs-hyprland =
     if hyprlandFlake
     then inputs.hyprland.packages.${pkgs.system}
-    else pkgs-edge;
+    else pkgs;
 in {
   imports = [
     ./session.nix

system/hyprland/session.nix

@@ -17,7 +17,7 @@
   # that properly starts Hyprland compositor with
   # `graphical-session.target` and necessary services
   programs.uwsm.enable = true;
-  programs.uwsm.package = pkgs-edge.uwsm;
+  programs.uwsm.package = pkgs.uwsm;
   programs.uwsm.waylandCompositors = {
     hyprland = {
       prettyName = "Hyprland";

system/nix-settings.nix

@@ -6,7 +6,7 @@
   ...
 }: {
   ## Determinate Nix is configured in ../flake/hosts.nix
-  # nix.package = pkgs.lix; # pkgs-edge.nixVersions.latest; # Use latest nix
+  # nix.package = pkgs.lix; # pkgs.nixVersions.latest; # Use latest nix
   # DONOT DISABLE THIS
   nix.settings.trusted-users = [userSettings.username]; # FIXME: if someday custom cache works without this