Update dependencies and module imports

This commit is contained in:
panotaka
2024-01-01 01:18:26 -04:00
parent 07b5c7fcf9
commit 962c0df2b2
4 changed files with 26 additions and 25 deletions

11
flake.lock generated
View File

@@ -342,17 +342,16 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1704073740, "lastModified": 1704081953,
"narHash": "sha256-IcZeuP6heys+vsbiOP7DJwizrPbC7ZM4fU3nFkM4ubw=", "narHash": "sha256-wyvYfkdja/iblX3KgN7BhESWTmg6nA18dVUdMazXw6M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "f570501d5051709bb88d85401e38f80ec66bebc0", "rev": "ad3024a9a3c60c6cae8e745e3102ce21c2d3c1c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "id": "nur",
"repo": "NUR", "type": "indirect"
"type": "github"
} }
}, },
"root": { "root": {

View File

@@ -2,18 +2,23 @@
description = "NixOS configuration of Thomas Syms"; description = "NixOS configuration of Thomas Syms";
nixConfig = {experimental-features = ["nix-command" "flakes"];}; nixConfig = {experimental-features = ["nix-command" "flakes"];};
inputs = { inputs = {
# System # Nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:NixOS/nixos-hardware";
disko.url = "github:nix-community/disko";
disko.inputs.nixpkgs.follows = "nixpkgs";
# NUR # NixOS-Hardware
nur.url = "github:nix-community/NUR"; nixos-hardware.url = "github:NixOS/nixos-hardware";
# Disko
disko = {
url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs";
};
# Home Manager # Home Manager
home-manager.url = "github:nix-community/home-manager"; home-manager = {
home-manager.inputs.nixpkgs.follows = "nixpkgs"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
#VSCode Extensions #VSCode Extensions
nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions";
@@ -79,13 +84,10 @@
# Modules # Modules
modules = [ modules = [
# NUR Module
nur.nixosModules.nur
# Theme Modules # Theme Modules
stylix.nixosModules.stylix stylix.nixosModules.stylix
./themes/targets/all.nix ./themes/targets/all.nix
./themes/spaceduck ./themes/tokyonight
# Host Module # Host Module
./hosts/Blackbird ./hosts/Blackbird

View File

@@ -1,8 +1,7 @@
{ {
lib, lib,
pkgs, pkgs,
nixos-hardware, inputs,
disko,
... ...
}: let }: let
hostname = "Blackbird"; hostname = "Blackbird";
@@ -12,8 +11,8 @@ in {
imports = [ imports = [
# Import hardware configuration # Import hardware configuration
nixos-hardware.nixosModules.gpd-pocket-3 inputs.nixos-hardware.nixosModules.gpd-pocket-3
disko.nixosModules.disko inputs.disko.nixosModules.disko
./disko.nix ./disko.nix
# Import system configuration # Import system configuration

View File

@@ -2,6 +2,7 @@
lib, lib,
nixos-hardware, nixos-hardware,
disko, disko,
inputs,
... ...
}: let }: let
hostname = "Equinox"; hostname = "Equinox";
@@ -11,9 +12,9 @@ in {
imports = [ imports = [
# Import hardware configuration # Import hardware configuration
nixos-hardware.nixosModules.dell-xps-15-9510 inputs.nixos-hardware.nixosModules.dell-xps-15-9510
nixos-hardware.nixosModules.dell-xps-15-9510-nvidia inputs.nixos-hardware.nixosModules.dell-xps-15-9510-nvidia
disko.nixosModules.disko inputs.disko.nixosModules.disko
./disko.nix ./disko.nix
# Import system configuration # Import system configuration