Compare commits

..

No commits in common. "228bc6005a8028aaf00615e0a61045654baa934a" and "f87e80e9af549061335f3f820f941ff957975679" have entirely different histories.

3 changed files with 16 additions and 20 deletions

View File

@ -27,17 +27,16 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1684146039,
"narHash": "sha256-twUDycpATcLn1ydy/QtC4c32paRCRquAy0ujMhDF/hQ=",
"lastModified": 1685239303,
"narHash": "sha256-uyQSAlUUNwEW40rqXtMav0ZvU4qXrZn+2mVjMsWbX8E=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "9b41f8296a3898bdb87b9d091f9df540a982b242",
"rev": "8ae5e04ba2f5366fea35d20682af009e4f790298",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "9b41f8296a3898bdb87b9d091f9df540a982b242",
"type": "github"
}
},
@ -221,11 +220,11 @@
]
},
"locked": {
"lastModified": 1685309749,
"narHash": "sha256-RcT9/GLpkMUp5P8tam16VsMbx+gKe5VYHXuL0/b3H90=",
"lastModified": 1684570809,
"narHash": "sha256-Rv8Gq1+Zhh+/CtL7xtjv+IXkPW+aCg3/hH+Xz+zaWEM=",
"owner": "idris-lang",
"repo": "idris2",
"rev": "360136ce25f1f81ed0c6c0e129dd9a6a93ab3efd",
"rev": "04c5531d9bf95f2a02cb4d74b6594390d565b6b9",
"type": "github"
},
"original": {
@ -242,11 +241,11 @@
"utils": "utils_2"
},
"locked": {
"lastModified": 1685268130,
"narHash": "sha256-f/eYXYdUA394VQZpEO6KHJweDuaciC1T/qF8j0qUgU0=",
"lastModified": 1685181612,
"narHash": "sha256-G1IU3/cxXgoP7PBv9iu1ScS4yxZAYQVggbYtonUFFGA=",
"ref": "refs/heads/master",
"rev": "f91f4dacfef23969973aa4efaff03a17f90d667b",
"revCount": 38,
"rev": "b47f01b34f6ab4a2d4ca21278f2f65e6e88b0e9c",
"revCount": 37,
"type": "git",
"url": "https://git.stranger.systems/nix/java"
},
@ -443,11 +442,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1685215858,
"narHash": "sha256-IRMFoDXA6cYx3ifVw3B2JcC4JrjT5v7tRAx2vro2Ffs=",
"lastModified": 1685043448,
"narHash": "sha256-U3BwyDc2OzBcZ8tD09qXibyivgOtOQFTFCVgFyJ+6MM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ba6e4ddeb3e8ad3f3e3bec63dafbc9fe558729bb",
"rev": "9886352ec9ab3945896ee8a4185e961fe29df209",
"type": "github"
},
"original": {

View File

@ -25,10 +25,7 @@
url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs";
};
emacs = {
url =
"github:nix-community/emacs-overlay/9b41f8296a3898bdb87b9d091f9df540a982b242";
};
emacs = { url = "github:nix-community/emacs-overlay"; };
sops-nix = {
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";

View File

@ -183,10 +183,10 @@ in {
virtualization = {
qemu = mkDefaultOption "qemu" config.nathan.config.isDesktop;
docker = mkDefaultOption "docker" config.nathan.config.isDesktop;
lxc = mkEnableOption "lxc";
lxc = mkDefaultOption "lxc" config.nathan.config.isDesktop;
nixos =
mkDefaultOption "nixos containers" config.nathan.config.isDesktop;
crosvm = mkEnableOption "crosvm";
crosvm = mkDefaultOption "crosvm" config.nathan.config.isDesktop;
};
# Support for interacting with a dual booted windows system
windows = {