diff options
Diffstat (limited to '')
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | flake.lock | 98 | ||||
| -rw-r--r-- | hosts/Apzu/hardware/default.nix | 2 | ||||
| -rw-r--r-- | hosts/Tiamat/hardware/default.nix | 2 | ||||
| -rw-r--r-- | system/boot/default.nix (renamed from system/boot/boot.nix) | 0 | ||||
| -rw-r--r-- | system/default.nix | 12 | ||||
| -rw-r--r-- | system/fileSystemLayouts/default.nix (renamed from system/filesystemLayouts/filesystemLayouts.nix) | 8 | ||||
| -rw-r--r-- | system/locale/default.nix (renamed from system/locale/locale.nix) | 0 | ||||
| -rw-r--r-- | system/packages/default.nix (renamed from system/packages/packages.nix) | 0 | ||||
| -rw-r--r-- | system/sound/default.nix (renamed from system/sound/sound.nix) | 0 | ||||
| -rw-r--r-- | system/users/default.nix (renamed from system/users/users.nix) | 0 |
11 files changed, 99 insertions, 24 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..ac4d88de --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.ignore diff --git a/flake.lock b/flake.lock index 0ae3ad6f..94284b5a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,8 +1,26 @@ { "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "utils": "utils" }, "locked": { @@ -20,23 +38,26 @@ "type": "github" } }, - "nixpkgs": { + "naersk": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, "locked": { - "lastModified": 1675115703, - "narHash": "sha256-4zetAPSyY0D77x+Ww9QBe8RHn1akvIvHJ/kgg8kGDbk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2caf4ef5005ecc68141ecb4aac271079f7371c44", + "lastModified": 1671096816, + "narHash": "sha256-ezQCsNgmpUHdZANDCILm3RvtO1xH8uujk/+EqNvzIOg=", + "owner": "nmattia", + "repo": "naersk", + "rev": "d998160d6a076cfe8f9741e56aeec7e267e3e114", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", + "owner": "nmattia", + "ref": "master", + "repo": "naersk", "type": "github" } }, - "nixpkgs_2": { + "nixpkgs": { "locked": { "lastModified": 1675362331, "narHash": "sha256-VmcnKPj5gJLxWK7Bxlhg2LoQvhKRss7Ax+uoFjd3qKY=", @@ -52,10 +73,48 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1675879502, + "narHash": "sha256-pbgIW5VrIk00rKrhBvuMEcKP8XUuB39GYf9lHmrrOGc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "54ee2f301fa534cf0b0a20e0ce44152755e2f8a5", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs", + "strip_js_comments": "strip_js_comments" + } + }, + "strip_js_comments": { + "inputs": { + "flake-compat": "flake-compat", + "naersk": "naersk", + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils_2" + }, + "locked": { + "lastModified": 1676105952, + "narHash": "sha256-yCeS5nxOH1TZNbUOo2sd06Emy0Ori2ZJO5XdnxtDfGY=", + "ref": "refs/heads/prime", + "rev": "6e0b1effc6ad82629e09de3938e905a47056ef47", + "revCount": 3, + "type": "git", + "url": "https://codeberg.org/ene/strip_js_comments.git" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/ene/strip_js_comments.git" } }, "utils": { @@ -72,6 +131,21 @@ "repo": "flake-utils", "type": "github" } + }, + "utils_2": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/hosts/Apzu/hardware/default.nix b/hosts/Apzu/hardware/default.nix index c36b7062..bd7241b3 100644 --- a/hosts/Apzu/hardware/default.nix +++ b/hosts/Apzu/hardware/default.nix @@ -13,7 +13,7 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - system.filesystemLayouts = { + system.fileSystemLayouts = { enable = true; mainDisk = "/dev/disk/by-uuid/<uuid>"; efiDisk = "/dev/disk/by-uuid/<uuid>"; diff --git a/hosts/Tiamat/hardware/default.nix b/hosts/Tiamat/hardware/default.nix index c36b7062..bd7241b3 100644 --- a/hosts/Tiamat/hardware/default.nix +++ b/hosts/Tiamat/hardware/default.nix @@ -13,7 +13,7 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - system.filesystemLayouts = { + system.fileSystemLayouts = { enable = true; mainDisk = "/dev/disk/by-uuid/<uuid>"; efiDisk = "/dev/disk/by-uuid/<uuid>"; diff --git a/system/boot/boot.nix b/system/boot/default.nix index f978d26a..f978d26a 100644 --- a/system/boot/boot.nix +++ b/system/boot/default.nix diff --git a/system/default.nix b/system/default.nix index 17e78968..81949ce4 100644 --- a/system/default.nix +++ b/system/default.nix @@ -1,10 +1,10 @@ {config, ...}: { imports = [ - ./boot/boot.nix - ./filesystemLayouts/filesystemLayouts.nix - ./locale/locale.nix - ./packages/packages.nix - ./sound/sound.nix - ./users/users.nix + ./boot + ./users # this needs to be before fileSystemLayouts + ./fileSystemLayouts + ./locale + ./packages + ./sound ]; } diff --git a/system/filesystemLayouts/filesystemLayouts.nix b/system/fileSystemLayouts/default.nix index a4215512..bdbad630 100644 --- a/system/filesystemLayouts/filesystemLayouts.nix +++ b/system/fileSystemLayouts/default.nix @@ -4,10 +4,10 @@ ... }: with lib; let - cfg = config.system.filesystemLayouts; + cfg = config.system.fileSystemLayouts; in { - options.system.filesystemLayouts = { - enable = mkEnableOption (mdDoc "filesysetemLayout"); + options.system.fileSystemLayouts = { + enable = mkEnableOption (mdDoc "fileSystemLayout"); mainDisk = mkOption { type = lib.types.path; example = literalExpression "/dev/disk/by-uuid/0442cb6d-f13a-4635-b487-fa76189774c5"; @@ -47,7 +47,7 @@ in { options = ["bind"]; }; - "${config.users.soispha.home}/.config" = { + "${config.users.users.soispha.home}/.config" = { device = "none"; fsType = "tmpfs"; options = ["defaults" "size=1G" "mode=755"]; diff --git a/system/locale/locale.nix b/system/locale/default.nix index 2fcc2115..2fcc2115 100644 --- a/system/locale/locale.nix +++ b/system/locale/default.nix diff --git a/system/packages/packages.nix b/system/packages/default.nix index 6eb25681..6eb25681 100644 --- a/system/packages/packages.nix +++ b/system/packages/default.nix diff --git a/system/sound/sound.nix b/system/sound/default.nix index 16dd4279..16dd4279 100644 --- a/system/sound/sound.nix +++ b/system/sound/default.nix diff --git a/system/users/users.nix b/system/users/default.nix index 2c962c26..2c962c26 100644 --- a/system/users/users.nix +++ b/system/users/default.nix |