move some files around

flake.nix

@@ -31,7 +31,7 @@
         };
         system = "x86_64-linux";
         modules = [
-          ./monosodium-glutamate-g/configuration.nix
+          ./hosts/monosodium-glutamate-g/configuration.nix
           home-manager.nixosModules.home-manager {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
@@ -49,7 +49,7 @@
         system = "x86_64-linux";
         modules = [
           "${mac-brcm-fw}"
-          ./potatobook-g/configuration.nix
+          ./hosts/potatobook-g/configuration.nix
           home-manager.nixosModules.home-manager {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
@@ -67,7 +67,7 @@
         };
         system = "x86_64-linux";
         modules = [
-          ./schrottserver/configuration.nix
+          ./hosts/schrottserver/configuration.nix
           home-manager.nixosModules.home-manager {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;

haskell/xmonad/xmonad.hs

@@ -271,7 +271,7 @@ defaults = def
     , keys               = myKeys
 	, mouseBindings      = myMouseBindings
       -- hooks, layouts
-	, layoutHook         = myLayout
+	, layoutHook         = spacingRaw True (Border 0 10 10 10) True (Border 10 10 10 10) True $ myLayout
 	, manageHook         = myManageHook
 	, handleEventHook    = myEventHook
 	, logHook            = myLogHook

hosts/monosodium-glutamate-g/configuration.nix

@@ -6,8 +6,8 @@
 {
   imports = [
       ./hardware-configuration.nix
-      ../common.nix
+      ../../common.nix
-      ../modules
+      ../../modules
   ];
 
   #nixpkgs = {

hosts/potatobook-g/configuration.nix

@@ -12,8 +12,8 @@
       # ./t2.nix
       # "${builtins.fetchGit { url = "https://github.com/kekrby/nixos-hardware.git"; }}/apple/t2"
       ./hardware-configuration.nix
-      ../common.nix
+      ../../common.nix
-      ../modules
+      ../../modules
       #inputs.mms.module
   ];
 

hosts/schrottserver/configuration.nix

@@ -8,15 +8,15 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ../common.nix
+      ../../common.nix
       ./proxy.nix
       ./vaultwarden.nix
       ./nextcloud.nix
       ./mumble.nix
       ./microbin.nix
-      ../modules/neovim.nix
+      ../../modules/neovim.nix
-      ../modules/zsh.nix
+      ../../modules/zsh.nix
-      ../modules/firewall.nix
+      ../../modules/firewall.nix
       #./synapse.nix
       ./penpot.nix
     ];

modules/desktop/default.nix

@@ -2,20 +2,20 @@
 
 let 
   cfg = config.jade.desktop;
-  window-screenshot = pkgs.writeShellScriptBin "window-screenshot.sh" (builtins.readFile ../../scripts/desktop/window-screenshot.sh);
+  window-screenshot = pkgs.writeShellScriptBin "window-screenshot.sh" (builtins.readFile ../../other/scripts/desktop/window-screenshot.sh);
   # desktop-ctl = pkgs.writeShellScriptBin "desktop-ctl.sh" (builtins.readFile ../scripts/desktop/desktop-ctl.sh);
-  desktop-ctl = import ../../scripts/desktop/desktopctl.nix { pkgs = pkgs; };
+  desktop-ctl = import ../../other/scripts/desktop/desktopctl.nix { inherit pkgs; };
   # search and open in browser
-  searchwolf = import ../../scripts/desktop/searchwolf.nix { pkgs = pkgs; };
+  searchwolf = import ../../other/scripts/desktop/searchwolf.nix { inherit pkgs; };
   # permaclip
-  pc-get = pkgs.writeShellScriptBin "pc-get.sh" (builtins.readFile ../../scripts/desktop/permaclip/pc-get.sh);
+  pc-get = pkgs.writeShellScriptBin "pc-get.sh" (builtins.readFile ../../other/scripts/desktop/permaclip/pc-get.sh);
-  pc-set = pkgs.writeShellScriptBin "pc-set.sh" (builtins.readFile ../../scripts/desktop/permaclip/pc-set.sh);
+  pc-set = pkgs.writeShellScriptBin "pc-set.sh" (builtins.readFile ../../other/scripts/desktop/permaclip/pc-set.sh);
-  em-record = pkgs.writeShellScriptBin "em-record.sh" (builtins.readFile ../../scripts/desktop/macros/record.sh);
+  em-record = pkgs.writeShellScriptBin "em-record.sh" (builtins.readFile ../../other/scripts/desktop/macros/record.sh);
-  em-play = pkgs.writeShellScriptBin "em-play.sh" (builtins.readFile ../../scripts/desktop/macros/play.sh);
+  em-play = pkgs.writeShellScriptBin "em-play.sh" (builtins.readFile ../../other/scripts/desktop/macros/play.sh);
-  em-play-loop = pkgs.writeShellScriptBin "em-play-loop.sh" (builtins.readFile ../../scripts/desktop/macros/play-loop.sh);
+  em-play-loop = pkgs.writeShellScriptBin "em-play-loop.sh" (builtins.readFile ../../other/scripts/desktop/macros/play-loop.sh);
-  ocr-screenshot = pkgs.writeShellScriptBin "ocr-screenshot.sh" (builtins.readFile ../../scripts/desktop/ocr-screenshot.sh);
+  ocr-screenshot = pkgs.writeShellScriptBin "ocr-screenshot.sh" (builtins.readFile ../../other/scripts/desktop/ocr-screenshot.sh);
   # rofi calculator copied from https://github.com/barbuk/menu-qalc
-  menu-qalc = pkgs.writeShellScriptBin "menu-qalc" (builtins.readFile ../../scripts/desktop/menu-qalc.sh);
+  menu-qalc = pkgs.writeShellScriptBin "menu-qalc" (builtins.readFile ../../other/scripts/desktop/menu-qalc.sh);
   #bitw = pkgs.buildGo118Module rec {
     #pname = "bitw";
     #version = "0.1.0";
@@ -138,244 +138,35 @@ in with lib; {
     home-manager.users.jade = { pkgs, ... }: {
       programs.rofi.theme = ../../other/rofi-themes/applauncher.rasi;
       home.packages = with pkgs; [
-        i3lock-fancy 
+        i3lock-fancy rofi rofimoji feh xorg.xinput dunst arandr  flameshot
-        rofi 
+        tesseract5 imagemagick xclip xmacro libwacom wacomtablet xorg.xev
-        rofimoji 
-        feh 
-        xorg.xinput 
-        dunst
-        arandr  
-        flameshot 
-        tesseract5 
-        imagemagick 
-        xclip 
-        xmacro
-        libwacom 
-        wacomtablet 
-        xorg.xev
 
         # categories
         # filemanager
-        xfce.thunar 
+        xfce.thunar xfce.tumbler xfce.thunar-archive-plugin gnome.file-roller
-        xfce.tumbler 
-        xfce.thunar-archive-plugin
-        gnome.file-roller
         # media/file viewers 
-        vlc 
+        vlc evince nomacs
-        evince
-        nomacs
 
         # from environment.systemPackages cleanup
-        font-manager 
+        font-manager xdotool xorg.xwininfo  gparted librewolf firefox uhk-agent
-        xdotool 
+        cool-retro-term xdg-desktop-portal-gtk nheko obsidian virt-manager
-        xorg.xwininfo  
+        ddccontrol-db firebird-emu  godot gitg gpick qdirstat ffmpeg_5
-        gparted
-        librewolf 
-        firefox
-        uhk-agent 
-        cool-retro-term 
-        xdg-desktop-portal-gtk 
-        nheko
-        obsidian 
-        virt-manager
-        ddccontrol-db 
-        firebird-emu  
-        godot 
-        gitg
-        gpick 
-        qdirstat 
-        ffmpeg_5
 
 
         # external
-        libnotify
+        libnotify i3lock-fancy rofi rofimoji feh xorg.xinput dunst arandr
-        i3lock-fancy 
+        flameshot tesseract5 imagemagick xclip polybar kitty xmacro
-        rofi 
+        brightnessctl drawing libqalculate ddgr jq brillo
-        rofimoji 
-        feh 
-        xorg.xinput 
-        dunst
-        arandr  
-        flameshot 
-        tesseract5 
-        imagemagick 
-        xclip 
-        polybar 
-        kitty
-        xmacro 
-        brightnessctl 
-        drawing # drwaing!
-        libqalculate # needed by menu-qalc
-        ddgr jq # needed by searchwolf
-        brillo # kb backlight
 
         # custom scripts
-        window-screenshot 
+        window-screenshot desktop-ctl em-record em-play em-play-loop
-        desktop-ctl 
+        ocr-screenshot menu-qalc pc-get pc-set searchwolf
-        em-record 
-        em-play 
-        em-play-loop 
-        ocr-screenshot 
-        menu-qalc
-        pc-get 
-        pc-set 
-        searchwolf
 
         # meow
         oneko
-
       ];
-      # i3 {{{
       xsession = {
         enable = true;
-        windowManager.i3 = {
-          enable = false;
-          config = {
-            bars = [];
-            workspaceAutoBackAndForth = true;
-            focus = {
-              followMouse = false;
-            };
-            # Startup {{{
-              startup = [
-                # wallpaper
-                { 
-                  command = "feh --bg-fill ${../../other/wallpaper.jpg}"; 
-                  always = true; 
-                  notification = false; 
-                }
-
-                # meowmeowmeow
-                { 
-                  command = "pkill oneko; oneko -tofocus  -tora -position +-1+5 -fg palevioletred3 -bg pink -name 'Rose the desktop kitty'"; 
-                  always = true; 
-                }
-              ];
-            # }}}
-            # Assigns {{{
-            assigns = {
-              "1" = [ 
-                { class = "discord"; } 
-                { class = "nheko"; } 
-              ];
-              "2" = [ 
-                { class = "librewolf"; } 
-              ];
-            };
-            # }}}
-            # Keyboard shortcuts {{{
-            modifier = "Mod4";
-            modes = {
-              resize = with {
-                # mod = builtins.break config.xsession.windowManager.i3.config.modifier;
-                mod = builtins.break "Mod4";
-              }; {
-                aaa = builtins.break "a";
-                "${mod}+h" = "resize shrink width 10 px or 10 ppt";
-                "${mod}+j" = "resize grow height 10 px or 10 ppt";
-                "${mod}+k" = "resize shrink height 10 px or 10 ppt";
-                "${mod}+l" = "resize grow width 10 px or 10 ppt";
-
-                "Return" = "mode default";
-                "Escape" = "mode default";
-                "${mod}+r" = "mode default";
-              };
-            };
-            keybindings = with {
-                 #mod = config.xsession.windowManager.i3.config.modifier;
-                 mod = "Mod4";
-            }; lib.mkOptionDefault {
-              # switch window focus
-              "${mod}+h" = "focus left";
-              "${mod}+j" = "focus down";
-              "${mod}+k" = "focus up";
-              "${mod}+l" = "focus right";
-              # move windows
-              "${mod}+Shift+h" = "move left";
-              "${mod}+Shift+j" = "move down";
-              "${mod}+Shift+k" = "move up";
-              "${mod}+Shift+l" = "move right";
-              # layout shit 
-              "${mod}+shift+semicolon" = "split h";
-              "${mod}+semicolon" =  "split v";
-              "${mod}+f" = "fullscreen toggle";
-              "${mod}+Shift+w" = "layout tabbed";
-              "${mod}+e" = "layout toggle split";
-              "${mod}+Shift+space" = "floating toggle";
-              # focus parents/children
-              "${mod}+Shift+a" = "focus parent";
-              "${mod}+Shift+c" = "focus child";
-              # screenshot
-              "${mod}+w" = "exec window-screenshot.sh";
-              "${mod}+s" = "exec flameshot gui -c -p $HOME/Pictures/screenshots";
-              "${mod}+a" = "exec flameshot screen -c -p $HOME/Pictures/screenshots";
-              "${mod}+t" = "exec ocr-screenshot.sh";
-
-              # rofi fuckery
-              "${mod}+d" = "exec --no-startup-id rofi -show drun -theme ${../../other/rofi-themes/applauncher.rasi}";
-              "${mod}+space" = "exec --no-startup-id rofi -show combi -combi-show window#run -modes combi -theme ${../../other/rofi-themes/applauncher.rasi}";
-              "${mod}+i" = "exec --no-startup-id rofimoji -f alchemical_symbols anatolian_hieroglyphs emojis braille_patterns box_drawing chess_symbols emoticons geometric_shapes gothic greek_extended math mathematical_alphanumeric_symbols mathematical_operators miscellaneous_symbols miscellaneous_mathematical_symbols-a miscellaneous_mathematical_symbols-b miscellaneous_symbols_and_arrows miscellaneous_symbols_and_pictographs miscellaneous_technical modi modifier_tone_letters musical_symbols nerd_font number_forms shorthand_format_controls specials variation_selectors vertical_forms -a copy";
-              "${mod}+Shift+e" = "exec --no-startup-id rofi -show \"desktopctl\" -modes \"desktopctl:${desktop-ctl.outPath}/bin/desktopctl\" -theme ${../../other/rofi-themes/applauncher.rasi}";
-              "${mod}+m" = "exec --no-startup-id menu-qalc";
-
-              "${mod}+o" = "exec --no-startup-id rofi -show searchwolf -modes \"searchwolf:${searchwolf.outPath}/bin/searchwolf\"";
-
-              # audio
-              "XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status";
-              "XF86AudioLowerVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status";
-              "XF86AudioMute" = "exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status";
-              "XF86AudioMicMute" = "exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status";
-
-              "XF86AudioNext" = "exec playerctl next";
-              "XF86AudioPrev" = "exec playerctl previous";
-              "XF86AudioPause" = "exec playerctl pause";
-              "XF86AudioPlay" = "exec playerctl play";
-              "XF86AudioStop" = "exec playerctl stop";
-
-              "XF86MonBrightnessUp" = "exec brightnessctl set 5%+";
-              "XF86MonBrightnessDown" = "exec brightnessctl set 5%-";
-
-              "XF86KbdBrightnessUp" = "exec brillo -kA 10.0";
-              "XF86KbdBrightnessDown" = "exec brillo -kU 10.0";
-
-              # macros
-              "${mod}+q" = "exec em-record.sh";
-              "${mod}+p" = "exec em-play.sh";
-              "${mod}+Shift+p" = "exec em-play-loop.sh";
-
-              # permaclip
-              "${mod}+c" = "exec rofi -show register -modes \"register:${pc-set.outPath}/bin/pc-set.sh\" -theme gruvbox-dark";
-              "${mod}+v" = "exec rofi -show register -modes \"register:${pc-get.outPath}/bin/pc-get.sh\" -theme gruvbox-dark";
-            };
-            # }}}
-            # Visuals {{{
-            fonts = {
-              names = [ "Atkinson Hyperlegible" ];
-              style = "Regular";
-              size = 9.0;
-            };
-            gaps = {
-              #top = 24;
-              inner = 15;
-              outer = 0;
-              smartGaps = true;
-              smartBorders = "on";
-            };
-            colors = {
-              background = "#1d2021";
-              focused = { background = "#282828"; border = "#504945"; childBorder = "#7c6f64"; indicator = "#504945"; text = "#ebdbb2"; };
-              focusedInactive = { background = "#1d2021"; border = "#504945"; childBorder = "#665c54"; indicator = "#664c54"; text = "#d5c4a1"; };
-              placeholder = { background = "#1d2021"; border = "#00ff00"; childBorder = "#504945"; indicator = "#504945"; text = "#928374"; };
-              unfocused = { background = "#1d2021"; border = "#3c3836"; childBorder = "#504945"; indicator = "#504945"; text = "#bdae93"; };
-              urgent = { background = "#9d0006"; border = "#cc241d"; childBorder = "#3c3836"; indicator = "#fb4943"; text = "#ebdbb2"; };
-            };
-            window = {
-              border = 2;
-              titlebar = false;
-            };
-            # }}}
-          };
-        };
       };
     };
   };

modules/desktop/i3/default.nix

@@ -0,0 +1,159 @@
+{ config, lib, pkgs, ... }: 
+with lib; {
+  options.jade.desktop.i3wm = {
+    enable = mkEnableOption "Enable i3wm";
+  };
+  config = mkIf cfg.enable {
+    services.xserver.windowManager.i3.enable = true;
+    home-manager.users.jade = { pkgs, ... }: {
+        xsession.windowManager.i3 = {
+          enable = false;
+          config = {
+            bars = [];
+            workspaceAutoBackAndForth = true;
+            focus = {
+              followMouse = false;
+            };
+            # Startup {{{
+              startup = [
+                # wallpaper
+                { 
+                  command = "feh --bg-fill ${../../other/wallpaper.jpg}"; 
+                  always = true; 
+                  notification = false; 
+                }
+
+                # meowmeowmeow
+                { 
+                  command = "pkill oneko; oneko -tofocus  -tora -position +-1+5 -fg palevioletred3 -bg pink -name 'Rose the desktop kitty'"; 
+                  always = true; 
+                }
+              ];
+            # }}}
+            # Assigns {{{
+            assigns = {
+              "1" = [ 
+                { class = "discord"; } 
+                { class = "nheko"; } 
+              ];
+              "2" = [ 
+                { class = "librewolf"; } 
+              ];
+            };
+            # }}}
+            # Keyboard shortcuts {{{
+            modifier = "Mod4";
+            modes = {
+              resize = with {
+                # mod = builtins.break config.xsession.windowManager.i3.config.modifier;
+                mod = builtins.break "Mod4";
+              }; {
+                aaa = builtins.break "a";
+                "${mod}+h" = "resize shrink width 10 px or 10 ppt";
+                "${mod}+j" = "resize grow height 10 px or 10 ppt";
+                "${mod}+k" = "resize shrink height 10 px or 10 ppt";
+                "${mod}+l" = "resize grow width 10 px or 10 ppt";
+
+                "Return" = "mode default";
+                "Escape" = "mode default";
+                "${mod}+r" = "mode default";
+              };
+            };
+            keybindings = with {
+                 #mod = config.xsession.windowManager.i3.config.modifier;
+                 mod = "Mod4";
+            }; lib.mkOptionDefault {
+              # switch window focus
+              "${mod}+h" = "focus left";
+              "${mod}+j" = "focus down";
+              "${mod}+k" = "focus up";
+              "${mod}+l" = "focus right";
+              # move windows
+              "${mod}+Shift+h" = "move left";
+              "${mod}+Shift+j" = "move down";
+              "${mod}+Shift+k" = "move up";
+              "${mod}+Shift+l" = "move right";
+              # layout shit 
+              "${mod}+shift+semicolon" = "split h";
+              "${mod}+semicolon" =  "split v";
+              "${mod}+f" = "fullscreen toggle";
+              "${mod}+Shift+w" = "layout tabbed";
+              "${mod}+e" = "layout toggle split";
+              "${mod}+Shift+space" = "floating toggle";
+              # focus parents/children
+              "${mod}+Shift+a" = "focus parent";
+              "${mod}+Shift+c" = "focus child";
+              # screenshot
+              "${mod}+w" = "exec window-screenshot.sh";
+              "${mod}+s" = "exec flameshot gui -c -p $HOME/Pictures/screenshots";
+              "${mod}+a" = "exec flameshot screen -c -p $HOME/Pictures/screenshots";
+              "${mod}+t" = "exec ocr-screenshot.sh";
+
+              # rofi fuckery
+              "${mod}+d" = "exec --no-startup-id rofi -show drun -theme ${../../other/rofi-themes/applauncher.rasi}";
+              "${mod}+space" = "exec --no-startup-id rofi -show combi -combi-show window#run -modes combi -theme ${../../other/rofi-themes/applauncher.rasi}";
+              "${mod}+i" = "exec --no-startup-id rofimoji -f alchemical_symbols anatolian_hieroglyphs emojis braille_patterns box_drawing chess_symbols emoticons geometric_shapes gothic greek_extended math mathematical_alphanumeric_symbols mathematical_operators miscellaneous_symbols miscellaneous_mathematical_symbols-a miscellaneous_mathematical_symbols-b miscellaneous_symbols_and_arrows miscellaneous_symbols_and_pictographs miscellaneous_technical modi modifier_tone_letters musical_symbols nerd_font number_forms shorthand_format_controls specials variation_selectors vertical_forms -a copy";
+              "${mod}+Shift+e" = "exec --no-startup-id rofi -show \"desktopctl\" -modes \"desktopctl:${desktop-ctl.outPath}/bin/desktopctl\" -theme ${../../other/rofi-themes/applauncher.rasi}";
+              "${mod}+m" = "exec --no-startup-id menu-qalc";
+
+              "${mod}+o" = "exec --no-startup-id rofi -show searchwolf -modes \"searchwolf:${searchwolf.outPath}/bin/searchwolf\"";
+
+              # audio
+              "XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status";
+              "XF86AudioLowerVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status";
+              "XF86AudioMute" = "exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status";
+              "XF86AudioMicMute" = "exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status";
+
+              "XF86AudioNext" = "exec playerctl next";
+              "XF86AudioPrev" = "exec playerctl previous";
+              "XF86AudioPause" = "exec playerctl pause";
+              "XF86AudioPlay" = "exec playerctl play";
+              "XF86AudioStop" = "exec playerctl stop";
+
+              "XF86MonBrightnessUp" = "exec brightnessctl set 5%+";
+              "XF86MonBrightnessDown" = "exec brightnessctl set 5%-";
+
+              "XF86KbdBrightnessUp" = "exec brillo -kA 10.0";
+              "XF86KbdBrightnessDown" = "exec brillo -kU 10.0";
+
+              # macros
+              "${mod}+q" = "exec em-record.sh";
+              "${mod}+p" = "exec em-play.sh";
+              "${mod}+Shift+p" = "exec em-play-loop.sh";
+
+              # permaclip
+              "${mod}+c" = "exec rofi -show register -modes \"register:${pc-set.outPath}/bin/pc-set.sh\" -theme gruvbox-dark";
+              "${mod}+v" = "exec rofi -show register -modes \"register:${pc-get.outPath}/bin/pc-get.sh\" -theme gruvbox-dark";
+            };
+            # }}}
+            # Visuals {{{
+            fonts = {
+              names = [ "Atkinson Hyperlegible" ];
+              style = "Regular";
+              size = 9.0;
+            };
+            gaps = {
+              #top = 24;
+              inner = 15;
+              outer = 0;
+              smartGaps = true;
+              smartBorders = "on";
+            };
+            colors = {
+              background = "#1d2021";
+              focused = { background = "#282828"; border = "#504945"; childBorder = "#7c6f64"; indicator = "#504945"; text = "#ebdbb2"; };
+              focusedInactive = { background = "#1d2021"; border = "#504945"; childBorder = "#665c54"; indicator = "#664c54"; text = "#d5c4a1"; };
+              placeholder = { background = "#1d2021"; border = "#00ff00"; childBorder = "#504945"; indicator = "#504945"; text = "#928374"; };
+              unfocused = { background = "#1d2021"; border = "#3c3836"; childBorder = "#504945"; indicator = "#504945"; text = "#bdae93"; };
+              urgent = { background = "#9d0006"; border = "#cc241d"; childBorder = "#3c3836"; indicator = "#fb4943"; text = "#ebdbb2"; };
+            };
+            window = {
+              border = 2;
+              titlebar = false;
+            };
+            # }}}
+          };
+        };
+    };
+  };
+}

other/scripts/desktop/desktopctl.nix

@@ -28,8 +28,8 @@ pkgs.writeShellScriptBin "desktopctl" ''
   # fixes brown line below input bar
   echo -en "\0theme\x1finputbar{margin:0;}\n"
 
-  echo -en "Lock Screen\0icon\x1f${../../other/assets/desktopctl/lock-screen.svg}\n"
+  echo -en "Lock Screen\0icon\x1f${../../../other/assets/desktopctl/lock-screen.svg}\n"
-  echo -en "Log Out\0icon\x1f${../../other/assets/desktopctl/logout.svg}\n"
+  echo -en "Log Out\0icon\x1f${../../../other/assets/desktopctl/logout.svg}\n"
-  echo -en "Shut Down\0icon\x1f${../../other/assets/desktopctl/shutdown.svg}\n"
+  echo -en "Shut Down\0icon\x1f${../../../other/assets/desktopctl/shutdown.svg}\n"
-  echo -en "Reboot\0icon\x1f${../../other/assets/desktopctl/reboot.svg}\n"
+  echo -en "Reboot\0icon\x1f${../../../other/assets/desktopctl/reboot.svg}\n"
 ''