diff --git a/flake.nix b/flake.nix index 2fd30a1..e3b6c08 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ inputs = # All flake references used to build my NixOS setup. These are dependencies. { nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Nix Packages - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; microvm = { @@ -23,7 +23,7 @@ impermanence.url = "github:nix-community/impermanence"; home-manager = { # User Package Management - url = "github:nix-community/home-manager/release-23.11"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -47,18 +47,14 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixvim = { - url = "github:nix-community/nixvim"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; }; - outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, nixvim, ... }: # Function that tells my flake which to use and what do what to do with the dependencies. + outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, ... }: # Function that tells my flake which to use and what do what to do with the dependencies. rec { nixosConfigurations = ( # NixOS configurations import ./hosts { # Imports ./hosts/default.nix inherit (nixpkgs) lib; - inherit inputs nixpkgs nixpkgs-unstable nixos-hardware home-manager home-manager-unstable agenix jovian-nixos microvm impermanence lanzaboote nixvim; # Also inherit home-manager so it does not need to be defined here. + inherit inputs nixpkgs nixpkgs-unstable nixos-hardware home-manager home-manager-unstable agenix jovian-nixos microvm impermanence lanzaboote; # Also inherit home-manager so it does not need to be defined here. nix.allowedUsers = [ "@wheel" ]; security.sudo.execWheelOnly = true; } diff --git a/hosts/default.nix b/hosts/default.nix index 910b24b..452e2fa 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -11,7 +11,7 @@ # └─ ./home.nix # -{ lib, inputs, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, nixvim, ... }: +{ lib, inputs, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, ... }: let user = "kabbone"; @@ -33,12 +33,11 @@ in { desktop = lib.nixosSystem { # Desktop profile inherit system; - specialArgs = { inherit inputs user location nixos-hardware agenix microvm nixpkgs lanzaboote nixvim; }; + specialArgs = { inherit inputs user location nixos-hardware agenix microvm nixpkgs lanzaboote; }; modules = [ agenix.nixosModules.default microvm.nixosModules.host lanzaboote.nixosModules.lanzaboote - #nixvim.nixosModules.nixvim ./desktop ./configuration_desktop.nix ../modules/hardware/remoteBuilder.nix diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index a48657f..9d2d790 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -17,7 +17,7 @@ # └─ default.nix # -{ config, nixpkgs, pkgs, user, lib, nixvim, ... }: +{ config, nixpkgs, pkgs, user, lib, ... }: { imports = # For now, if applying to other system, swap files