jsutter/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolve conflict

Browse source
This commit is contained in:
Julian Sutter 2023-03-23 18:07:43 -07:00
commit e8f48e2cee
3 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flake.lock generated
View file

@ -8,11 +8,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1679265143, "lastModified": 1679480702,
"narHash": "sha256-5RDMW+O4owjdPz7t4K4YxH2fOHCNOcyVmSiKRUikiv0=", "narHash": "sha256-npuRD61YmxUPitI1TqKwlxLrU6iGl5E+BPT196LgUDo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1b8bf5c3270386a1b6850bd77d79dbdbaf0d7a7c", "rev": "363c46b2480f1b73ec37cf68caac61f5daa82a2e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -23,11 +23,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1679172431, "lastModified": 1679437018,
"narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=", "narHash": "sha256-vOuiDPLHSEo/7NkiWtxpHpHgoXoNmrm+wkXZ6a072Fc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1603d11595a232205f03d46e635d919d1e1ec5b9", "rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View file

@ -19,7 +19,7 @@
./systems/framework.nix ./systems/framework.nix
./users/jsutter.nix ./users/jsutter.nix
./modules/plasma.nix ./modules/plasma.nix
./modules/dev.nix ./modules/dev.nix
]; ];
}; };
aurora = nixpkgs.lib.nixosSystem { aurora = nixpkgs.lib.nixosSystem {
@ -28,8 +28,8 @@
./systems/common.nix ./systems/common.nix
./systems/aurora.nix ./systems/aurora.nix
./users/jsutter.nix ./users/jsutter.nix
./modules/plasma.nix ./modules/plasma.nix
./modules/ml.nix ./modules/dev.nix
./modules/virtualization.nix ./modules/virtualization.nix
]; ];
}; };

4
modules/ml.nix
View file

@ -1,4 +0,0 @@
{ config, pkgs, ... }:
{
}