diff options
| -rw-r--r-- | modules/core/tests.nix | 3 | ||||
| -rw-r--r-- | modules/module-list.nix | 1 | ||||
| -rw-r--r-- | modules/user/aszlig/profiles/workstation/default.nix | 2 | ||||
| -rw-r--r-- | modules/user/aszlig/services/slim/default.nix | 45 |
4 files changed, 1 insertions, 50 deletions
diff --git a/modules/core/tests.nix b/modules/core/tests.nix index dbf2e94b..8e3c6573 100644 --- a/modules/core/tests.nix +++ b/modules/core/tests.nix @@ -504,9 +504,6 @@ let { check = true; path = ["nixos" "simple"]; } - { check = config.services.xserver.displayManager.slim.enable; - path = ["nixos" "slim"]; - } { check = config.services.snapper.configs != {}; path = ["nixos" "snapper"]; } diff --git a/modules/module-list.nix b/modules/module-list.nix index df539e6e..d5de7026 100644 --- a/modules/module-list.nix +++ b/modules/module-list.nix @@ -24,7 +24,6 @@ ./user/aszlig/programs/taskwarrior ./user/aszlig/programs/zsh ./user/aszlig/services/i3 - ./user/aszlig/services/slim ./user/aszlig/services/vlock ./user/devhell/profiles/base.nix ./user/devhell/profiles/packages.nix diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix index ec195727..ce2e661c 100644 --- a/modules/user/aszlig/profiles/workstation/default.nix +++ b/modules/user/aszlig/profiles/workstation/default.nix @@ -60,7 +60,6 @@ in { }; vuizvui.user.aszlig.services.i3.enable = true; - vuizvui.user.aszlig.services.slim.enable = true; vuizvui.user.aszlig.services.vlock.enable = true; vuizvui.user.aszlig.services.vlock.user = "aszlig"; @@ -160,6 +159,7 @@ in { enable = true; layout = "dvorak"; + displayManager.lightdm.enable = true; displayManager.sessionCommands = '' ${pkgs.xorg.xrdb}/bin/xrdb "${pkgs.writeText "xrdb.config" '' XTerm*font: vga diff --git a/modules/user/aszlig/services/slim/default.nix b/modules/user/aszlig/services/slim/default.nix deleted file mode 100644 index 6e61912a..00000000 --- a/modules/user/aszlig/services/slim/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ pkgs, config, lib, ... }: - -with lib; - -let - cfg = config.vuizvui.user.aszlig.services.slim; - randrHeads = config.services.xserver.xrandrHeads; -in { - options.vuizvui.user.aszlig.services.slim = { - enable = mkEnableOption "Vuizvui SLiM"; - }; - - config.services.xserver.displayManager.slim = mkIf cfg.enable { - enable = true; - theme = pkgs.stdenv.mkDerivation { - name = "nixos-theme-vuizvui"; - src = pkgs.slimThemes.nixosSlim; - phases = [ "unpackPhase" "patchPhase" "installPhase" ]; - patchPhase = let - headFactor = if randrHeads == [] then 1 else lib.length randrHeads; - centerLeft = 100 / (headFactor * 2); - in '' - "${pkgs.imagemagick.out}/bin/mogrify" \ - -fill '#080010' -draw 'color 0,0 reset' \ - share/slim/themes/nixos-slim-testing/background.png - "${pkgs.imagemagick.out}/bin/mogrify" \ - -negate -region 100x110+0+0 -negate -fill white -colorize 20% \ - share/slim/themes/nixos-slim-testing/panel.png - sed -i \ - -e 's/^\([a-z_]\+_x[^0-9]*\)[0-9]\+%/\1${toString centerLeft}%/' \ - share/slim/themes/nixos-slim-testing/slim.theme - cat >> share/slim/themes/nixos-slim-testing/slim.theme <<EOF - session_x ${toString centerLeft}% - msg_color #ffffff - username_color #ffffff - password_color #ffffff - input_color #ffffff - EOF - ''; - installPhase = '' - cp -R share/slim/themes/nixos-slim-testing "$out" - ''; - }; - }; -} |