diff --git a/flake.nix b/flake.nix index 19071130..efed28e0 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,39 @@ { description = "NixOS System Config"; - inputs = import ./inputs.nix; + inputs = { + nixpkgs.url = "nixpkgs/nixos-23.11"; + # nixpkgs-wayland - Wayland-specific packages not in nixpkgs + nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; + # home-manager - Dotfile mnagement - add /master at the end to pull from master + home-manager.url = "github:nix-community/home-manager/release-23.11"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; + # lanzaboote - Secureboot Configuration + lanzaboote.url = "github:nix-community/lanzaboote"; + lanzaboote.inputs.nixpkgs.follows = "nixpkgs"; + # nur - Nix User Repository - user-submitted / maintained packages + nur.url = "github:nix-community/NUR"; + # sops-nix - Secret Management with SOPS using GPG Keys + sops-nix.url = "github:Mic92/sops-nix"; + # doom-emacs - The Doom Emacs distribution` + doom-emacs.url = "github:nix-community/nix-doom-emacs"; + # nixos-hardware - Hardware Configurations + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + # nixos-generators - Automated Image / ISO Creation + nixos-generators.url = "github:nix-community/nixos-generators"; + nixos-generators.inputs.nixpkgs.follows = "nixpkgs"; + # disko - Declarative Disk Partitioning + disko.url = "github:nix-community/disko"; + disko.inputs.nixpkgs.follows = "nixpkgs"; + # Firefox theme, for "Gradience" GTK Theming + firefox-gnome-theme.url = "github:rafaelmardojai/firefox-gnome-theme"; + firefox-gnome-theme.flake = false; + # deploy-rs, declarative NixOS deployments + deploy-rs.url = "github:serokell/deploy-rs"; + deploy-rs.inputs.nixpkgs.follows = "nixpkgs"; + # compose2nix - Convert docker-compose.yml files to nix syntax + compose2nix.url = "github:aksiksi/compose2nix"; + compose2nix.inputs.nixpkgs.follows = "nixpkgs"; + }; outputs = { self, nixpkgs, nixpkgs-wayland, home-manager, lanzaboote, nur, sops-nix, doom-emacs, nixos-generators, deploy-rs, ... } @inputs: let inherit (self) outputs; diff --git a/inputs.nix b/inputs.nix deleted file mode 100644 index a13d02fd..00000000 --- a/inputs.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - nixpkgs.url = "nixpkgs/nixos-23.11"; - # nixpkgs-wayland - Wayland-specific packages not in nixpkgs - nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; - # home-manager - Dotfile mnagement - add /master at the end to pull from master - home-manager.url = "github:nix-community/home-manager/release-23.11"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; - # lanzaboote - Secureboot Configuration - lanzaboote.url = "github:nix-community/lanzaboote"; - lanzaboote.inputs.nixpkgs.follows = "nixpkgs"; - # nur - Nix User Repository - user-submitted / maintained packages - nur.url = "github:nix-community/NUR"; - # sops-nix - Secret Management with SOPS using GPG Keys - sops-nix.url = "github:Mic92/sops-nix"; - # doom-emacs - The Doom Emacs distribution` - doom-emacs.url = "github:nix-community/nix-doom-emacs"; - # nixos-hardware - Hardware Configurations - nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - # nixos-generators - Automated Image / ISO Creation - nixos-generators.url = "github:nix-community/nixos-generators"; - nixos-generators.inputs.nixpkgs.follows = "nixpkgs"; - # disko - Declarative Disk Partitioning - disko.url = "github:nix-community/disko"; - disko.inputs.nixpkgs.follows = "nixpkgs"; - # Firefox theme, for "Gradience" GTK Theming - firefox-gnome-theme.url = "github:rafaelmardojai/firefox-gnome-theme"; - firefox-gnome-theme.flake = false; - # deploy-rs, declarative NixOS deployments - deploy-rs.url = "github:serokell/deploy-rs"; - deploy-rs.inputs.nixpkgs.follows = "nixpkgs"; - # compose2nix - Convert docker-compose.yml files to nix syntax - compose2nix.url = "github:aksiksi/compose2nix"; - compose2nix.inputs.nixpkgs.follows = "nixpkgs"; -} \ No newline at end of file