nix
/
System
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: nix:f87e80e9af549061335f3f820f941ff957975679
Branches Tags
nix:trunk
..
compare: nix:228bc6005a8028aaf00615e0a61045654baa934a
Branches Tags
nix:trunk

4 Commits
f87e80e9af ... 228bc6005a

Author SHA1 Message Date
Nathan McCarty 228bc6005a
Update flake 2023-05-28 19:52:15 -04:00
Nathan McCarty f3b16d7dd5
Disable some things by default 2023-05-28 19:50:49 -04:00
Nathan McCarty 284d71e4b2
Lock emacs 2023-05-28 19:50:49 -04:00
Nathan McCarty 57c5f572b0
Update flake 2023-05-28 19:50:48 -04:00
3 changed files with 20 additions and 16 deletions
Show Stats Expand all files Collapse all files

27
flake.lock
View File

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

5
flake.nix
View File

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

4
modules/linux/default.nix
View File

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