Fix typo

Flake lock file updates:

• Added input 'flake-utils':
    'github:numtide/flake-utils/cfacdce06f30d2b68473a46042957675eebb3401' (2023-04-11)
• Added input 'flake-utils/systems':
    'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09)
• Added input 'flake-utils-plus':
    'github:gytis-ivaskevicius/flake-utils-plus/2bf0f91643c2e5ae38c1b26893ac2927ac9bd82a' (2022-07-07)
• Added input 'flake-utils-plus/flake-utils':
    'github:numtide/flake-utils/3cecb5b042f7f209c56ffd8371b2711a290ec797' (2022-02-07)
• Added input 'nixpkgs':
    'github:NixOS/nixpkgs/7629f9b0680d87c7775f3261bee746da5dac76d1' (2023-05-08)
• Added input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/897876e4c484f1e8f92009fd11b7d988a121a4e7' (2023-05-06)

flake.lock

@@ -71,11 +71,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1681356623,
+        "lastModified": 1683604309,
-        "narHash": "sha256-8rt3tRE/t9EeC7V9A6MSwWpT4YkFiFxSscC2C8vV33Q=",
+        "narHash": "sha256-o+ii3SdNh7VITaEkL1+l8phiktwk5ADNIHAkC4iA12w=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "29271109bf6fb83f60b2b512e88ced787ca49994",
+        "rev": "6fe1b6ed8880aa6631be652b9c7eac98bca7307f",
         "type": "github"
       },
       "original": {
@@ -229,11 +229,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1680876084,
+        "lastModified": 1683269598,
-        "narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=",
+        "narHash": "sha256-KNsb+nBbB1Fmxd07dt4E0KXMT4YeKJB7gQaA6Xfk+mo=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2",
+        "rev": "51559e691f1493a26f94f1df1aaf516bb507e78b",
         "type": "github"
       },
       "original": {
@@ -292,11 +292,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1681005198,
+        "lastModified": 1683504292,
-        "narHash": "sha256-5LrnBeXR7Hv8OXh6eany7br4qBW+ZNl4LKf1CJu9zbg=",
+        "narHash": "sha256-jlZbBIKGa6IMGkcJkQ08pbKnouTAPfeq1fD5I7l/rBw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e45cc0138829ad86e7ff17a76acf2d05e781e30a",
+        "rev": "ba0086c178d4ed60a7899f739caea553eca2e046",
         "type": "github"
       },
       "original": {
@@ -308,11 +308,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1681303793,
+        "lastModified": 1683408522,
-        "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=",
+        "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc",
+        "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
         "type": "github"
       },
       "original": {
@@ -324,11 +324,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1681269223,
+        "lastModified": 1683546353,
-        "narHash": "sha256-i6OeI2f7qGvmLfD07l1Az5iBL+bFeP0RHixisWtpUGo=",
+        "narHash": "sha256-zEfx6q4fXK5wq+RCsyM0FyWBKNNhHTKMpCWkEpKDe2g=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "87edbd74246ccdfa64503f334ed86fa04010bab9",
+        "rev": "7629f9b0680d87c7775f3261bee746da5dac76d1",
         "type": "github"
       },
       "original": {
@@ -384,11 +384,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1681209176,
+        "lastModified": 1683545104,
-        "narHash": "sha256-wyQokPpkNZnsl/bVf8m1428tfA0hJ0w/qexq4EizhTc=",
+        "narHash": "sha256-48wC0zzHAej/wLFWIgV+uj63AvQ2UUk85g7wmXJzTqk=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "00d5fd73756d424de5263b92235563bc06f2c6e1",
+        "rev": "36b062a2c85a0efb37de1300c79c54602a094fab",
         "type": "github"
       },
       "original": {

flake.nix

@@ -156,6 +156,13 @@
           sops-nix = inputs.sops-nix.packages."${channels.nixpkgs.system}";
         };
         formatter = channels.nixpkgs.alejandra;
+        apps = {
+          emacs = flake-utils-plus.lib.mkApp {
+            drv =
+              self.nixosConfigurations.stel-xps.config.services.emacs.package;
+            exePath = "/bin/emacs";
+          };
+        };
       };
 
       templates = discoverTemplates ./templates {

machines/nucturne/default.nix

@@ -19,9 +19,9 @@
     # enable X11 with lightdm and i3
     graphical = {
       enable = true;
-      sway.enable = false;
+      sway.enable = true;
       i3.enable = false;
-      plasma.enable = true;
+      plasma.enable = false;
       # set dpi if used in mobile applications
       #      dpi = 180;
     };

machines/stel-xps/default.nix

@@ -25,10 +25,9 @@
     # enable X11 with lightdm and i3
     graphical = {
       enable = true;
-      sway.enable = false;
+      sway.enable = true;
       i3.enable = false;
       plasma.enable = false;
-      xmonad.enable = true;
       # set dpi if used in mobile applications
       #      dpi = 180;
     };

modules/emacs/default.el

@@ -386,6 +386,9 @@
 ;;(add-hook 'rustic-mode-hook 'company-mode)
 ;;(add-hook 'rustic-mode-hook 'flymake-mode)
 
+(use-package rust-mode
+  :after lsp-mode rust-mode)
+
 (use-package rustic
   :after lsp-mode
   :config
@@ -393,18 +396,23 @@
   (lsp-diagnostics-flycheck-enable)
   (push 'rustic-clippy flycheck-checkers)
   ;;  (flycheck-add-next-checker 'lsp 'rustic-clippy)
+  :mode ("\\.rs\\'" . rustic-mode)
   :custom
-  (rustic-format-trigger 'on-save)
+;  (rustic-format-trigger 'on-save)
-  (rustic-rustfmt-bin "rustfmt")
   (rustic-flycheck-clippy-params "--message-format=json")
   (lsp-rust-analyzer-server-display-inlay-hints t)
+  (lsp-inlay-hint-enable t)
   (lsp-rust-analyzer-cargo-watch-command "clippy")
   (lsp-rust-analyzer-display-parameter-hints t)
-  (lsp-rust-analyzer-dispaly-chaining-hints t)
+  (lsp-rust-analyzer-display-chaining-hints t)
+  (lsp-rust-analyzer-display-closure-return-type-hints t)
+  (lsp-rust-analyzer-display-lifetime-elision-hints-use-parameter-names t)
   (lsp-rust-analyzer-proc-macro-enable t)
+  (lsp-rust-analyzer-experimental-proc-attr-macros t)
   :hook
-  (rustic-mode . company-mode)
+  ;;(rustic-mode . company-mode)
-  (rustic . lsp-rust-analyzer-inlay-hints-mode)
+  ;;(rustic . lsp-rust-analyzer-inlay-hints-mode)
+  (rustic . apheleia-mode)
   ;;(rustic-mode . flymake-mode)
   )
 
@@ -536,7 +544,7 @@
            python-mode
            ;; ess-mode
            ;; ruby-mode
-           rust-mode
+           rustic-mode
            sql-mode
 	   rustic
            typescript-mode
@@ -558,8 +566,6 @@
   (lsp-ui-doc-border "#586e75")
   (lsp-ui-doc-header t)
   (lsp-ui-doc-include-signature t)
-  (lsp-rust-analyzer-server-display-inlay-hints t)
-  (lsp-rust-analyzer-inlay-hints-mode t)
   (lsp-rust-analyzer-cargo-watch-command "clippy")
   (lsp-keymap-prefix "C-l"))
   ;:custom-face
@@ -582,7 +588,6 @@
 (use-package haskell-font-lock
   :ensure haskell-mode)
 (use-package lsp-haskell
-  :if die-orga/workstation
   :demand t)
 (use-package shakespeare-mode)
 (use-package company-cabal

modules/emacs/default.nix

@@ -1,6 +1,10 @@
-{ config, lib, pkgs, ... }:
+{
-with lib;
+  config,
-let
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
   defaultEl = ./default.el;
   environment.systemPackages = [pkgs.gdb]; # use gdb for dap-mode
   localsettings = pkgs.writeText "local-settings.el" ''
@@ -14,8 +18,7 @@ let
     cp ${defaultEl} $out/share/emacs/site-lisp/default.el
     cp ${localsettings} $out/share/emacs/site-lisp/local-settings.el
   '';
-  emacsPackage = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs:
+  emacsPackage = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: let
-    let
     lpkgs = import ./packages.nix {inherit config lib pkgs epkgs;};
     #[ (defaultConfig lpkgs) ] ++ (with pkgs; [
     #  aspell
@@ -23,9 +26,11 @@ let
     #  gnupg
     #  nixpkgs-fmt
     #])
-    in [ defaultConfig ]
+  in
+    [defaultConfig]
     ++ [(with epkgs.elpaPackages; [auctex org flymake])]
-    ++ (with epkgs.melpaStablePackages; [ ]) ++ (with epkgs.melpaPackages;
+    ++ (with epkgs.melpaStablePackages; [])
+    ++ (with epkgs.melpaPackages;
       [
         ac-helm
         academic-phrases
@@ -51,6 +56,7 @@ let
         docker-compose-mode
         flycheck
         free-keys
+        haskell-mode
         highlight-indentation
         helm
         #helm-bbdb
@@ -62,6 +68,7 @@ let
         helm-rg
         json-mode
         less-css-mode
+        lsp-haskell
         lsp-mode
         lsp-ui
         magit
@@ -87,7 +94,8 @@ let
         yaml-mode
         yasnippet
         #zenburn-theme
-      ] ++ (with lpkgs; [ org-roam-ui ligatures ])));
+      ]
+      ++ (with lpkgs; [org-roam-ui ligatures])));
 in {
   options.elss.programs.emacs.enable =
     mkEnableOption "Setup emacs package and install it";

modules/graphical.nix

@@ -21,8 +21,12 @@ with lib; {
         DPI setting for the xserver
       '';
     };
+    xserver.enable = mkEnableOption "enable X server";
+    xmonad = {
+      enable = mkEnableOption "enable xmonad";
+      polybar.enable = mkEnableOption "enable Polybar for xmonad";
+    };
     i3.enable = mkEnableOption "enable i3";
-    xmonad.enable = mkEnableOption "Use xmonad";
   };
   config = let
     cfg = config.elss.graphical;
@@ -40,21 +44,20 @@ with lib; {
     };
   in
     mkIf cfg.enable {
-      elss.users.x11.enable =
+      #      cfg.xserver.enable = cfg.i3.enable;
-        if cfg.i3.enable || cfg.xmonad.enable
+      elss.users.x11.enable = cfg.xserver.enable || cfg.xmonad.enable;
-        then true
+
-        else false;
       elss.networking.useNetworkManager = true;
 
       services = {
-        xserver = mkIf cfg.i3.enable {
+        xserver = mkIf cfg.xserver.enable {
           enable = true;
           dpi = cfg.dpi;
           displayManager.lightdm = {
             enable = true;
             greeters.gtk.cursorTheme.size = cfg.greeterCursorsize;
           };
-          windowManager.i3 = {
+          windowManager.i3 = mkIf cfg.i3.enable {
             enable = true;
             extraPackages = with pkgs; [
               rofi # launcher
@@ -75,8 +78,6 @@ with lib; {
         printing.enable = true;
       };
 
-      security.pam.services.lightdm.enableGnomeKeyring = true;
-
       sound.enable = true;
 
       hardware = {
@@ -84,6 +85,8 @@ with lib; {
         bluetooth.enable = true;
       };
 
+      security.pam.services.lightdm.enableGnomeKeyring = true;
+
       services.blueman.enable = true;
 
       environment.systemPackages = with pkgs; [

modules/users.nix

@@ -11,6 +11,8 @@ with lib; {
 
     x11.enable = mkEnableOption "Activate XSession related options in user-configs";
 
+    dunst.enable = mkEnableOption "Activate Dunst";
+
     users = mkOption {
       description = "logins of non-admin users to configure";
       type = types.listOf types.str;

modules/xmonad.nix

@@ -9,17 +9,23 @@ with lib; {
     cfg = config.elss.graphical.xmonad;
   in
     mkIf cfg.enable {
+      elss.graphical.xserver.enable = true;
+      elss.users.dunst.enable = true;
+      elss.graphical.xmonad.polybar.enable = true;
       services = {
         xserver = {
+          startDbusSession = true;
+          windowManager.xmonad = {
             enable = true;
-          windowManager.xmonad.enable = true;
+            enableContribAndExtras = true;
-          layout = "us";
-          xkbOptions = "eurosign:e";
           };
-        gnome.gnome-keyring.enable = true;
+          displayManager.defaultSession = "none+xmonad";
-
+          libinput = {
-        printing.enable = true;
+            enable = true;
+            disableWhileTyping = true;
+          };
+        };
+        upower.enable = true;
       };
-      security.pam.services.lightdm.enableGnomeKeyring = true;
     };
 }

users/ellmau/conf/rofi/theme.rafi

@@ -0,0 +1,195 @@
+/**
+ * official theme arthur.rasi
+ * ROFI Color theme
+ * User: Qball
+ * Copyright: Dave Davenport
+ */
+
+configuration {
+
+    // The display name of this browser
+    display-ssh:                   "  ";
+    // The display name of this browser
+    display-run:                    "";
+    // The display name of this browser
+    display-drun:                   "";
+    // The display name of this browser
+    display-window:                 "";
+    display-combi:                  "";
+    show-icons: true;
+}
+
+
+/**
+ * User: Qball
+ * Copyright: Dave Davenport
+ */
+* {
+    foreground:  #ffeedd;
+    backlight:   #ccffeedd;
+    background-color:  transparent;
+    dark: #1c1c1c;
+    // Black
+    black:       #3d352a;
+    lightblack:  #554444;
+    tlightblack:  #554444cc;
+    //
+    // Red
+    red:         #cd5c5c;
+    lightred:    #cc5533;
+    //
+    // Green
+    green:       #86af80;
+    lightgreen:  #88cc22;
+    //
+    // Yellow
+    yellow:      #e8ae5b;
+    lightyellow:     #ffa75d;
+    //
+    // Blue
+    blue:      #6495ed;
+    lightblue:     #87ceeb;
+    //
+    // Magenta
+    magenta:      #deb887;
+    lightmagenta:     #996600;
+    //
+    // Cyan
+    cyan:      #b0c4de;
+    tcyan:      #ccb0c4de;
+    lightcyan:     #b0c4de;
+    //
+    // White
+    white:      #bbaa99;
+    lightwhite:     #ddccbb;
+    //
+    // Bold, Italic, Underline
+    highlight:     underline bold #ffffff;
+
+    transparent: rgba(0,0,0,0);
+    font: "Source Code Pro 10";
+}
+#window {
+    location: center;
+    anchor:   center;
+    transparency: "screenshot";
+    padding: 10px;
+    border:  0px;
+    border-radius: 10px;
+    color: @magenta;
+    background-color: @transparent;
+    spacing: 0;
+    children:  [mainbox];
+    orientation: horizontal;
+}
+
+#mainbox {
+    spacing: 0;
+    children: [ inputbar, message, listview ];
+}
+
+#message {
+    border-color: @foreground;
+    border:  0px 2px 2px 2px;
+//    border-radius: 10px;
+    padding: 5;
+    background-color: @tcyan;
+}
+#message {
+    font: "Source Code Pro 8";
+    color: @black;
+}
+
+#inputbar {
+    color: @lightgreen;
+    padding: 11px;
+    background-color: @tlightblack;
+    border: 2px 2px 2px 2px;
+    border-radius:  15px 15px 0px 0px;
+    border-color: @foreground;
+    font: "Source Code Pro 18";
+}
+#entry,prompt,case-indicator {
+    text-font: inherit;
+    text-color:inherit;
+}
+#prompt {
+    margin:     0px 0.3em 0em 0em ;
+}
+#listview {
+    padding: 8px;
+    border-radius: 0px 0px 15px 15px;
+    border-color: @foreground;
+    border: 0px 2px 2px 2px;
+    background-color: #1c1c1ccc;
+    dynamic: false;
+    lines: 10;
+}
+#element {
+    padding: 3px;
+    vertical-align: 0.5;
+//    border: 2px;
+    border-radius: 4px;
+    background-color: transparent;
+    color: @foreground;
+    font:inherit;
+}
+#element selected.normal {
+    background-color: @blue;
+}
+#element normal active {
+    foreground: @lightblue;
+}
+#element normal urgent {
+    foreground: @lightred;
+}
+#element alternate normal {
+}
+#element alternate active {
+    foreground: @lightblue;
+}
+#element alternate urgent {
+    foreground: @lightred;
+}
+#element selected active {
+    background-color: @lightblue;
+    foreground: @dark;
+}
+#element selected urgent {
+    background-color: @lightred;
+    foreground: @dark;
+}
+#element normal normal {
+
+}
+
+#vertb {
+    expand: false;
+    children: [ dummy0, mode-switcher, dummy1  ];
+}
+#dummy0,  dummy1 {
+    expand: true;
+}
+
+#mode-switcher {
+    expand: false;
+    orientation: vertical;
+    spacing: 0px;
+    border: 0px 0px 0px 0px;
+}
+#button {
+    font: "FontAwesome 22";
+    padding: 6px;
+    border: 2px 0px 2px 2px;
+    border-radius: 4px 0px 0px 4px;
+    background-color: @tlightblack;
+    border-color: @foreground;
+    color: @foreground;
+    horizontal-align: 0.5;
+}
+#button selected normal {
+    color: @dark;
+    border: 2px 0px 2px 2px;
+    background-color: @backlight;
+    border-color: @foreground;
+}

users/ellmau/conf/xmonad/flake.lock

@@ -53,11 +53,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1681269223,
+        "lastModified": 1683546353,
-        "narHash": "sha256-i6OeI2f7qGvmLfD07l1Az5iBL+bFeP0RHixisWtpUGo=",
+        "narHash": "sha256-zEfx6q4fXK5wq+RCsyM0FyWBKNNhHTKMpCWkEpKDe2g=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "87edbd74246ccdfa64503f334ed86fa04010bab9",
+        "rev": "7629f9b0680d87c7775f3261bee746da5dac76d1",
         "type": "github"
       },
       "original": {
@@ -69,11 +69,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1681303793,
+        "lastModified": 1683408522,
-        "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=",
+        "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc",
+        "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
         "type": "github"
       },
       "original": {

users/ellmau/default.nix

@@ -14,8 +14,8 @@
     ./kanshi.nix
     ./mako.nix
     ./nextcloud.nix
-    ./polybar.nix
+    ./polybar_i3.nix
-    ./xmonad.nix
+    ./polybar_xmonad.nix
     ./zsh.nix
 
     ./sway.nix

users/ellmau/dunst.nix

@@ -7,7 +7,7 @@
 }:
 with lib; {
   config = let
-    cfg = nixosConfig.elss.graphical.i3;
+    cfg = nixosConfig.elss.users.dunst;
   in
     mkIf cfg.enable {
       services.dunst = {

users/ellmau/polybar_i3.nix

@@ -7,14 +7,7 @@
 }:
 with lib; {
   config = let
-    cfg = nixosConfig.elss.graphical.xmonad;
+    cfg = nixosConfig.elss.graphical.i3;
-    xmonad = ''
-      [module/xmonad]
-      type = custom/script
-      exec = ${pkgs.xmonad-log}/bin/xmonad-log
-
-      tail = true
-    '';
   in
     mkIf cfg.enable {
       services.polybar = {
@@ -364,7 +357,6 @@ with lib; {
             MONITOR=$m polybar --reload aux &
           done;
         '';
-        extraConfig = xmonad;
       };
     };
 }

users/ellmau/polybar_xmonad.nix

@@ -0,0 +1,216 @@
+{
+  config,
+  pkgs,
+  lib,
+  nixosConfig,
+  ...
+}:
+with lib; {
+  config = let
+    cfg = nixosConfig.elss.graphical.xmonad.polybar;
+  in
+    mkIf cfg.enable {
+      services.polybar = {
+        enable = true;
+        package = pkgs.polybarFull;
+        settings = let
+          fonts = [
+            "Hasklig:style=Regular"
+            "all-the-icons:style=Regular"
+            "Webdings:style=Regular"
+            "Noto Emoji:scale=10"
+            "Unifont:style=Regular"
+            "Material Icons:size=12;0"
+            "Weather Icons:size=12;0"
+            "Hasklug Nerd Font,Hasklig Medium:style=Medium,Regular"
+          ];
+        in {
+          "bar/main" = {
+            font = fonts;
+            modules = {
+              left = "xmonad";
+              center = "";
+              right = "xbacklight xkeyboard eth wlan battery date powermenu dunst volume ";
+            };
+            tray = {
+              position = "right";
+              padding = 2;
+            };
+
+            monitor = ''
+              ''${env:MONITOR:}
+            '';
+          };
+
+          "bar/aux" = {
+            font = fonts;
+            modules = {
+              left = "xmonad";
+              center = "";
+              right = " xbacklight xkeyboard eth wlan battery date powermenu volume ";
+            };
+            monitor = ''
+              ''${env:MONITOR:}
+            '';
+          };
+
+          "module/xmonad" = {
+            type = "custom/script";
+            exec = "${pkgs.xmonad-log} /bin/xmonad-log";
+            tail = true;
+          };
+          "module/xkeyboard" = {
+            type = "internal/xkeyboard";
+            blacklist-0 = "num lock";
+            interval = "5";
+
+            format-prefix = ''""'';
+            label-layout = "%layout%";
+
+            label-indicator-padding = "2";
+            label-indicator-margin = "1";
+          };
+          "module/wlan" = {
+            type = "internal/network";
+            interface = "wlp0s20f3";
+            interval = "3.0";
+
+            format-connected = " <ramp-signal> <label-connected>";
+            format-connected-underline = "#9f78e1";
+            label-connected = "%essid%";
+
+            ramp-signal-0 = ''"0.0"'';
+            ramp-signal-1 = ''"0.5"'';
+            ramp-signal-2 = ''"1.0"'';
+            ramp-signal-3 = ''"1.0"'';
+            ramp-signal-4 = ''"1.0"'';
+
+            format-disconnected = "";
+            # ;format-disconnected = <label-disconnected>
+            #;format-disconnected-underline = ${self.format-connected-underline}
+            #;label-disconnected = %ifname% disconnected
+            #;label-disconnected-foreground = ${colors.foreground-alt}
+          };
+          "module/eth" = {
+            type = "internal/network";
+            interface = "eno1";
+            interval = "3.0";
+
+            format-connected-underline = "#55aa55";
+            format-connected = " <label-connected>";
+            label-connected = "%local_ip%";
+
+            format-disconnected = "";
+            format-disconnected-background = "#5479b7";
+            #;format-disconnected = <label-disconnected>
+            #;format-disconnected-underline = ${self.format-connected-underline}
+            #;label-disconnected = %ifname% disconnected
+            #;label-disconnected-foreground = ${colors.foreground-alt}
+          };
+          "module/date" = {
+            type = "internal/date";
+            interval = "5";
+
+            date = ''" %Y-%m-%d"'';
+            date-alt = ''" %Y-%m-%d"'';
+
+            time = "%H:%M";
+            time-alt = "%H:%M:%S";
+
+            #format-prefix = "";
+            #format-prefix-foreground = foreground_altcol;
+            format-underline = "#0a6cf5";
+
+            label = "%{A} %date% %time%";
+          };
+          "module/battery" = {
+            type = "internal/battery";
+            battery = "BAT0";
+            adapter = "ADP1";
+            full-at = "98";
+
+            format-charging-background = "#689d6a";
+            format-charging-prefix = ''" "'';
+            format-charging = "<label-charging>";
+            format-discharging-prefix = ''" "'';
+            format-discharging = "<label-discharging>";
+            format-discharging-background = "#689d6a";
+            format-full-prefix = ''" "'';
+
+            format-charging-underline = "#ffaa55";
+            format-full-underline = "#ffaa55";
+
+            ormat-full-padding = "1";
+            format-charging-padding = "1";
+            format-discharging-padding = "1";
+          };
+          "module/temperature" = {
+            type = "internal/temperature";
+            thermal-zone = "0";
+            warn-temperature = "60";
+
+            format = "<ramp> <label>";
+            format-underline = "#f50a4d";
+            format-warn = "<ramp> <label-warn>";
+            format-warn-underline = "#f50a4d";
+
+            label = " %temperature-c%";
+            label-warn = "%temperature-c%";
+
+            ramp-0 = "l";
+            ramp-1 = "m";
+            ramp-2 = "h";
+          };
+
+          "module/powermenu" = {
+            type = "custom/menu";
+
+            expand-right = "true";
+
+            format-spacing = "1";
+
+            label-open = ''""'';
+            label-close = " cancel";
+            label-separator = "|";
+
+            menu-0-0 = "reboot";
+            menu-0-0-exec = "menu-open-1";
+            menu-0-1 = "power off";
+            menu-0-1-exec = "menu-open-2";
+
+            menu-1-0 = "cancel";
+            menu-1-0-exec = "menu-open-0";
+            menu-1-1 = "reboot";
+            menu-1-1-exec = "sudo reboot";
+
+            menu-2-0 = "power off";
+            menu-2-0-exec = "sudo poweroff";
+            menu-2-1 = "cancel";
+            menu-2-1-exec = "menu-open-0";
+          };
+
+          "module/xbacklight" = {
+            type = "internal/xbacklight";
+
+            format = "<label> <bar>";
+            label = "BL";
+          };
+
+          "module/dunst" = {
+            type = "custom/script";
+            exec = "PATH=${pkgs.dbus}/bin/:$PATH ${pkgs.dunst}/bin/dunstctl is-paused | ${pkgs.gnugrep}/bin/grep -q true && echo   || echo  ";
+            interval = 10;
+            click-left = "PATH=${pkgs.dbus}/bin/:$PATH ${pkgs.dunst}/bin/dunstctl set-paused toggle";
+          };
+        };
+        script = ''
+          for m in $(polybar --list-monitors | ${pkgs.gnugrep}/bin/grep '(primary)' | ${pkgs.coreutils}/bin/cut -d":" -f1); do
+            MONITOR=$m polybar --reload main &
+          done;
+          for m in $(polybar --list-monitors | ${pkgs.gnugrep}/bin/grep -v '(primary)' | ${pkgs.coreutils}/bin/cut -d":" -f1); do
+            MONITOR=$m polybar --reload aux &
+          done;
+        '';
+      };
+    };
+}

users/ellmau/rofi.nix

@@ -0,0 +1,19 @@
+{
+  config,
+  pkgs,
+  lib,
+  nixosConfig,
+  ...
+}:
+with lib; {
+  config = let
+    cfg = nixosConfig.elss.graphical.xmonad;
+  in
+    mkIf cfg.enable {
+      programs.rofi = {
+        enable = true;
+        terminal = ${pkgs.alacritty} /bin/alacritty;
+        #theme = conf/rofi/theme.rafi;
+      };
+    };
+}

users/ellmau/xmonad.nix

@@ -11,17 +11,26 @@ with lib; {
   in
     mkIf cfg.enable {
       xsession = {
-        enable = true;
-
         windowManager.xmonad = {
           enable = true;
           enableContribAndExtras = true;
-          extraPackages = haskellPackages: [
+          enablePackages = hp: [
-            haskellPackages.dbus
+            hp.dbus
-            haskellPackages.monad-logger
+            hp.monad-logger
-            haskellPackages.hostname
+            hp.xmonad-contrib
           ];
-          config = mkDefault conf/xmonad/xmonad.hs;
+          config = conf/xmonad/xmonad.hs;
+        };
+      };
+
+      services = {
+        betterlockscreen = {
+          enable = true;
+          inactiveInterval = 10;
+        };
+        picom = {
+          enable = true;
+          backend = "glx";
         };
       };
     };