Compare commits

..

No commits in common. "5580328f0abe4bbaeef9d40d0d62953c27e78b03" and "b930b14cf22b074e4fdd1f1f8175137a661af139" have entirely different histories.

4 changed files with 16 additions and 35 deletions

View file

@ -39,8 +39,8 @@
};
};
outputs = {self, nixpkgs, ...} @ inputs: {
nixosConfigurations = import ./hosts {inherit inputs;};
devShells = import ./shells {inherit inputs;};
outputs = {self, nixpkgs, ...} @ inputs: let
in {
nixosConfigurations = import ./hosts {inherit nixpkgs inputs self;};
};
}

View file

@ -1,6 +1,5 @@
{ inputs, ... }:
{ self, inputs, ... }:
let
inherit (inputs) self;
inherit (inputs.nixpkgs) lib;
# A list of shared modules that ALL systems need
@ -11,6 +10,17 @@ let
];
in
{
vboxnix = lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit lib inputs self; };
modules = [
./vbox_nix
inputs.home-manager.nixosModules.home-manager
inputs.impermanence.nixosModules.impermanence
inputs.lanzaboote.nixosModules.lanzaboote
] ++ shared;
};
herugrim = lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit lib inputs self; };

View file

@ -1,21 +0,0 @@
{inputs, ...}: let
inherit (inputs) nixpkgs;
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
in {
${system} = {
default = pkgs.mkShell {
name = "nixdots";
meta.description = "The default development shell for my NixOS configuration";
packages = with pkgs; [
git # flakes require git
nil # nix ls
statix # lints and suggestions
deadnix # clean up unused nix code
alejandra # nix formatter
];
shellHook = "exec $SHELL";
};
};
}

View file

@ -11,9 +11,6 @@
deviceType = config.myOptions.device.roles.type;
acceptedTypes = ["laptop" "desktop"];
greetingMsg = "'Access is restricted to authorized personnel only.'";
tuiGreetTheme = "'border=magenta;text=cyan;prompt=green;time=red;action=white;button=yellow;container=black;input=gray'";
sessionData = config.services.displayManager.sessionData.desktops;
sessionPaths = concatStringsSep ":" [
"${sessionData}/share/xsessions"
@ -28,16 +25,14 @@
"--remember"
"--remember-user-session"
"--asterisks"
"--greeting ${greetingMsg}"
"--sessions '${sessionPaths}'"
"--theme ${tuiGreetTheme}"
];
};
in {
config = mkIf (builtins.elem deviceType acceptedTypes) {
services.greetd = {
enable = true;
vt = 1;
vt = 2;
# <https://man.sr.ht/~kennylevinsen/greetd/>
settings = {
@ -59,8 +54,5 @@ in {
TTYVHangup = true;
TTYVTDisallocate = true;
};
# Persist info about previous session & user
myOptions.system.impermanence.root.extraDirectories = [ "/var/cache/tuigreet" ];
};
}