From 085ff668ab45ac8d57c093e502b1175a86f2c14e Mon Sep 17 00:00:00 2001 From: Arpit Chakladar <54011232+arpitchakladar@users.noreply.github.com> Date: Thu, 10 Jul 2025 01:29:48 +0530 Subject: Removed unnecessary packages. --- modules/desktop/application-launcher/default.nix | 23 ------ .../desktop/application-launcher/fzf/default.nix | 22 ------ modules/desktop/application-launcher/fzf/launch.sh | 28 -------- .../desktop/application-launcher/rofi/default.nix | 21 ------ .../application-launcher/rofi/theme.mustache.rasi | 82 ---------------------- modules/desktop/default.nix | 11 --- .../desktop/display-server/compositor/default.nix | 7 -- .../display-server/compositor/picom/default.nix | 24 ------- modules/desktop/display-server/default.nix | 8 --- modules/desktop/display-server/x11/default.nix | 8 --- .../desktop/display-server/x11/xclip/default.nix | 13 ---- .../desktop/display-server/x11/xinit/default.nix | 26 ------- modules/desktop/status-bar/default.nix | 7 -- modules/desktop/status-bar/polybar/bar/default.nix | 5 -- modules/desktop/status-bar/polybar/bar/main.nix | 46 ------------ modules/desktop/status-bar/polybar/default.nix | 34 --------- .../desktop/status-bar/polybar/module/battery.nix | 36 ---------- .../desktop/status-bar/polybar/module/bspwm.nix | 21 ------ modules/desktop/status-bar/polybar/module/cpu.nix | 9 --- modules/desktop/status-bar/polybar/module/date.nix | 10 --- .../desktop/status-bar/polybar/module/default.nix | 20 ------ modules/desktop/status-bar/polybar/module/i3.nix | 23 ------ .../status-bar/polybar/module/kernel-version.nix | 10 --- .../desktop/status-bar/polybar/module/memory.nix | 9 --- .../status-bar/polybar/module/separator.nix | 7 -- modules/desktop/status-bar/polybar/module/time.nix | 10 --- .../desktop/status-bar/polybar/module/xwindow.nix | 7 -- modules/desktop/window-manager/bspwm/bspwmrc | 3 - modules/desktop/window-manager/bspwm/default.nix | 54 -------------- modules/desktop/window-manager/default.nix | 30 -------- modules/desktop/window-manager/i3/default.nix | 38 ---------- modules/desktop/window-manager/sxhkd/default.nix | 46 ------------ .../window-manager/sxhkd/keybindings/bspwm.nix | 45 ------------ .../window-manager/sxhkd/scripts/keybindings.sh | 77 -------------------- modules/desktop/xdg/default.nix | 24 ------- 35 files changed, 844 deletions(-) delete mode 100644 modules/desktop/application-launcher/default.nix delete mode 100644 modules/desktop/application-launcher/fzf/default.nix delete mode 100644 modules/desktop/application-launcher/fzf/launch.sh delete mode 100644 modules/desktop/application-launcher/rofi/default.nix delete mode 100644 modules/desktop/application-launcher/rofi/theme.mustache.rasi delete mode 100644 modules/desktop/default.nix delete mode 100644 modules/desktop/display-server/compositor/default.nix delete mode 100644 modules/desktop/display-server/compositor/picom/default.nix delete mode 100644 modules/desktop/display-server/default.nix delete mode 100644 modules/desktop/display-server/x11/default.nix delete mode 100644 modules/desktop/display-server/x11/xclip/default.nix delete mode 100644 modules/desktop/display-server/x11/xinit/default.nix delete mode 100644 modules/desktop/status-bar/default.nix delete mode 100644 modules/desktop/status-bar/polybar/bar/default.nix delete mode 100644 modules/desktop/status-bar/polybar/bar/main.nix delete mode 100644 modules/desktop/status-bar/polybar/default.nix delete mode 100644 modules/desktop/status-bar/polybar/module/battery.nix delete mode 100644 modules/desktop/status-bar/polybar/module/bspwm.nix delete mode 100644 modules/desktop/status-bar/polybar/module/cpu.nix delete mode 100644 modules/desktop/status-bar/polybar/module/date.nix delete mode 100644 modules/desktop/status-bar/polybar/module/default.nix delete mode 100644 modules/desktop/status-bar/polybar/module/i3.nix delete mode 100644 modules/desktop/status-bar/polybar/module/kernel-version.nix delete mode 100644 modules/desktop/status-bar/polybar/module/memory.nix delete mode 100644 modules/desktop/status-bar/polybar/module/separator.nix delete mode 100644 modules/desktop/status-bar/polybar/module/time.nix delete mode 100644 modules/desktop/status-bar/polybar/module/xwindow.nix delete mode 100644 modules/desktop/window-manager/bspwm/bspwmrc delete mode 100644 modules/desktop/window-manager/bspwm/default.nix delete mode 100644 modules/desktop/window-manager/default.nix delete mode 100644 modules/desktop/window-manager/i3/default.nix delete mode 100644 modules/desktop/window-manager/sxhkd/default.nix delete mode 100644 modules/desktop/window-manager/sxhkd/keybindings/bspwm.nix delete mode 100755 modules/desktop/window-manager/sxhkd/scripts/keybindings.sh delete mode 100644 modules/desktop/xdg/default.nix (limited to 'modules/desktop') diff --git a/modules/desktop/application-launcher/default.nix b/modules/desktop/application-launcher/default.nix deleted file mode 100644 index 012deb5..0000000 --- a/modules/desktop/application-launcher/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, ... }: - -{ - imports = [ - ./fzf - ./rofi - ]; - - options.desktop.application-launcher = { - default = lib.mkOption { - type = lib.types.enum [ - "fzf" - "rofi" - ]; - description = "Select the default application launcher."; - }; - - command = lib.mkOption { - type = lib.types.str; - description = "Command for default application launcher program."; - }; - }; -} diff --git a/modules/desktop/application-launcher/fzf/default.nix b/modules/desktop/application-launcher/fzf/default.nix deleted file mode 100644 index a7d12d3..0000000 --- a/modules/desktop/application-launcher/fzf/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - options.desktop.application-launcher.fzf = { - enable = lib.mkEnableOption "Enables fzf to be used as a application launcher."; - }; - - config = lib.mkIf config.desktop.application-launcher.fzf.enable { - assertions = [ - { - assertion = config.tools.utils.fzf.enable; - message ="Module desktop.application-launcher.fzf requires tools.utils.fzf module to be enabled."; - } - ]; - - desktop.application-launcher.default = lib.mkDefault "fzf"; - desktop.application-launcher.command = - lib.mkIf - (config.desktop.application-launcher.default == "fzf") - "${config.tools.terminal.command} --title 'Application Launcher' --class floating-termial -e ${(pkgs.writeShellScript "fzf-launch.sh" (builtins.readFile ./launch.sh))}"; - }; -} diff --git a/modules/desktop/application-launcher/fzf/launch.sh b/modules/desktop/application-launcher/fzf/launch.sh deleted file mode 100644 index 53987f6..0000000 --- a/modules/desktop/application-launcher/fzf/launch.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -# Function to get executables from PATH and display them with Nerd Font icons -get_executables() { - for dir in $(echo "$PATH" | tr ':' ' '); do - [ -d "$dir" ] && ls "$dir" 2>/dev/null | awk -F/ '{print "\033[31m \033[0m " $NF}' - done | sort -u -} - -# Function to run fzf and select an executable -select_executable() { - fzf --ansi --height=100% --border=none --layout=reverse --no-multi --prompt " " -} - -# Function to remove ANSI codes and icons from the selected executable -clean_selection() { - sed 's/\x1B\[[0-9;]*m//g' | awk '{$1=""; print $0}' | sed 's/^ //' -} - -# Main script execution -selected_executable=$(get_executables | select_executable | clean_selection) - -# If an executable is selected, run it -if [ -n "$selected_executable" ]; then - setsid "$selected_executable" >/dev/null 2>&1 & - sleep 0.01 - kill -9 $PPID -fi diff --git a/modules/desktop/application-launcher/rofi/default.nix b/modules/desktop/application-launcher/rofi/default.nix deleted file mode 100644 index bfdd617..0000000 --- a/modules/desktop/application-launcher/rofi/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - options.desktop.application-launcher.rofi = { - enable = lib.mkEnableOption "Enables rofi."; - }; - - config = lib.mkIf config.desktop.application-launcher.rofi.enable { - desktop.application-launcher.default = lib.mkDefault "rofi"; - desktop.application-launcher.command = - lib.mkIf - (config.desktop.application-launcher.default == "rofi") - "${pkgs.rofi}/bin/rofi -show run"; - - programs.rofi.enable = true; - programs.rofi.font = "${config.fonts.normal} ${toString config.fonts.size}"; - programs.rofi.theme = config.scheme { - template = builtins.readFile ./theme.mustache.rasi; - }; - }; -} diff --git a/modules/desktop/application-launcher/rofi/theme.mustache.rasi b/modules/desktop/application-launcher/rofi/theme.mustache.rasi deleted file mode 100644 index 02cdaf3..0000000 --- a/modules/desktop/application-launcher/rofi/theme.mustache.rasi +++ /dev/null @@ -1,82 +0,0 @@ -configuration { - drun { - display-name: " "; - } - - run { - display-name: " "; - } - - window { - display-name: " "; - } - - ssh { - display-name: " "; - } - - timeout { - delay: 10; - action: "kb-cancel"; - } -} - -* { - border: 1; - margin: 0; - padding: 0; - spacing: 0; - - bg: #{{base00-hex}}; - bg-alt: #{{base01-hex}}; - fg: #{{base07-hex}}; - fg-alt: #{{base03-hex}}; - - background-color: @bg; - text-color: @fg; -} - -window { - transparency: "real"; - border-color: #{{base03-hex}}; -} - -mainbox { - children: [inputbar, listview]; -} - -inputbar { - background-color: @bg-alt; - children: [prompt, entry]; -} - -entry { - background-color: inherit; - padding: 12px 3px; -} - -prompt { - background-color: inherit; - padding: 12px; -} - -listview { - lines: 8; -} - -element { - children: [element-text]; -} - -element-icon { - padding: 10px 10px; -} - -element-text { - padding: 10px 10px; - text-color: @fg-alt; -} - -element-text selected { - text-color: @fg; -} diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix deleted file mode 100644 index edb8959..0000000 --- a/modules/desktop/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ ... }: - -{ - imports = [ - ./application-launcher - ./display-server - ./status-bar - ./window-manager - ./xdg - ]; -} diff --git a/modules/desktop/display-server/compositor/default.nix b/modules/desktop/display-server/compositor/default.nix deleted file mode 100644 index ae5fc6d..0000000 --- a/modules/desktop/display-server/compositor/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: - -{ - imports = [ - ./picom - ]; -} diff --git a/modules/desktop/display-server/compositor/picom/default.nix b/modules/desktop/display-server/compositor/picom/default.nix deleted file mode 100644 index 750fd1e..0000000 --- a/modules/desktop/display-server/compositor/picom/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, config, ... }: - -{ - options.desktop.display-server.compositor.picom = { - enable = lib.mkEnableOption "Enables picom."; - }; - - config = lib.mkIf config.desktop.display-server.compositor.picom.enable { - services.picom.enable = true; - services.picom.backend = "xrender"; - services.picom.fade = false; - services.picom.shadow = false; - services.picom.settings = { - blur-background = false; - background = "#000000"; - transparent-clipping = true; - }; - services.picom.activeOpacity = 0.8; - services.picom.inactiveOpacity = 0.8; - services.picom.opacityRules = [ - "100:class_g = 'Polybar'" # 70% opacity for Polybar - ]; - }; -} diff --git a/modules/desktop/display-server/default.nix b/modules/desktop/display-server/default.nix deleted file mode 100644 index 5062f7c..0000000 --- a/modules/desktop/display-server/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: - -{ - imports = [ - ./compositor - ./x11 - ]; -} diff --git a/modules/desktop/display-server/x11/default.nix b/modules/desktop/display-server/x11/default.nix deleted file mode 100644 index f1fd52a..0000000 --- a/modules/desktop/display-server/x11/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: - -{ - imports = [ - ./xclip - ./xinit - ]; -} diff --git a/modules/desktop/display-server/x11/xclip/default.nix b/modules/desktop/display-server/x11/xclip/default.nix deleted file mode 100644 index 7c97d60..0000000 --- a/modules/desktop/display-server/x11/xclip/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ lib, config, pkgs, ... }: - -{ - options.desktop.display-server.x11.xclip = { - enable = lib.mkEnableOption "Enables xclip."; - }; - - config = lib.mkIf config.desktop.display-server.x11.xclip.enable { - home.packages = with pkgs; [ - xclip - ]; - }; -} diff --git a/modules/desktop/display-server/x11/xinit/default.nix b/modules/desktop/display-server/x11/xinit/default.nix deleted file mode 100644 index 6e82e2c..0000000 --- a/modules/desktop/display-server/x11/xinit/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, config, pkgs, ... }: - -{ - options.desktop.display-server.x11.xinit = { - enable = lib.mkEnableOption "Enables xinit."; - }; - - config = lib.mkIf config.desktop.display-server.x11.xinit.enable { - home.file.".xinitrc" = { - executable = true; - - source = pkgs.writeText ".xinitrc" -'' -#!/bin/sh -${if config.tools.viewer.feh.enable then - "feh --bg-scale ${../../../../../assets/skeleton-mage.png}" -else "xsetroot -solid \"${config.scheme.withHashtag.base00}\""} -${if config.desktop.status-bar.polybar.enable then - config.desktop.status-bar.polybar.command -else ""} -${if config.desktop.window-manager.sxhkd.enable then "sxhkd &" else ""} -exec ${config.desktop.window-manager.command} -''; - }; - }; -} diff --git a/modules/desktop/status-bar/default.nix b/modules/desktop/status-bar/default.nix deleted file mode 100644 index 45cb3a0..0000000 --- a/modules/desktop/status-bar/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: - -{ - imports = [ - ./polybar - ]; -} diff --git a/modules/desktop/status-bar/polybar/bar/default.nix b/modules/desktop/status-bar/polybar/bar/default.nix deleted file mode 100644 index 23a43c4..0000000 --- a/modules/desktop/status-bar/polybar/bar/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, lib }: - -{ - "bar/main" = import ./main.nix { inherit config lib; }; -} diff --git a/modules/desktop/status-bar/polybar/bar/main.nix b/modules/desktop/status-bar/polybar/bar/main.nix deleted file mode 100644 index a389b8c..0000000 --- a/modules/desktop/status-bar/polybar/bar/main.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ config, lib }: - -with config.scheme.withHashtag; -let - largerFontSize = toString (builtins.ceil (config.fonts.size * 9.0 / 8.0)); -in { - width = "\${env:POLYBAR_WIDTH}"; - fixed-center = false; - height = 35; - - border-top-size = 1; - border-bottom-size = 1; - border-left-size = 1; - border-right-size = 1; - border-color = base03; - - background = base00; - foreground = base05; - - line-size = 3; - line-color = base08; - - padding-left = 1; - padding-right = 1; - - module-margin-left = 1; - module-margin-right = 1; - - separator = "%{F${base03}}%{T3}│%{T-}%{F-}"; - - offset-x = "\${env:POLYBAR_OFFSET}"; - offset-y = "\${env:POLYBAR_OFFSET}"; - - font-0 = "${config.fonts.normal}:pixelsize=${toString config.fonts.size};3"; - font-1 = "${config.fonts.normal}:weight=Bold:pixelsize=${largerFontSize};3"; - font-2 = "${config.fonts.normal}:style=Light:pixelsize=${largerFontSize};2"; - - modules-left = - if config.desktop.window-manager.bspwm.enable then - "bspwm separator" - else if config.desktop.window-manager.i3.enable then - "i3 separator" - else ""; - modules-center = "xwindow"; - modules-right = "separator memory cpu battery time date kernel-version"; -} diff --git a/modules/desktop/status-bar/polybar/default.nix b/modules/desktop/status-bar/polybar/default.nix deleted file mode 100644 index 76901f6..0000000 --- a/modules/desktop/status-bar/polybar/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - polybarPackage = pkgs.polybar.override { - i3Support = config.desktop.window-manager.i3.enable; - }; -in -{ - options.desktop.status-bar.polybar = { - enable = lib.mkEnableOption "Enables polybar."; - command = lib.mkOption { - type = lib.types.str; - description = "Command to run polybar."; - # This command calculates the width of the polybar to create those gaps - default = toString (pkgs.writeShellScript "polybar-run.sh" '' -#!/bin/sh - -MONITOR_WIDTH=$(xrandr | grep '*' | awk '{print $1}' | cut -d'x' -f1 | head -n1) -OFFSET=${toString config.desktop.window-manager.gap} -POLYBAR_WIDTH=$((MONITOR_WIDTH - 2 * OFFSET)) POLYBAR_OFFSET=$OFFSET ${polybarPackage}/bin/polybar main & -''); - }; - }; - - config = lib.mkIf config.desktop.status-bar.polybar.enable { - services.polybar.enable = true; - services.polybar.script = config.desktop.status-bar.polybar.command; - services.polybar.package = polybarPackage; - services.polybar.config = lib.mkMerge [ - (import ./bar { inherit config lib; }) - (import ./module { inherit config lib; }) - ]; - }; -} diff --git a/modules/desktop/status-bar/polybar/module/battery.nix b/modules/desktop/status-bar/polybar/module/battery.nix deleted file mode 100644 index 6e25e99..0000000 --- a/modules/desktop/status-bar/polybar/module/battery.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ config }: - -with config.scheme.withHashtag; -{ - type = "internal/battery"; - battery = "BAT0"; - adapter = "ADP1"; - - format-charging = "%{T2}%{F${base03}}%{F-}%{T-} "; - format-discharging = "%{T2}%{F${base03}}%{F-}%{T-} "; - format-full-prefix = "󰁹 "; - - ramp-capacity-0 = "󰁺"; - ramp-capacity-1 = "󰁻"; - ramp-capacity-2 = "󰁼"; - ramp-capacity-3 = "󰁽"; - ramp-capacity-4 = "󰁾"; - ramp-capacity-5 = "󰁿"; - ramp-capacity-6 = "󰂀"; - ramp-capacity-7 = "󰂁"; - ramp-capacity-8 = "󰂂"; - ramp-capacity-9 = "󰁹"; - - animation-charging-0 = "󰁺"; - animation-charging-1 = "󰁻"; - animation-charging-2 = "󰁼"; - animation-charging-3 = "󰁽"; - animation-charging-4 = "󰁾"; - animation-charging-5 = "󰁿"; - animation-charging-6 = "󰂀"; - animation-charging-7 = "󰂁"; - animation-charging-8 = "󰂂"; - animation-charging-9 = "󰁹"; - - animation-charging-framerate = 750; -} diff --git a/modules/desktop/status-bar/polybar/module/bspwm.nix b/modules/desktop/status-bar/polybar/module/bspwm.nix deleted file mode 100644 index ed82946..0000000 --- a/modules/desktop/status-bar/polybar/module/bspwm.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config }: - -with config.scheme.withHashtag; -{ - type = "internal/bspwm"; - - label-focused = "%index%"; - label-focused-underline = "${base0D}"; - label-focused-padding = 2; - - label-occupied = "%index%"; - label-occupied-padding = 2; - - label-urgent = "%index%"; - label-urgent-underline = "${base08}"; - label-urgent-padding = 2; - - label-empty = "%index%"; - label-empty-foreground = "${base03}"; - label-empty-padding = 2; -} diff --git a/modules/desktop/status-bar/polybar/module/cpu.nix b/modules/desktop/status-bar/polybar/module/cpu.nix deleted file mode 100644 index d37b5cc..0000000 --- a/modules/desktop/status-bar/polybar/module/cpu.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config }: - -with config.scheme.withHashtag; -{ - type = "internal/cpu"; - interval = 2; - format-prefix = "%{T2}%{F${base03}} %{F-}%{T-}"; - label = "%percentage%%"; -} diff --git a/modules/desktop/status-bar/polybar/module/date.nix b/modules/desktop/status-bar/polybar/module/date.nix deleted file mode 100644 index 56e2fa6..0000000 --- a/modules/desktop/status-bar/polybar/module/date.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config }: - -with config.scheme.withHashtag; -{ - type = "internal/date"; - interval = 60; - date = "%d/%m/%Y"; - label = "%date%"; - format-prefix = "%{T2}%{F${base03}} %{F-}%{T-}"; -} diff --git a/modules/desktop/status-bar/polybar/module/default.nix b/modules/desktop/status-bar/polybar/module/default.nix deleted file mode 100644 index 5507569..0000000 --- a/modules/desktop/status-bar/polybar/module/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ config, lib }: - -{ - "module/separator" = import ./separator.nix { inherit config; }; - "module/xwindow" = import ./xwindow.nix { inherit config; }; - "module/bspwm" = - lib.mkIf - config.desktop.window-manager.bspwm.enable - (import ./bspwm.nix { inherit config; }); - "module/i3" = - lib.mkIf - config.desktop.window-manager.i3.enable - (import ./i3.nix { inherit config; }); - "module/cpu" = import ./cpu.nix { inherit config; }; - "module/memory" = import ./memory.nix { inherit config; }; - "module/date" = import ./date.nix { inherit config; }; - "module/time" = import ./time.nix { inherit config; }; - "module/battery" = import ./battery.nix { inherit config; }; - "module/kernel-version" = import ./kernel-version.nix { inherit config; }; -} diff --git a/modules/desktop/status-bar/polybar/module/i3.nix b/modules/desktop/status-bar/polybar/module/i3.nix deleted file mode 100644 index 46595cd..0000000 --- a/modules/desktop/status-bar/polybar/module/i3.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config }: - -with config.scheme.withHashtag; -{ - type = "internal/i3"; - - pin-workspaces = true; - - label-focused = "%index%"; - label-focused-underline = "${base0D}"; - label-focused-padding = 2; - - label-occupied = "%index%"; - label-occupied-padding = 2; - - label-urgent = "%index%"; - label-urgent-underline = "${base08}"; - label-urgent-padding = 2; - - label-empty = "%index%"; - label-empty-foreground = "${base03}"; - label-empty-padding = 2; -} diff --git a/modules/desktop/status-bar/polybar/module/kernel-version.nix b/modules/desktop/status-bar/polybar/module/kernel-version.nix deleted file mode 100644 index 8f94e37..0000000 --- a/modules/desktop/status-bar/polybar/module/kernel-version.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config }: - -with config.scheme.withHashtag; -{ - type = "custom/script"; - exec = "uname -r"; - interval = 1024; - format-prefix = "%{T2}%{F${base03}} %{F-}%{T-}"; - label = "%output%"; -} diff --git a/modules/desktop/status-bar/polybar/module/memory.nix b/modules/desktop/status-bar/polybar/module/memory.nix deleted file mode 100644 index 79033f1..0000000 --- a/modules/desktop/status-bar/polybar/module/memory.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config }: - -with config.scheme.withHashtag; -{ - type = "internal/memory"; - interval = 2; - format-prefix = "%{T2}%{F${base03}} %{F-}%{T-}"; - label = "%percentage_used%%"; -} diff --git a/modules/desktop/status-bar/polybar/module/separator.nix b/modules/desktop/status-bar/polybar/module/separator.nix deleted file mode 100644 index 3cd1430..0000000 --- a/modules/desktop/status-bar/polybar/module/separator.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config }: - -with config.scheme.withHashtag; -{ - type = "custom/text"; - label = " "; -} diff --git a/modules/desktop/status-bar/polybar/module/time.nix b/modules/desktop/status-bar/polybar/module/time.nix deleted file mode 100644 index b8ea545..0000000 --- a/modules/desktop/status-bar/polybar/module/time.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config }: - -with config.scheme.withHashtag; -{ - type = "internal/date"; - interval = 30; - time = "%H:%M"; - label = "%time%"; - format-prefix = "%{T2}%{F${base03}} %{F-}%{T-}"; -} diff --git a/modules/desktop/status-bar/polybar/module/xwindow.nix b/modules/desktop/status-bar/polybar/module/xwindow.nix deleted file mode 100644 index 833899e..0000000 --- a/modules/desktop/status-bar/polybar/module/xwindow.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config }: - -with config.scheme.withHashtag; -{ - type = "internal/xwindow"; - label = "%title:0:30:...%"; -} diff --git a/modules/desktop/window-manager/bspwm/bspwmrc b/modules/desktop/window-manager/bspwm/bspwmrc deleted file mode 100644 index 8a3a35a..0000000 --- a/modules/desktop/window-manager/bspwm/bspwmrc +++ /dev/null @@ -1,3 +0,0 @@ -for monitor in $(xrandr -q | grep -w 'connected' | cut -d' ' -f1); do - bspc monitor "$monitor" -d '1' '2' '3' '4' '5' '6' -done diff --git a/modules/desktop/window-manager/bspwm/default.nix b/modules/desktop/window-manager/bspwm/default.nix deleted file mode 100644 index e275135..0000000 --- a/modules/desktop/window-manager/bspwm/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - options.desktop.window-manager.bspwm = { - enable = lib.mkEnableOption "Enables bspwm."; - }; - - config = lib.mkIf config.desktop.window-manager.bspwm.enable { - assertions = [ - { - assertion = config.desktop.window-manager.sxhkd.enable; - message ="Module desktop.window-manager.bspwm requires desktop.window-manager.sxhkd module to be enabled."; - } - ]; - - desktop.window-manager.default = lib.mkDefault "bspwm"; - desktop.window-manager.command = - if config.desktop.window-manager.default == "bspwm" then - "${pkgs.bspwm}/bin/bspwm" - else lib.mkDefault ""; - - xsession.windowManager.bspwm.enable = true; - - xsession.windowManager.bspwm.settings = with config.scheme.withHashtag; { - window_gap = config.desktop.window-manager.gap; - split_ratio = 0.5; - single_monocle = true; - borderless_monocle = false; - gapless_monocle = false; - focus_follows_pointer = true; - pointer_follows_focus = false; - pointer_motion_interval = 40; - pointer_modifier = "mod1"; # alt key - pointer_action1 = "resize_side"; - pointer_action2 = "move"; - pointer_action3 = "resize_corner"; - normal_border_color = base02; - active_border_color = base02; - focused_border_color = base03; - }; - - xsession.windowManager.bspwm.rules = { - "floating-termial" = { - state = "floating"; - sticky = true; - rectangle = "1000x600+0+0"; - center = true; - follow = true; - }; - }; - - xsession.windowManager.bspwm.extraConfig = builtins.readFile ./bspwmrc; - }; -} diff --git a/modules/desktop/window-manager/default.nix b/modules/desktop/window-manager/default.nix deleted file mode 100644 index 2f36bce..0000000 --- a/modules/desktop/window-manager/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, ... }: - -{ - imports = [ - ./bspwm - ./i3 - ./sxhkd - ]; - - options.desktop.window-manager = { - default = lib.mkOption { - type = lib.types.enum [ - "bspwm" - "i3" - ]; - description = "Default window manager."; - }; - - command = lib.mkOption { - type = lib.types.str; - description = "Command window manager program."; - }; - - gap = lib.mkOption { - type = lib.types.int; - default = 10; - description = "The spacing between windows."; - }; - }; -} diff --git a/modules/desktop/window-manager/i3/default.nix b/modules/desktop/window-manager/i3/default.nix deleted file mode 100644 index 369fe34..0000000 --- a/modules/desktop/window-manager/i3/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - options.desktop.window-manager.i3 = { - enable = lib.mkEnableOption "Enables i3."; - }; - - config = lib.mkIf config.desktop.window-manager.i3.enable { - # Set i3 as the default window manager - desktop.window-manager.default = lib.mkDefault "i3"; - desktop.window-manager.command = - if config.desktop.window-manager.default == "i3" then - "${pkgs.i3}/bin/i3" - else lib.mkDefault ""; - - xsession.windowManager.i3.enable = true; - - xsession.windowManager.i3.config = { - modifier = "Mod4"; - gaps = { - inner = config.desktop.window-manager.gap; - }; - terminal = config.tools.terminal.command; - fonts = { - names = [ "FiraCode Nerd Font" ]; - size = 11.0; - }; - bars = [ - { - command = - lib.mkIf - config.desktop.status-bar.polybar.enable - config.desktop.status-bar.polybar.command; - } - ]; - }; - }; -} diff --git a/modules/desktop/window-manager/sxhkd/default.nix b/modules/desktop/window-manager/sxhkd/default.nix deleted file mode 100644 index cab7351..0000000 --- a/modules/desktop/window-manager/sxhkd/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ pkgs, config, lib, ... }: - -{ - options.desktop.window-manager.sxhkd = { - enable = lib.mkEnableOption "Enables sxhkd."; - }; - - config = lib.mkIf config.desktop.window-manager.sxhkd.enable { - services.sxhkd.enable = true; - services.sxhkd.keybindings = - let - modKey = "alt"; - createKeybinding = keybinding: description: command: { - "# ${description}\n${modKey} + ${keybinding}" = command; - }; - in lib.mkMerge [ - ( - if config.desktop.window-manager.bspwm.enable then - (import ./keybindings/bspwm.nix { inherit pkgs createKeybinding lib; }) - else {} - ) - (lib.mkMerge [ - (createKeybinding - "s" - "Show keybindings." - "${config.tools.terminal.command} --title 'Keybindings' --class floating-termial -e ${pkgs.writeShellScript "keybindings.sh" (builtins.readFile ./scripts/keybindings.sh)}" - ) - - (createKeybinding - "r" - "Application launcher." - config.desktop.application-launcher.command) - - (createKeybinding - "t" - "Launch terminal." - config.tools.terminal.command) - - (createKeybinding - "f" - "Launch File Manager." - "${config.tools.terminal.command} --title 'File Manager' --class floating-termial -e ${config.tools.file-manager.command}") - ]) - ]; - }; -} diff --git a/modules/desktop/window-manager/sxhkd/keybindings/bspwm.nix b/modules/desktop/window-manager/sxhkd/keybindings/bspwm.nix deleted file mode 100644 index ed62ed4..0000000 --- a/modules/desktop/window-manager/sxhkd/keybindings/bspwm.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ createKeybinding, pkgs, lib }: - -let - bspc = "${pkgs.bspwm}/bin/bspc"; -in lib.mkMerge [ - (createKeybinding - "q" - "Kill current window." - "${bspc} node -c") - - (createKeybinding - "{1-9,0}" - "Switch workspace." - "${bspc} desktop -f {1-9,10}") - - (createKeybinding - "shift + {1-9,0}" - "Move window to workspace." - "${bspc} node -d {1-9,10} --follow") - - (createKeybinding - "{n,d,m}" - "Set current window mode (tiled, floating, fullscreen)." - "${bspc} node focused -t {tiled,floating,fullscreen}") - - (createKeybinding - "{_,shift + }{h,j,k,l}" - "Navigate between windows." - "${bspc} node --{focus,swap} {west,south,north,east}") - - # the indentation for each line is required to work with the help prompt - (createKeybinding - "ctrl + {h,j,k,l}" - "Resize current window." - '' - ${bspc} node {@parent/second -z left -20 0; \ - @parent/first -z right -20 0, \ - @parent/second -z top 0 +20; \ - @parent/first -z bottom 0 +20, \ - @parent/first -z bottom 0 -20; \ - @parent/second -z top 0 -20, \ - @parent/first -z right +20 0; \ - @parent/second -z left +20 0} -'') -] diff --git a/modules/desktop/window-manager/sxhkd/scripts/keybindings.sh b/modules/desktop/window-manager/sxhkd/scripts/keybindings.sh deleted file mode 100755 index 01bb05f..0000000 --- a/modules/desktop/window-manager/sxhkd/scripts/keybindings.sh +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh - -# Path to your sxhkd config file -SXHKD_FILE="$HOME/.config/sxhkd/sxhkdrc" - -# Function to wrap text to a specified width -wrap_text() { - local text="$1" - local width="$2" - echo "$text" | fold -s -w "$width" -} - -# Get terminal width -terminal_width=$(tput cols) - -# Set the table width to the full terminal width, leaving space for borders -table_width=$((terminal_width - 4)) # 4 for the borders and space between columns - -# Set keybinding column width to half of the available width -max_keybinding_length=$((table_width / 2)) - -# Length of the cotent inside the cell (2 spaces are substracted for padding) -max_keybinding_content_length=$((max_keybinding_length - 2)) - -# Set the description column width to the other half -description_width=$((table_width - max_keybinding_length - 1)) # 1 for the separator between columns - -# Length of the cotent inside the cell (2 spaces are substracted for padding) -description_content_width=$((description_width - 2)) - -# Generate the top border line and row separator -border_line="├$(printf '%.0s─' $(seq 1 $max_keybinding_length))┼$(printf '%.0s─' $(seq 1 $description_width))┤" - -# Pipe all output to less -{ - # Print table header with borders - echo "┌$(printf '%.0s─' $(seq 1 $max_keybinding_length))┬$(printf '%.0s─' $(seq 1 $description_width))┐" - printf "│ %-*s │ %-*s │\n" "$max_keybinding_content_length" "KEYBINDING" "$description_content_width" "DESCRIPTION" - - # Initialize variables - description="" - - # Load the sxhkd file into an array - mapfile -t lines < "$SXHKD_FILE" - - # Loop through lines for output - for line in "${lines[@]}"; do - # Check if the line is a comment - if [[ $line =~ ^# ]]; then - # Remove the "#" and any leading/trailing whitespace to capture the description - description="${line#\# }" - elif [[ $line =~ ^[^#[:space:]] ]]; then - # If it's a keybinding line, store it - keybinding="$line" - # Move to the next line for the command - command="${lines[((++i))]}" - - # Wrap the description to the calculated width - wrapped_description=$(wrap_text "$description" "$description_width") - - # Print the keybinding with a border line above and below it - echo "$border_line" - printf "│ %-*s │ %-*s │\n" "$max_keybinding_content_length" "$keybinding" "$description_content_width" "$(echo "$wrapped_description" | head -n 1)" - - # Print wrapped description lines with empty keybinding column - echo "$wrapped_description" | sed '1d' | while read -r continuation; do - printf "│ %-*s │ %-*s │\n" "$max_keybinding_content_length" "" "$description_content_width" "$continuation" - done - - # Reset description for the next keybinding - description="" - fi - done - - # Print the final border line - echo "└$(printf '%.0s─' $(seq 1 $max_keybinding_length))┴$(printf '%.0s─' $(seq 1 $description_width))┘" -} | less diff --git a/modules/desktop/xdg/default.nix b/modules/desktop/xdg/default.nix deleted file mode 100644 index a1614f4..0000000 --- a/modules/desktop/xdg/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ pkgs, config, lib, ... }: - -{ - options.desktop.xdg = { - portal.enable = lib.mkEnableOption "Enables xdg desktop portal."; - }; - - config = lib.mkIf config.desktop.xdg.portal.enable { - xdg.portal.enable = true; - xdg.portal.xdgOpenUsePortal = true; - - xdg.portal.config = { - common = { - default = [ - "gtk" - ]; - }; - }; - - xdg.portal.extraPortals = [ - pkgs.xdg-desktop-portal-gtk - ]; - }; -} -- cgit v1.2.3