From ffae6f8057585886e28ab9a7d37a1732724eab2a Mon Sep 17 00:00:00 2001 From: blaknull Date: Sat, 19 Oct 2024 08:44:02 -0500 Subject: [PATCH] make live iso minimal --- flake.lock | 28 +- flake.nix | 41 +- result | 1 + system/configuration/default.nix | 2 - system/configuration/homebox/default.nix | 1 - system/configuration/laptop/default.nix | 1 - system/configuration/live/default.nix | 24 - system/configuration/live/flake.nix | 70 +++ system/disko/disko.nix | 6 + system/disko/disko_bonus.nix | 5 + system/flake.lock | 624 ----------------------- system/flake.nix | 12 +- system/services/openssh/default.nix | 2 +- 13 files changed, 117 insertions(+), 700 deletions(-) create mode 120000 result delete mode 100644 system/configuration/live/default.nix create mode 100644 system/configuration/live/flake.nix delete mode 100644 system/flake.lock diff --git a/flake.lock b/flake.lock index 3fc280a..657e68b 100644 --- a/flake.lock +++ b/flake.lock @@ -1027,11 +1027,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-Hz1a2OgtlwgdQhI6hiUvityjVURsoY6oXkXq25RyiBM=", - "path": "/nix/store/sxxi6m8z1cfk39wjwb85h5g2mxsyrc50-source/home", + "path": "/nix/store/w0n7cr6gwqnbgv8w9bvjbdjnw6jvdds5-source/home", "type": "path" }, "original": { - "path": "/nix/store/sxxi6m8z1cfk39wjwb85h5g2mxsyrc50-source/home", + "path": "/nix/store/w0n7cr6gwqnbgv8w9bvjbdjnw6jvdds5-source/home", "type": "path" } }, @@ -1417,11 +1417,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-6oCDKhDSqJMWeODXDHD5XorN7/+KXBBIPZ2z+obwUNY=", - "path": "/nix/store/9rwbq2m6png6hv68z1ir3vb7p4avmjjk-source/packages", + "path": "/nix/store/lqy41jv976m4xxch3grybjasmn2234yv-source/packages", "type": "path" }, "original": { - "path": "/nix/store/9rwbq2m6png6hv68z1ir3vb7p4avmjjk-source/packages", + "path": "/nix/store/lqy41jv976m4xxch3grybjasmn2234yv-source/packages", "type": "path" } }, @@ -1507,11 +1507,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-hg0wqQn6BxQXLmfBINzZoaWpdSIlwwZxKbYz+4df83o=", - "path": "/nix/store/9rwbq2m6png6hv68z1ir3vb7p4avmjjk-source/programs", + "path": "/nix/store/lqy41jv976m4xxch3grybjasmn2234yv-source/programs", "type": "path" }, "original": { - "path": "/nix/store/9rwbq2m6png6hv68z1ir3vb7p4avmjjk-source/programs", + "path": "/nix/store/lqy41jv976m4xxch3grybjasmn2234yv-source/programs", "type": "path" } }, @@ -1588,11 +1588,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-/+FJTRzHmHfZLb8yU/wMyGyMZFJ53mJNRzc5d4Gzwjw=", - "path": "/nix/store/dzq3nrs0fqr8l08vdkayjysh2hpapwgs-source/sddm", + "path": "/nix/store/4kma722n7j1p0273bp5j7pqa0znivvcw-source/sddm", "type": "path" }, "original": { - "path": "/nix/store/dzq3nrs0fqr8l08vdkayjysh2hpapwgs-source/sddm", + "path": "/nix/store/4kma722n7j1p0273bp5j7pqa0znivvcw-source/sddm", "type": "path" } }, @@ -1637,12 +1637,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-VZKans7CW3BgyWaVgi9mGKvJsCvyse2zLPRB5fJnlfA=", - "path": "/nix/store/9rwbq2m6png6hv68z1ir3vb7p4avmjjk-source/services", + "narHash": "sha256-z2Uyh8lc8Mi5hPUGqRw1wVnTKNwGsG75CCZ8gZ2LKwk=", + "path": "/nix/store/lqy41jv976m4xxch3grybjasmn2234yv-source/services", "type": "path" }, "original": { - "path": "/nix/store/9rwbq2m6png6hv68z1ir3vb7p4avmjjk-source/services", + "path": "/nix/store/lqy41jv976m4xxch3grybjasmn2234yv-source/services", "type": "path" } }, @@ -1657,12 +1657,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-9/b/cIe0fLBXo0YSP+SbMsViIaW3r2M1v0xbbviPzyc=", - "path": "/nix/store/sxxi6m8z1cfk39wjwb85h5g2mxsyrc50-source/system", + "narHash": "sha256-zCuXOk2uNhjduhm2aqSymCImHRy8ceJxRlYV+oAQ3mk=", + "path": "/nix/store/w0n7cr6gwqnbgv8w9bvjbdjnw6jvdds5-source/system", "type": "path" }, "original": { - "path": "/nix/store/sxxi6m8z1cfk39wjwb85h5g2mxsyrc50-source/system", + "path": "/nix/store/w0n7cr6gwqnbgv8w9bvjbdjnw6jvdds5-source/system", "type": "path" } }, diff --git a/flake.nix b/flake.nix index bd5b5f6..9e734a8 100644 --- a/flake.nix +++ b/flake.nix @@ -74,31 +74,28 @@ (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") ]; + environment.etc = { + "nixos/disko/default.nix".source = "./system/disko/default.nix"; + "nixos/disko/disko.nix".source = "./system/disko/disko.nix"; + "nixos/disko/disko_bonus.nix".source = "./system/disko/disko_bonus.nix"; + "nixos/disko/impermanent.nix".source = "./system/disko/impermanent.nix"; + "nixos/impermanence/default.nix".source = "./system/impermanence/default.nix"; + "nixos/flake.nix".source = "./system/configuration/live/flake.nix"; + }; + + services.openssh = { + enable = true; + }; + + networking = { + hostName = "live"; + firewall.allowedTCPPorts = [ 22 ]; + }; + nixpkgs.hostPlatform = iso_system; - sysconfig = { - ${host}.enable = true; - opts = { - firstBoot = true; - inherit username; - host = "live"; - devices = (devices // { - main = "/dev/sda"; - bonus = null; - }); - openssh.enable = true; - pipewire.enable = true; - hyprland.enable = true; - git.enable = true; - ags.enable = true; - nh.enable = true; - steam.enable = false; - }; - }; + }) - - core_inputs.system.nixosModule - core_inputs.home-manager.nixosModules.home-manager ]; }; diff --git a/result b/result new file mode 120000 index 0000000..800eb50 --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/frjkwfcll6yckrvv2n95swd98zp6qz4k-nixos-24.05.20241009.d51c286-x86_64-linux.iso \ No newline at end of file diff --git a/system/configuration/default.nix b/system/configuration/default.nix index a463af2..c21c083 100644 --- a/system/configuration/default.nix +++ b/system/configuration/default.nix @@ -1,14 +1,12 @@ { config, lib, pkgs, core_inputs, ... }: { imports = [ - ./live ./laptop ./homebox ]; sysconfig.laptop.enable = lib.mkDefault false; sysconfig.homebox.enable = lib.mkDefault false; - sysconfig.live.enable = lib.mkDefault true; # Set your time zone. time.timeZone = "America/Chicago"; diff --git a/system/configuration/homebox/default.nix b/system/configuration/homebox/default.nix index 50dd334..cac632e 100644 --- a/system/configuration/homebox/default.nix +++ b/system/configuration/homebox/default.nix @@ -22,7 +22,6 @@ } ]; - sysconfig.live.enable = lib.mkForce false; boot = { loader = { diff --git a/system/configuration/laptop/default.nix b/system/configuration/laptop/default.nix index 28e85e5..defc293 100644 --- a/system/configuration/laptop/default.nix +++ b/system/configuration/laptop/default.nix @@ -19,7 +19,6 @@ } ]; - sysconfig.live.enable = lib.mkForce false; nixpkgs.config.allowUnfree = true; diff --git a/system/configuration/live/default.nix b/system/configuration/live/default.nix deleted file mode 100644 index 39d8813..0000000 --- a/system/configuration/live/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ config, lib, pkgs, ... }: { - - options.sysconfig.live.enable = lib.options.mkOption { - type = lib.types.bool; - default = true; - }; - - config = lib.mkIf config.sysconfig.live.enable { - services ={ - xserver.enable = true; - displayManager.enable = true; - }; - - environment = { - shells = with pkgs; [ zsh ]; - sessionVariables = {}; - }; - - programs.zsh.enable = true; - users.defaultUserShell = pkgs.zsh; - - system.stateVersion = "24.05"; - }; -} diff --git a/system/configuration/live/flake.nix b/system/configuration/live/flake.nix new file mode 100644 index 0000000..dfca66c --- /dev/null +++ b/system/configuration/live/flake.nix @@ -0,0 +1,70 @@ +{ + description = "install nixos declaratively"; + + inputs = { + + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + + disko = { + url = "github:nix-community/disko"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + impermanence.url = "github:nix-community/impermanence"; + }; + + outputs = { ... }@inputs: let + system = "x86_64-linux"; + devices = { + main = "/dev/nvme0n1"; + bonus.disk1 = "/dev/nvme1n1"; + }; + + pkgs = import inputs.nixpkgs { + inherit system; + config.allowUnfree = true; + }; + in { + + nixosConfigurations.homebox = inputs.nixpkgs.lib.nixosSystem { + + inherit system; + + modules = [ + inputs.disko.nixosModules.default + inputs.impermanence.nixosModules.impermanece + ./disko + ./impermanece + ]; + + sysconfig.opts = { + inherit devices; + }; + + disko = { + enable = true; + impermanent = true; + }; + + networking = { + hostName = "homebox"; + nameservers = [ "1.1.1.1#one.one.one.one" "1.0.0.1#one.one.one.one" ]; + networkmanager.enable = true; + }; + + users.users."nathan" = { + isNormalUser = true; + description = "Nathan"; + initialPassword = "7567"; + extraGroups = [ "wheel" "networkmanager" ]; + }; + + services.openssh.enable = true; + + environment.systemPackages = with pkgs; [ + git + home-manager + ]; + }; + }; +} diff --git a/system/disko/disko.nix b/system/disko/disko.nix index 4a3bd3e..335df20 100644 --- a/system/disko/disko.nix +++ b/system/disko/disko.nix @@ -1,4 +1,10 @@ { config, lib, ... }: { + + options.sysconfig.opts.devices.main = lib.options.mkOption { + type = lib.types.str; + default = null; + }; + config = lib.mkIf config.disko.enable { disko.devices = { disk.main = { diff --git a/system/disko/disko_bonus.nix b/system/disko/disko_bonus.nix index 53afffe..6e11809 100644 --- a/system/disko/disko_bonus.nix +++ b/system/disko/disko_bonus.nix @@ -1,4 +1,9 @@ { config, lib, ... }: { + + options.sysconfig.opts.devices.bonus = lib.mkOption { + type = lib.types.attrsOf lib.types.str; + default = null; + }; config = lib.mkIf (config.disko.enable && config.sysconfig.opts.devices.bonus != null) { disko.devices = { diff --git a/system/flake.lock b/system/flake.lock deleted file mode 100644 index 5034d8d..0000000 --- a/system/flake.lock +++ /dev/null @@ -1,624 +0,0 @@ -{ - "nodes": { - "ags": { - "locked": { - "lastModified": 1, - "narHash": "sha256-xrkH8ezy3xf6rsOTdqMSIoAaWnPHHIXxIuxszEJAh3M=", - "path": "/nix/store/vdm429nq6lqicpwwyzhyyfv2fkcnrvcc-source/ags", - "type": "path" - }, - "original": { - "path": "/nix/store/vdm429nq6lqicpwwyzhyyfv2fkcnrvcc-source/ags", - "type": "path" - } - }, - "aquamarine": { - "inputs": { - "hyprutils": [ - "prgms", - "hyprland", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "prgms", - "hyprland", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "prgms", - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "prgms", - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728902391, - "narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "9874e08eec85b5542ca22494e127b0cdce46b786", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, - "disko": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729281548, - "narHash": "sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw=", - "owner": "nix-community", - "repo": "disko", - "rev": "a6a3179ddf396dfc28a078e2f169354d0c137125", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "disko", - "type": "github" - } - }, - "external": { - "inputs": { - "waveforms": "waveforms" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-BWhHfDAKpNghzSyoO3dU1EPLxl/ADB654NKb3JORQFE=", - "path": "/nix/store/5xfq2prdddvm68wmpy8ibvd2nxp4ijl4-source/external", - "type": "path" - }, - "original": { - "path": "/nix/store/5xfq2prdddvm68wmpy8ibvd2nxp4ijl4-source/external", - "type": "path" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "prgms", - "hyprland", - "hyprland", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "prgms", - "hyprland", - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "prgms", - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "prgms", - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728669738, - "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "hyprland": "hyprland_2" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-lXJ/q9VTQkjT7mXnTPXhiQ9FifWKlgonm9RvlVYO7lc=", - "path": "/nix/store/vdm429nq6lqicpwwyzhyyfv2fkcnrvcc-source/hyprland", - "type": "path" - }, - "original": { - "path": "/nix/store/vdm429nq6lqicpwwyzhyyfv2fkcnrvcc-source/hyprland", - "type": "path" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "prgms", - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "prgms", - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland_2": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_3", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1729195555, - "narHash": "sha256-nTMzcwH5eFX2JM5Lrtw1469BRe6hGgWWxLqJBynEdvo=", - "ref": "refs/heads/main", - "rev": "0e630e9e74ad34683194a07cfe6afe55a2c0685f", - "revCount": 5352, - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" - }, - "original": { - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "prgms", - "hyprland", - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "prgms", - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "prgms", - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "prgms", - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "prgms", - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728941256, - "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "prgms", - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "prgms", - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, - "impermanence": { - "locked": { - "lastModified": 1729068498, - "narHash": "sha256-C2sGRJl1EmBq0nO98TNd4cbUy20ABSgnHWXLIJQWRFA=", - "owner": "nix-community", - "repo": "impermanence", - "rev": "e337457502571b23e449bf42153d7faa10c0a562", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "impermanence", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1729181673, - "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 0, - "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", - "path": "/nix/store/m1szqwijms610n6325mwjswslha4nd92-source", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "pckgs": { - "inputs": { - "external": "external" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-6oCDKhDSqJMWeODXDHD5XorN7/+KXBBIPZ2z+obwUNY=", - "path": "/nix/store/491iqnvg196pfv82shzbys836y3n156b-source/system/packages", - "type": "path" - }, - "original": { - "path": "/nix/store/491iqnvg196pfv82shzbys836y3n156b-source/system/packages", - "type": "path" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "prgms", - "hyprland", - "hyprland", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1728778939, - "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "prgms": { - "inputs": { - "ags": "ags", - "hyprland": "hyprland" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-hg0wqQn6BxQXLmfBINzZoaWpdSIlwwZxKbYz+4df83o=", - "path": "/nix/store/491iqnvg196pfv82shzbys836y3n156b-source/system/programs", - "type": "path" - }, - "original": { - "path": "/nix/store/491iqnvg196pfv82shzbys836y3n156b-source/system/programs", - "type": "path" - } - }, - "repo": { - "flake": false, - "locked": { - "lastModified": 1686823900, - "narHash": "sha256-JRVVzyefqR2L3UrEK2iWyhUKfPMUNUnfRZmwdz05wL0=", - "owner": "siddrs", - "repo": "tokyo-night-sddm", - "rev": "320c8e74ade1e94f640708eee0b9a75a395697c6", - "type": "github" - }, - "original": { - "owner": "siddrs", - "repo": "tokyo-night-sddm", - "type": "github" - } - }, - "root": { - "inputs": { - "disko": "disko", - "impermanence": "impermanence", - "nixpkgs": "nixpkgs", - "pckgs": "pckgs", - "prgms": "prgms", - "srvcs": "srvcs" - } - }, - "sddm": { - "inputs": { - "theme": "theme" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-/+FJTRzHmHfZLb8yU/wMyGyMZFJ53mJNRzc5d4Gzwjw=", - "path": "/nix/store/dzq3nrs0fqr8l08vdkayjysh2hpapwgs-source/sddm", - "type": "path" - }, - "original": { - "path": "/nix/store/dzq3nrs0fqr8l08vdkayjysh2hpapwgs-source/sddm", - "type": "path" - } - }, - "srvcs": { - "inputs": { - "sddm": "sddm" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-VZKans7CW3BgyWaVgi9mGKvJsCvyse2zLPRB5fJnlfA=", - "path": "/nix/store/491iqnvg196pfv82shzbys836y3n156b-source/system/services", - "type": "path" - }, - "original": { - "path": "/nix/store/491iqnvg196pfv82shzbys836y3n156b-source/system/services", - "type": "path" - } - }, - "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "theme": { - "inputs": { - "repo": "repo" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-4qcgTKJv2uerh2pzxBzFRaYh12KBI1ZlMhMtkl/MI90=", - "path": "/nix/store/98wnq5dpslj19w5m0akhbv42ml7g3w2p-source/themes/tokyo-night", - "type": "path" - }, - "original": { - "path": "/nix/store/98wnq5dpslj19w5m0akhbv42ml7g3w2p-source/themes/tokyo-night", - "type": "path" - } - }, - "waveforms": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1728376004, - "narHash": "sha256-mTib24PapKexOaTUNsGiTtZFaXR2LYaQazVBGzlnAig=", - "owner": "liff", - "repo": "waveforms-flake", - "rev": "1d58c63da1ce63a2896d13a3d66238ff9aca89e4", - "type": "github" - }, - "original": { - "owner": "liff", - "repo": "waveforms-flake", - "type": "github" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "prgms", - "hyprland", - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "prgms", - "hyprland", - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "prgms", - "hyprland", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "prgms", - "hyprland", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "prgms", - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "prgms", - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728166987, - "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/system/flake.nix b/system/flake.nix index 6ba880e..b3fde99 100755 --- a/system/flake.nix +++ b/system/flake.nix @@ -22,7 +22,7 @@ nixosModule = { config, lib, pkgs, core_inputs, ... }: { imports = [ ./configuration - ./configuration/${core_inputs.host}/hardware-configuration.nix +# ./configuration/${core_inputs.host}/hardware-configuration.nix ./disko inputs.disko.nixosModules.default ./impermanence @@ -43,16 +43,6 @@ type = lib.types.str; default = "nathan"; }; - devices = { - main = lib.options.mkOption { - type = lib.types.str; - default = null; - }; - bonus = lib.options.mkOption { - type = lib.types.attrsOf lib.types.str; - default = null; - }; - }; }; }; diff --git a/system/services/openssh/default.nix b/system/services/openssh/default.nix index d7e516f..9336631 100644 --- a/system/services/openssh/default.nix +++ b/system/services/openssh/default.nix @@ -14,7 +14,7 @@ services.openssh = { enable = true; settings = { - PermitRootLogin = "no"; + PermitRootLogin = lib.mkForce "no"; PasswordAuthentication = false; KbdInteractiveAuthentication = false; };