diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..0c2b470 --- /dev/null +++ b/flake.lock @@ -0,0 +1,82 @@ +{ + "nodes": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1638553958, + "narHash": "sha256-leETjYMtD9y37CvfRSQhIGibcIl4dNVlFkY/8QgqmAM=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "6ce1d64073f48b9bc9425218803b1b607454c1e7", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-21.11", + "repo": "home-manager", + "type": "github" + } + }, + "nixos-hardware": { + "locked": { + "lastModified": 1639201349, + "narHash": "sha256-BO6uRcPNxH7nuGlOR/lxxLR9ziGbZeaGceONEq6isYY=", + "owner": "nixos", + "repo": "nixos-hardware", + "rev": "324414d2fb7c975640bc105cd6cf4d6864cfd646", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixos-hardware", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1638887115, + "narHash": "sha256-emjtIeqyJ84Eb3X7APJruTrwcfnHQKs55XGljj62prs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1bd4bbd49bef217a3d1adea43498270d6e779d65", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-21.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1638986258, + "narHash": "sha256-OceRdctKZRSgqQxVRvvNB0MaEnFMzQqjUffecoDE9eI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "581d2d6c9cd5c289002203581d8aa0861963a933", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "nixos-hardware": "nixos-hardware", + "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index 10c92f0..fb72546 100644 --- a/flake.nix +++ b/flake.nix @@ -17,9 +17,19 @@ , nixpkgs-unstable , nixos-hardware , home-manager - }: { + }: + let + system = "x86_64-linux"; + pkgs = import nixpkgs { + inherit system; + config = { + allowUnfree = true; + }; + }; + in + { nixosConfigurations.gwyn = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; + inherit system pkgs; modules = [ ./hardware/precision/configuration.nix nixos-hardware.nixosModules.dell-precision-5530 @@ -28,7 +38,10 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.andreas = import ./home-manager/desktop.nix; + home-manager.users.andreas = import ./home-manager/desktop.nix + { + inherit inputs system pkgs; + }; } ]; }; diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix index 78b7a17..057592a 100644 --- a/home-manager/desktop.nix +++ b/home-manager/desktop.nix @@ -1,9 +1,9 @@ -{ pkgs, pkgs-unstable, inputs, system, ... }: +{ pkgs, inputs, system, ... }: { imports = [ ./common.nix ./common/git/git.nix - ./obsidian.nix + # ./obsidian.nix ./work-desktop.nix ]; home.packages = with pkgs; [