Compare commits
No commits in common. "33f262d2a4e4f78f60c23d4a1c2c2c2bcd342d2d" and "fa8900d4d59c9c471becfec271bf677a2d060d0b" have entirely different histories.
33f262d2a4
...
fa8900d4d5
3 changed files with 6 additions and 57 deletions
|
@ -15,8 +15,6 @@
|
||||||
|
|
||||||
microvm.nixosModules.host
|
microvm.nixosModules.host
|
||||||
|
|
||||||
./outline.nix
|
|
||||||
|
|
||||||
../../users/erwin
|
../../users/erwin
|
||||||
../../users/root
|
../../users/root
|
||||||
];
|
];
|
||||||
|
@ -54,30 +52,6 @@
|
||||||
sway = true;
|
sway = true;
|
||||||
wayvnc = true;
|
wayvnc = true;
|
||||||
wallpaper = ../../wallpapers/river-3840.png;
|
wallpaper = ../../wallpapers/river-3840.png;
|
||||||
output = {
|
|
||||||
"DP-1" = {
|
|
||||||
bg = "${../../wallpapers/river-3840.png} fill";
|
|
||||||
mode = "3840x2160@60Hz";
|
|
||||||
position = "0 0";
|
|
||||||
};
|
|
||||||
"DP-3" = {
|
|
||||||
bg = "${../../wallpapers/river-3840.png} fill";
|
|
||||||
mode = "3840x2160@60Hz";
|
|
||||||
position = "3840 0";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
input = {
|
|
||||||
"1241:662:USB-HID_Keyboard" = {
|
|
||||||
xkb_layout = "us,us";
|
|
||||||
xkb_variant = "colemak,";
|
|
||||||
xkb_options = "lv3:ralt_switch,eurosign:5,caps:backspace,ctrl:nocaps,grp:sclk_toggle,grp_led:scroll";
|
|
||||||
xkb_numlock = "enabled";
|
|
||||||
};
|
|
||||||
"1133:49257:Logitech_USB_Laser_Mouse" = {
|
|
||||||
natural_scroll = "enabled";
|
|
||||||
pointer_accel = "1";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
kanata = {
|
kanata = {
|
||||||
enable = false;
|
enable = false;
|
||||||
|
@ -346,15 +320,11 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
sops = {
|
# sops = {
|
||||||
defaultSopsFile = ./secrets.yaml;
|
# defaultSopsFile = ./secrets.yaml;
|
||||||
|
|
||||||
secrets = {
|
# secrets = {};
|
||||||
outline-keycloak-secret = {
|
# };
|
||||||
owner = "outline";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
|
|
|
@ -23,15 +23,6 @@ with lib; let
|
||||||
'';
|
'';
|
||||||
|
|
||||||
envVars = concatStringsSep " " (builtins.attrNames config.environment.sessionVariables);
|
envVars = concatStringsSep " " (builtins.attrNames config.environment.sessionVariables);
|
||||||
|
|
||||||
moduleStr = moduleType: name: attrs: ''
|
|
||||||
${moduleType} "${name}" {
|
|
||||||
${builtins.concatStringsSep "\n" (lib.mapAttrsToList (name: value: "${name} ${value}") attrs)}
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
|
|
||||||
inputStr = moduleStr "input";
|
|
||||||
outputStr = moduleStr "output";
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.eboskma.greetd = {
|
options.eboskma.greetd = {
|
||||||
|
@ -39,16 +30,6 @@ in
|
||||||
sway = mkEnableOption "sway";
|
sway = mkEnableOption "sway";
|
||||||
steam = mkEnableOption "steam";
|
steam = mkEnableOption "steam";
|
||||||
wayvnc = mkEnableOption "wayvnc";
|
wayvnc = mkEnableOption "wayvnc";
|
||||||
output = mkOption {
|
|
||||||
description = "An attribute set that defines output modules. See the sway-output(5) manpage for options";
|
|
||||||
type = types.attrsOf (types.attrsOf types.str);
|
|
||||||
default = { };
|
|
||||||
};
|
|
||||||
input = mkOption {
|
|
||||||
description = "An attribute set that defines input modules. See the sway-input(5) manpage for options";
|
|
||||||
type = types.attrsOf (types.attrsOf types.str);
|
|
||||||
default = { };
|
|
||||||
};
|
|
||||||
wallpaper = mkOption {
|
wallpaper = mkOption {
|
||||||
description = "Path to an image to use as wallpaper";
|
description = "Path to an image to use as wallpaper";
|
||||||
type = types.path;
|
type = types.path;
|
||||||
|
@ -109,9 +90,7 @@ in
|
||||||
exec "${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -s /etc/greetd/gtkgreet.css -b ${cfg.wallpaper}; swaymsg exit"
|
exec "${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -s /etc/greetd/gtkgreet.css -b ${cfg.wallpaper}; swaymsg exit"
|
||||||
include /etc/sway/config.d/*
|
include /etc/sway/config.d/*
|
||||||
''
|
''
|
||||||
]
|
]);
|
||||||
++ (mapAttrsToList inputStr cfg.input)
|
|
||||||
++ (mapAttrsToList outputStr cfg.output));
|
|
||||||
user = "greeter";
|
user = "greeter";
|
||||||
group = "greeter";
|
group = "greeter";
|
||||||
};
|
};
|
||||||
|
|
|
@ -163,7 +163,7 @@ in
|
||||||
"1241:662:USB-HID_Keyboard" = {
|
"1241:662:USB-HID_Keyboard" = {
|
||||||
xkb_layout = "us,us";
|
xkb_layout = "us,us";
|
||||||
xkb_variant = "colemak,";
|
xkb_variant = "colemak,";
|
||||||
xkb_options = "lv3:ralt_switch,eurosign:5,caps:backspace,ctrl:nocaps,grp:sclk_toggle,grp_led:scroll";
|
xkb_options = "lv3:ralt_switch,eurosign:5,caps:backspace,ctrl:nocaps";
|
||||||
xkb_numlock = "enabled";
|
xkb_numlock = "enabled";
|
||||||
};
|
};
|
||||||
"1133:49257:Logitech_USB_Laser_Mouse" = {
|
"1133:49257:Logitech_USB_Laser_Mouse" = {
|
||||||
|
|
Loading…
Reference in a new issue