diff options
Diffstat (limited to 'modules/user')
| -rw-r--r-- | modules/user/aszlig/profiles/base.nix | 4 | ||||
| -rw-r--r-- | modules/user/aszlig/profiles/workstation/default.nix | 56 |
2 files changed, 29 insertions, 31 deletions
diff --git a/modules/user/aszlig/profiles/base.nix b/modules/user/aszlig/profiles/base.nix index 5cdfe579..02ca52bc 100644 --- a/modules/user/aszlig/profiles/base.nix +++ b/modules/user/aszlig/profiles/base.nix @@ -36,8 +36,8 @@ in { networking.useNetworkd = true; networking.useDHCP = false; - services.xserver.layout = "us"; - services.xserver.xkbVariant = "dvorak"; + services.xserver.xkb.layout = "us"; + services.xserver.xkb.variant = "dvorak"; console.useXkbConfig = true; console.font = "lat9w-16"; diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix index 55d56526..cd669ff0 100644 --- a/modules/user/aszlig/profiles/workstation/default.nix +++ b/modules/user/aszlig/profiles/workstation/default.nix @@ -63,7 +63,7 @@ in { fontDir.enable = true; enableGhostscriptFonts = true; fontconfig.useEmbeddedBitmaps = true; - fonts = lib.singleton pkgs.ultimate-oldschool-pc-font-pack; + packages = lib.singleton pkgs.ultimate-oldschool-pc-font-pack; }; vuizvui.user.aszlig.services.i3.enable = true; @@ -176,35 +176,33 @@ in { brightness.night = "0.5"; }; - xserver = { - enable = true; + xserver.enable = true; + xserver.displayManager.lightdm.enable = true; + xserver.displayManager.sessionCommands = '' + ${pkgs.xorg.xrdb}/bin/xrdb "${pkgs.writeText "xrdb.config" '' + XTerm*termName: xterm-direct + XTerm*directColor: true + XTerm*faceName: MxPlus IBM VGA 8x16 + XTerm*faceSize: 12 + XTerm*renderFont: true + XTerm*saveLines: 10000 + XTerm*bellIsUrgent: true + XTerm*background: black + XTerm*foreground: grey + + XTerm*backarrowKeyIsErase: true + XTerm*ptyInitialErase: true + ''}" + ''; - displayManager = { - lightdm.enable = true; - defaultSession = "none+i3"; - sessionCommands = '' - ${pkgs.xorg.xrdb}/bin/xrdb "${pkgs.writeText "xrdb.config" '' - XTerm*termName: xterm-direct - XTerm*directColor: true - XTerm*faceName: MxPlus IBM VGA 8x16 - XTerm*faceSize: 12 - XTerm*renderFont: true - XTerm*saveLines: 10000 - XTerm*bellIsUrgent: true - XTerm*background: black - XTerm*foreground: grey - - XTerm*backarrowKeyIsErase: true - XTerm*ptyInitialErase: true - ''}" - ''; - } // lib.optionalAttrs (config.boot.initrd.luks.devices != {}) { - # All of my workstations are single-user machines with encrypted root - # and swap, so there is no need to prompt another time for a password - # or passphrase. - autoLogin.enable = true; - autoLogin.user = "aszlig"; - }; + displayManager = { + defaultSession = "none+i3"; + } // lib.optionalAttrs (config.boot.initrd.luks.devices != {}) { + # All of my workstations are single-user machines with encrypted root + # and swap, so there is no need to prompt another time for a password + # or passphrase. + autoLogin.enable = true; + autoLogin.user = "aszlig"; }; }; |