diff --git a/flake.lock b/flake.lock index 58d51ac..64d4b2d 100644 --- a/flake.lock +++ b/flake.lock @@ -55,24 +55,45 @@ }, "nixpkgs": { "locked": { - "lastModified": 1669833724, - "narHash": "sha256-/HEZNyGbnQecrgJnfE8d0WC5c1xuPSD2LUpB6YXlg4c=", + "lastModified": 1676202775, + "narHash": "sha256-gV/RnfVZkGLHn+5rmX2GSh5aquVHpWOJw1cnpEV03tQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4d2b37a84fad1091b9de401eb450aae66f1a741e", + "rev": "d917136f550a8c36efb1724390c7245105f79023", "type": "github" }, "original": { "owner": "NixOS", - "ref": "refs/tags/22.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, + "perimeter81": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1675110148, + "narHash": "sha256-Z+mQjEfkxrTa1svhYgDIDvPib2Sw+QtXbrlasJbKKcQ=", + "ref": "refs/heads/master", + "rev": "9564207275482af52d948eb2ce6ce2a70ed10575", + "revCount": 6, + "type": "git", + "url": "file:///home/tvb/projects/perimeter81-nixos" + }, + "original": { + "type": "git", + "url": "file:///home/tvb/projects/perimeter81-nixos" + } + }, "root": { "inputs": { "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "perimeter81": "perimeter81" } } }, diff --git a/flake.nix b/flake.nix index 954356c..b6637bc 100644 --- a/flake.nix +++ b/flake.nix @@ -1,11 +1,13 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs?ref=refs/tags/22.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-wsl.url = "github:nix-community/NixOS-WSL"; nixos-wsl.inputs.nixpkgs.follows = "nixpkgs"; + perimeter81.url = "git+file:///home/tvb/projects/perimeter81-nixos"; + perimeter81.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, nixpkgs, nixos-wsl }: { + outputs = { self, nixpkgs, nixos-wsl, perimeter81 }: { nixosConfigurations = { catacomb = nixpkgs.lib.nixosSystem { system = "aarch64-linux"; @@ -24,7 +26,10 @@ }; workeric = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - modules = [ ./machine/workeric ]; + modules = [ + ./machine/workeric + perimeter81.nixosModules.default + ]; }; }; }; diff --git a/machine/workeric/default.nix b/machine/workeric/default.nix index 11deec9..052ed79 100644 --- a/machine/workeric/default.nix +++ b/machine/workeric/default.nix @@ -11,6 +11,16 @@ networking.hostName = "workeric"; networking.networkmanager.enable = true; + services.xserver = { + enable = true; + libinput.enable = true; + #displayManager.lightdm.enable = true; + desktopManager.gnome.enable = true; + }; + + nix.extraOptions = "experimental-features = nix-command flakes"; + nixpkgs.config.allowUnfree = true; + # Set your time zone. time.timeZone = "America/Los_Angeles"; @@ -52,6 +62,8 @@ packages = with pkgs; [ git htop + firefox + vim ]; };