mirror of
https://github.com/ItsDrike/nixdots
synced 2024-11-10 08:49:42 +00:00
Compare commits
No commits in common. "5580328f0abe4bbaeef9d40d0d62953c27e78b03" and "b930b14cf22b074e4fdd1f1f8175137a661af139" have entirely different histories.
5580328f0a
...
b930b14cf2
|
@ -39,8 +39,8 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = {self, nixpkgs, ...} @ inputs: {
|
outputs = {self, nixpkgs, ...} @ inputs: let
|
||||||
nixosConfigurations = import ./hosts {inherit inputs;};
|
in {
|
||||||
devShells = import ./shells {inherit inputs;};
|
nixosConfigurations = import ./hosts {inherit nixpkgs inputs self;};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{ inputs, ... }:
|
{ self, inputs, ... }:
|
||||||
let
|
let
|
||||||
inherit (inputs) self;
|
|
||||||
inherit (inputs.nixpkgs) lib;
|
inherit (inputs.nixpkgs) lib;
|
||||||
|
|
||||||
# A list of shared modules that ALL systems need
|
# A list of shared modules that ALL systems need
|
||||||
|
@ -11,6 +10,17 @@ let
|
||||||
];
|
];
|
||||||
in
|
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 {
|
herugrim = lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs = { inherit lib inputs self; };
|
specialArgs = { inherit lib inputs self; };
|
||||||
|
|
|
@ -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";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -11,9 +11,6 @@
|
||||||
deviceType = config.myOptions.device.roles.type;
|
deviceType = config.myOptions.device.roles.type;
|
||||||
acceptedTypes = ["laptop" "desktop"];
|
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;
|
sessionData = config.services.displayManager.sessionData.desktops;
|
||||||
sessionPaths = concatStringsSep ":" [
|
sessionPaths = concatStringsSep ":" [
|
||||||
"${sessionData}/share/xsessions"
|
"${sessionData}/share/xsessions"
|
||||||
|
@ -28,16 +25,14 @@
|
||||||
"--remember"
|
"--remember"
|
||||||
"--remember-user-session"
|
"--remember-user-session"
|
||||||
"--asterisks"
|
"--asterisks"
|
||||||
"--greeting ${greetingMsg}"
|
|
||||||
"--sessions '${sessionPaths}'"
|
"--sessions '${sessionPaths}'"
|
||||||
"--theme ${tuiGreetTheme}"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
config = mkIf (builtins.elem deviceType acceptedTypes) {
|
config = mkIf (builtins.elem deviceType acceptedTypes) {
|
||||||
services.greetd = {
|
services.greetd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
vt = 1;
|
vt = 2;
|
||||||
|
|
||||||
# <https://man.sr.ht/~kennylevinsen/greetd/>
|
# <https://man.sr.ht/~kennylevinsen/greetd/>
|
||||||
settings = {
|
settings = {
|
||||||
|
@ -59,8 +54,5 @@ in {
|
||||||
TTYVHangup = true;
|
TTYVHangup = true;
|
||||||
TTYVTDisallocate = true;
|
TTYVTDisallocate = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Persist info about previous session & user
|
|
||||||
myOptions.system.impermanence.root.extraDirectories = [ "/var/cache/tuigreet" ];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue