diff --git a/flake.nix b/flake.nix index af54c0d..ca99aa2 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; - users.fabian = import ./hosts/default/modules/home/home.nix; + users.fabian = import ./hosts/computer/modules/home/home.nix; }; } ]; diff --git a/hosts/default/configuration.nix b/hosts/computer/configuration.nix similarity index 100% rename from hosts/default/configuration.nix rename to hosts/computer/configuration.nix diff --git a/hosts/default/modules/home/home.nix b/hosts/computer/modules/home/home.nix similarity index 100% rename from hosts/default/modules/home/home.nix rename to hosts/computer/modules/home/home.nix diff --git a/hosts/default/modules/home/nix/alacritty.nix b/hosts/computer/modules/home/nix/alacritty.nix similarity index 100% rename from hosts/default/modules/home/nix/alacritty.nix rename to hosts/computer/modules/home/nix/alacritty.nix diff --git a/hosts/default/modules/home/nix/default.nix b/hosts/computer/modules/home/nix/default.nix similarity index 69% rename from hosts/default/modules/home/nix/default.nix rename to hosts/computer/modules/home/nix/default.nix index d60999d..113c7a4 100644 --- a/hosts/default/modules/home/nix/default.nix +++ b/hosts/computer/modules/home/nix/default.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { imports = [ - ./sway/default.nix + ../../../../default/windowManager/sway/default.nix ./alacritty.nix ./shell.nix ./git.nix diff --git a/hosts/default/modules/home/nix/git.nix b/hosts/computer/modules/home/nix/git.nix similarity index 100% rename from hosts/default/modules/home/nix/git.nix rename to hosts/computer/modules/home/nix/git.nix diff --git a/hosts/default/modules/home/nix/mpd.nix b/hosts/computer/modules/home/nix/mpd.nix similarity index 100% rename from hosts/default/modules/home/nix/mpd.nix rename to hosts/computer/modules/home/nix/mpd.nix diff --git a/hosts/default/modules/home/nix/shell.nix b/hosts/computer/modules/home/nix/shell.nix similarity index 100% rename from hosts/default/modules/home/nix/shell.nix rename to hosts/computer/modules/home/nix/shell.nix diff --git a/hosts/default/modules/home/nix/tmux.nix b/hosts/computer/modules/home/nix/tmux.nix similarity index 100% rename from hosts/default/modules/home/nix/tmux.nix rename to hosts/computer/modules/home/nix/tmux.nix diff --git a/hosts/default/modules/home/raw/wp/GABE_Windows.png b/hosts/computer/modules/home/raw/wp/GABE_Windows.png similarity index 100% rename from hosts/default/modules/home/raw/wp/GABE_Windows.png rename to hosts/computer/modules/home/raw/wp/GABE_Windows.png diff --git a/hosts/default/modules/home/raw/wp/anime_blue.png b/hosts/computer/modules/home/raw/wp/anime_blue.png similarity index 100% rename from hosts/default/modules/home/raw/wp/anime_blue.png rename to hosts/computer/modules/home/raw/wp/anime_blue.png diff --git a/hosts/default/modules/home/raw/wp/bg.png b/hosts/computer/modules/home/raw/wp/bg.png similarity index 100% rename from hosts/default/modules/home/raw/wp/bg.png rename to hosts/computer/modules/home/raw/wp/bg.png diff --git a/hosts/default/modules/home/raw/wp/fuji.png b/hosts/computer/modules/home/raw/wp/fuji.png similarity index 100% rename from hosts/default/modules/home/raw/wp/fuji.png rename to hosts/computer/modules/home/raw/wp/fuji.png diff --git a/hosts/default/modules/home/raw/wp/gruvbox-dark-blue.png b/hosts/computer/modules/home/raw/wp/gruvbox-dark-blue.png similarity index 100% rename from hosts/default/modules/home/raw/wp/gruvbox-dark-blue.png rename to hosts/computer/modules/home/raw/wp/gruvbox-dark-blue.png diff --git a/hosts/default/modules/home/raw/wp/hollow_knight.png b/hosts/computer/modules/home/raw/wp/hollow_knight.png similarity index 100% rename from hosts/default/modules/home/raw/wp/hollow_knight.png rename to hosts/computer/modules/home/raw/wp/hollow_knight.png diff --git a/hosts/default/modules/home/raw/wp/ios.png b/hosts/computer/modules/home/raw/wp/ios.png similarity index 100% rename from hosts/default/modules/home/raw/wp/ios.png rename to hosts/computer/modules/home/raw/wp/ios.png diff --git a/hosts/default/modules/home/raw/wp/manga.png b/hosts/computer/modules/home/raw/wp/manga.png similarity index 100% rename from hosts/default/modules/home/raw/wp/manga.png rename to hosts/computer/modules/home/raw/wp/manga.png diff --git a/hosts/default/modules/home/raw/wp/nixos_dark.png b/hosts/computer/modules/home/raw/wp/nixos_dark.png similarity index 100% rename from hosts/default/modules/home/raw/wp/nixos_dark.png rename to hosts/computer/modules/home/raw/wp/nixos_dark.png diff --git a/hosts/default/modules/home/raw/wp/orbit.png b/hosts/computer/modules/home/raw/wp/orbit.png similarity index 100% rename from hosts/default/modules/home/raw/wp/orbit.png rename to hosts/computer/modules/home/raw/wp/orbit.png diff --git a/hosts/default/modules/home/raw/wp/skull_purple.png b/hosts/computer/modules/home/raw/wp/skull_purple.png similarity index 100% rename from hosts/default/modules/home/raw/wp/skull_purple.png rename to hosts/computer/modules/home/raw/wp/skull_purple.png diff --git a/hosts/default/modules/home/raw/wp/skulls.png b/hosts/computer/modules/home/raw/wp/skulls.png similarity index 100% rename from hosts/default/modules/home/raw/wp/skulls.png rename to hosts/computer/modules/home/raw/wp/skulls.png diff --git a/hosts/default/modules/home/raw/wp/soyuz.png b/hosts/computer/modules/home/raw/wp/soyuz.png similarity index 100% rename from hosts/default/modules/home/raw/wp/soyuz.png rename to hosts/computer/modules/home/raw/wp/soyuz.png diff --git a/hosts/default/modules/home/raw/wp/temple.png b/hosts/computer/modules/home/raw/wp/temple.png similarity index 100% rename from hosts/default/modules/home/raw/wp/temple.png rename to hosts/computer/modules/home/raw/wp/temple.png diff --git a/hosts/default/modules/home/raw/wp/wolf.png b/hosts/computer/modules/home/raw/wp/wolf.png similarity index 100% rename from hosts/default/modules/home/raw/wp/wolf.png rename to hosts/computer/modules/home/raw/wp/wolf.png diff --git a/hosts/default/modules/system/nix/boot.nix b/hosts/computer/modules/system/nix/boot.nix similarity index 100% rename from hosts/default/modules/system/nix/boot.nix rename to hosts/computer/modules/system/nix/boot.nix diff --git a/hosts/default/modules/system/nix/default.nix b/hosts/computer/modules/system/nix/default.nix similarity index 69% rename from hosts/default/modules/system/nix/default.nix rename to hosts/computer/modules/system/nix/default.nix index 0c69b63..0625caa 100644 --- a/hosts/default/modules/system/nix/default.nix +++ b/hosts/computer/modules/system/nix/default.nix @@ -4,7 +4,8 @@ ... }: { imports = [ - ./x/dwm/default.nix + ../../../../default/windowManager/dwm/default.nix + ../../../../default/editors/nvim/default.nix ./nvim/default.nix ./networking.nix ./users.nix diff --git a/hosts/default/modules/system/nix/firefox.nix b/hosts/computer/modules/system/nix/firefox.nix similarity index 100% rename from hosts/default/modules/system/nix/firefox.nix rename to hosts/computer/modules/system/nix/firefox.nix diff --git a/hosts/default/modules/system/nix/gaming.nix b/hosts/computer/modules/system/nix/gaming.nix similarity index 100% rename from hosts/default/modules/system/nix/gaming.nix rename to hosts/computer/modules/system/nix/gaming.nix diff --git a/hosts/default/modules/system/nix/hw.nix b/hosts/computer/modules/system/nix/hw.nix similarity index 100% rename from hosts/default/modules/system/nix/hw.nix rename to hosts/computer/modules/system/nix/hw.nix diff --git a/hosts/default/modules/system/nix/networking.nix b/hosts/computer/modules/system/nix/networking.nix similarity index 100% rename from hosts/default/modules/system/nix/networking.nix rename to hosts/computer/modules/system/nix/networking.nix diff --git a/hosts/default/modules/system/nix/pkgs.nix b/hosts/computer/modules/system/nix/pkgs.nix similarity index 100% rename from hosts/default/modules/system/nix/pkgs.nix rename to hosts/computer/modules/system/nix/pkgs.nix diff --git a/hosts/default/modules/system/nix/sec.nix b/hosts/computer/modules/system/nix/sec.nix similarity index 100% rename from hosts/default/modules/system/nix/sec.nix rename to hosts/computer/modules/system/nix/sec.nix diff --git a/hosts/default/modules/system/nix/services.nix b/hosts/computer/modules/system/nix/services.nix similarity index 100% rename from hosts/default/modules/system/nix/services.nix rename to hosts/computer/modules/system/nix/services.nix diff --git a/hosts/default/modules/system/nix/users.nix b/hosts/computer/modules/system/nix/users.nix similarity index 100% rename from hosts/default/modules/system/nix/users.nix rename to hosts/computer/modules/system/nix/users.nix diff --git a/hosts/default/modules/system/nix/virt.nix b/hosts/computer/modules/system/nix/virt.nix similarity index 100% rename from hosts/default/modules/system/nix/virt.nix rename to hosts/computer/modules/system/nix/virt.nix diff --git a/hosts/default/modules/system/raw/pacman.conf b/hosts/computer/modules/system/raw/pacman.conf similarity index 100% rename from hosts/default/modules/system/raw/pacman.conf rename to hosts/computer/modules/system/raw/pacman.conf diff --git a/hosts/default/modules/system/nix/nvim/cmp.nix b/hosts/default/editors/nvim/cmp.nix similarity index 100% rename from hosts/default/modules/system/nix/nvim/cmp.nix rename to hosts/default/editors/nvim/cmp.nix diff --git a/hosts/default/modules/system/nix/nvim/default.nix b/hosts/default/editors/nvim/default.nix similarity index 100% rename from hosts/default/modules/system/nix/nvim/default.nix rename to hosts/default/editors/nvim/default.nix diff --git a/hosts/default/modules/system/nix/nvim/extraPlugins.nix b/hosts/default/editors/nvim/extraPlugins.nix similarity index 100% rename from hosts/default/modules/system/nix/nvim/extraPlugins.nix rename to hosts/default/editors/nvim/extraPlugins.nix diff --git a/hosts/default/modules/system/nix/nvim/lsp.nix b/hosts/default/editors/nvim/lsp.nix similarity index 100% rename from hosts/default/modules/system/nix/nvim/lsp.nix rename to hosts/default/editors/nvim/lsp.nix diff --git a/hosts/default/modules/system/nix/nvim/lualine.nix b/hosts/default/editors/nvim/lualine.nix similarity index 100% rename from hosts/default/modules/system/nix/nvim/lualine.nix rename to hosts/default/editors/nvim/lualine.nix diff --git a/hosts/default/modules/system/nix/nvim/neotree.nix b/hosts/default/editors/nvim/neotree.nix similarity index 100% rename from hosts/default/modules/system/nix/nvim/neotree.nix rename to hosts/default/editors/nvim/neotree.nix diff --git a/hosts/default/modules/system/nix/nvim/raw/cmp.lua b/hosts/default/editors/nvim/raw/cmp.lua similarity index 100% rename from hosts/default/modules/system/nix/nvim/raw/cmp.lua rename to hosts/default/editors/nvim/raw/cmp.lua diff --git a/hosts/default/modules/system/nix/nvim/raw/opts.lua b/hosts/default/editors/nvim/raw/opts.lua similarity index 100% rename from hosts/default/modules/system/nix/nvim/raw/opts.lua rename to hosts/default/editors/nvim/raw/opts.lua diff --git a/hosts/default/modules/system/nix/nvim/snip.nix b/hosts/default/editors/nvim/snip.nix similarity index 100% rename from hosts/default/modules/system/nix/nvim/snip.nix rename to hosts/default/editors/nvim/snip.nix diff --git a/hosts/default/modules/system/nix/nvim/terminal.nix b/hosts/default/editors/nvim/terminal.nix similarity index 100% rename from hosts/default/modules/system/nix/nvim/terminal.nix rename to hosts/default/editors/nvim/terminal.nix diff --git a/hosts/default/modules/system/nix/x/dwm/default.nix b/hosts/default/windowManager/dwm/default.nix similarity index 100% rename from hosts/default/modules/system/nix/x/dwm/default.nix rename to hosts/default/windowManager/dwm/default.nix diff --git a/hosts/default/modules/system/nix/x/dwm/source/dwm/Makefile b/hosts/default/windowManager/dwm/source/dwm/Makefile similarity index 100% rename from hosts/default/modules/system/nix/x/dwm/source/dwm/Makefile rename to hosts/default/windowManager/dwm/source/dwm/Makefile diff --git a/hosts/default/modules/system/nix/x/dwm/source/dwm/config.def.h b/hosts/default/windowManager/dwm/source/dwm/config.def.h similarity index 100% rename from hosts/default/modules/system/nix/x/dwm/source/dwm/config.def.h rename to hosts/default/windowManager/dwm/source/dwm/config.def.h diff --git a/hosts/default/modules/system/nix/x/dwm/source/dwm/config.mk b/hosts/default/windowManager/dwm/source/dwm/config.mk similarity index 100% rename from hosts/default/modules/system/nix/x/dwm/source/dwm/config.mk rename to hosts/default/windowManager/dwm/source/dwm/config.mk diff --git a/hosts/default/modules/system/nix/x/dwm/source/dwm/drw.c b/hosts/default/windowManager/dwm/source/dwm/drw.c similarity index 100% rename from hosts/default/modules/system/nix/x/dwm/source/dwm/drw.c rename to hosts/default/windowManager/dwm/source/dwm/drw.c diff --git a/hosts/default/modules/system/nix/x/dwm/source/dwm/drw.h b/hosts/default/windowManager/dwm/source/dwm/drw.h similarity index 100% rename from hosts/default/modules/system/nix/x/dwm/source/dwm/drw.h rename to hosts/default/windowManager/dwm/source/dwm/drw.h diff --git a/hosts/default/modules/system/nix/x/dwm/source/dwm/dwm.1 b/hosts/default/windowManager/dwm/source/dwm/dwm.1 similarity index 100% rename from hosts/default/modules/system/nix/x/dwm/source/dwm/dwm.1 rename to hosts/default/windowManager/dwm/source/dwm/dwm.1 diff --git a/hosts/default/modules/system/nix/x/dwm/source/dwm/dwm.c b/hosts/default/windowManager/dwm/source/dwm/dwm.c similarity index 100% rename from hosts/default/modules/system/nix/x/dwm/source/dwm/dwm.c rename to hosts/default/windowManager/dwm/source/dwm/dwm.c diff --git a/hosts/default/modules/system/nix/x/dwm/source/dwm/transient.c b/hosts/default/windowManager/dwm/source/dwm/transient.c similarity index 100% rename from hosts/default/modules/system/nix/x/dwm/source/dwm/transient.c rename to hosts/default/windowManager/dwm/source/dwm/transient.c diff --git a/hosts/default/modules/system/nix/x/dwm/source/dwm/util.c b/hosts/default/windowManager/dwm/source/dwm/util.c similarity index 100% rename from hosts/default/modules/system/nix/x/dwm/source/dwm/util.c rename to hosts/default/windowManager/dwm/source/dwm/util.c diff --git a/hosts/default/modules/system/nix/x/dwm/source/dwm/util.h b/hosts/default/windowManager/dwm/source/dwm/util.h similarity index 100% rename from hosts/default/modules/system/nix/x/dwm/source/dwm/util.h rename to hosts/default/windowManager/dwm/source/dwm/util.h diff --git a/hosts/default/modules/system/nix/x/dwm/source/dwm/vanitygaps.c b/hosts/default/windowManager/dwm/source/dwm/vanitygaps.c similarity index 100% rename from hosts/default/modules/system/nix/x/dwm/source/dwm/vanitygaps.c rename to hosts/default/windowManager/dwm/source/dwm/vanitygaps.c diff --git a/hosts/default/modules/home/nix/sway/default.nix b/hosts/default/windowManager/sway/default.nix similarity index 100% rename from hosts/default/modules/home/nix/sway/default.nix rename to hosts/default/windowManager/sway/default.nix diff --git a/hosts/default/modules/home/nix/sway/raw/config b/hosts/default/windowManager/sway/raw/config similarity index 100% rename from hosts/default/modules/home/nix/sway/raw/config rename to hosts/default/windowManager/sway/raw/config diff --git a/hosts/default/modules/home/nix/sway/raw/config.rasi b/hosts/default/windowManager/sway/raw/config.rasi similarity index 100% rename from hosts/default/modules/home/nix/sway/raw/config.rasi rename to hosts/default/windowManager/sway/raw/config.rasi diff --git a/hosts/default/modules/home/nix/sway/raw/style.css b/hosts/default/windowManager/sway/raw/style.css similarity index 100% rename from hosts/default/modules/home/nix/sway/raw/style.css rename to hosts/default/windowManager/sway/raw/style.css diff --git a/hosts/default/modules/home/nix/sway/sway.nix b/hosts/default/windowManager/sway/sway.nix similarity index 100% rename from hosts/default/modules/home/nix/sway/sway.nix rename to hosts/default/windowManager/sway/sway.nix diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 9d048c1..c3bdfb6 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -18,11 +18,17 @@ ]; }; }; - nix.settings.experimental-features = [ - "nix-command" - "flakes" - ]; - + nix = { + gc = { + automatic = true; + dates = "daily"; + options = "--delete-older-than 3d"; + }; + settings.experimental-features = [ + "nix-command" + "flakes" + ]; + }; systemd = { services = { modem-manager.enable = false; diff --git a/hosts/laptop/modules/home/nix/alacritty.nix b/hosts/laptop/modules/home/nix/alacritty.nix index 3f86646..fdb6c9c 100644 --- a/hosts/laptop/modules/home/nix/alacritty.nix +++ b/hosts/laptop/modules/home/nix/alacritty.nix @@ -1,49 +1,48 @@ { config, pkgs, ... }: { programs.alacritty = { - enable = true; - settings = { - window.dimensions = { - lines = 4; - columns = 200; - }; - font = { - size = 17; - normal = { - family = "TerminessNerdFont"; - style = "Regular"; + enable = true; + settings = { + window.dimensions = { + lines = 4; + columns = 200; }; - }; - terminal = { - shell = "tmux"; - }; - colors = { - primary = { - foreground = "#f2f4f8"; - background = "#121212"; + font = { + size = 15; + normal = { + family = "TerminessNerdFont"; + style = "Regular"; + }; }; - normal = { - black = "#121212"; - red = "#ee5396"; - green = "#25be6a"; - yellow = "#08bdba"; - blue = "#78a9ff"; - magenta = "#be95ff"; - cyan = "#33b1ff"; - white = "#dfdfe0"; + terminal = { + shell = "tmux"; }; - bright = { - black = "#525252"; - red = "#ff7eb6"; - green = "#42be65"; - yellow = "#3ddbd9"; - blue = "#82cfff"; - magenta = "#df99ff"; - cyan = "#6ea6ff"; - white = "#ffffff"; + colors = { + primary = { + foreground = "#f2f4f8"; + background = "#121212"; + }; + normal = { + black = "#121212"; + red = "#ee5396"; + green = "#25be6a"; + yellow = "#08bdba"; + blue = "#78a9ff"; + magenta = "#be95ff"; + cyan = "#33b1ff"; + white = "#dfdfe0"; + }; + bright = { + black = "#525252"; + red = "#ff7eb6"; + green = "#42be65"; + yellow = "#3ddbd9"; + blue = "#82cfff"; + magenta = "#df99ff"; + cyan = "#6ea6ff"; + white = "#ffffff"; + }; }; }; }; -}; - } diff --git a/hosts/laptop/modules/home/nix/shell.nix b/hosts/laptop/modules/home/nix/shell.nix index 3bf2198..1f6fa6e 100644 --- a/hosts/laptop/modules/home/nix/shell.nix +++ b/hosts/laptop/modules/home/nix/shell.nix @@ -24,29 +24,14 @@ cp = "cp -rv"; mv = "mv -v"; mkdir = "mkdir -pv"; - update = "sudo nixos-rebuild switch --flake /etc/nixos#poggers --impure"; + update-default = "sudo nixos-rebuild switch --flake /etc/nixos#default --impure"; + update-laptop = "sudo nixos-rebuild switch --flake /etc/nixos#laptop --impure"; }; plugins = [ - { - name = "z"; - src = pkgs.fishPlugins.z.src; - } - { - name = "pisces"; - src = pkgs.fishPlugins.pisces.src; - } { name = "fzf-fish"; src = pkgs.fishPlugins.fzf-fish.src; } - { - name = "hydro"; - src = pkgs.fishPlugins.hydro.src; - } - { - name = "grc"; - src = pkgs.fishPlugins.grc.src; - } { name = "git-abbr"; src = pkgs.fishPlugins.git-abbr.src; @@ -59,10 +44,6 @@ name = "colored-man-pages"; src = pkgs.fishPlugins.colored-man-pages.src; } - { - name = "bobthefisher"; - src = pkgs.fishPlugins.bobthefisher.src; - } ]; }; diff --git a/hosts/laptop/modules/home/nix/sway/default.nix b/hosts/laptop/modules/home/nix/sway/default.nix deleted file mode 100644 index 8667e9f..0000000 --- a/hosts/laptop/modules/home/nix/sway/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ config, pkgs, ... }: -{ - imports = [ - ./sway.nix - ]; - home = { - packages = with pkgs; [ - waybar - swaybg - slurp - grim - ]; - file = { - ".config/rofi/config.rasi".source = ./raw/config.rasi; - ".config/waybar/style.css".source = ./raw/style.css; - ".config/waybar/config".source = ./raw/config; - }; - }; -} diff --git a/hosts/laptop/modules/home/nix/sway/raw/config b/hosts/laptop/modules/home/nix/sway/raw/config deleted file mode 100644 index 7b1b733..0000000 --- a/hosts/laptop/modules/home/nix/sway/raw/config +++ /dev/null @@ -1,189 +0,0 @@ -[ - { - "battery": { - "format": "{icon} {capacity}%", - "format-alt": "{icon} {time}", - "format-charging": " {capacity}%", - "format-icons": [ - "", - "", - "", - "", - "" - ], - "format-plugged": " {capacity}% ", - "states": { - "critical": 15, - "good": 95, - "warning": 30 - } - }, - "cava#left": { - "autosens": 1, - "bar_delimiter": 0, - "bars": 18, - "format-icons": [ - "▁", - "▂", - "▃", - "▄", - "▅", - "▆", - "▇", - "█" - ], - "framerate": 60, - "higher_cutoff_freq": 10000, - "input_delay": 2, - "lower_cutoff_freq": 50, - "method": "pulse", - "monstercat": false, - "reverse": false, - "source": "auto", - "stereo": true, - "waves": false - }, - "cava#right": { - "autosens": 1, - "bar_delimiter": 0, - "bars": 18, - "format-icons": [ - "▁", - "▂", - "▃", - "▄", - "▅", - "▆", - "▇", - "█" - ], - "framerate": 60, - "higher_cutoff_freq": 10000, - "input_delay": 2, - "lower_cutoff_freq": 50, - "method": "pulse", - "monstercat": false, - "reverse": false, - "source": "auto", - "stereo": true, - "waves": false - }, - "clock": { - "format": " {:%a, %d %b, %I:%M %p}", - "format-alt": " {:%d/%m}", - "tooltip": "true", - "tooltip-format": "{:%Y %B}\n{calendar}" - }, - "cpu": { - "format": "󰻠 {usage}%", - "format-alt": "󰻠 {avg_frequency} GHz", - "interval": 5 - }, - "custom/launcher": { - "format": "", - "tooltip": "false" - }, - "custom/playerctl#backward": { - "format": "󰙣 ", - "on-click": "playerctl previous", - "on-scroll-down": "playerctl volume .05-", - "on-scroll-up": "playerctl volume .05+" - }, - "custom/playerctl#foward": { - "format": "󰙡 ", - "on-click": "playerctl next", - "on-scroll-down": "playerctl volume .05-", - "on-scroll-up": "playerctl volume .05+" - }, - "custom/playerctl#play": { - "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F", - "format": "{icon}", - "format-icons": { - "Paused": "", - "Playing": "󰏥 ", - "Stopped": "" - }, - "on-click": "playerctl play-pause", - "on-scroll-down": "playerctl volume .05-", - "on-scroll-up": "playerctl volume .05+", - "return-type": "json" - }, - "custom/playerlabel": { - "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F", - "format": "󰎈 {} 󰎈", - "max-length": 40, - "on-click": "", - "return-type": "json" - }, - "custom/randwall": { - "format": "󰏘" - }, - "height": 35, - "layer": "top", - "margin-bottom": 0, - "margin-left": 0, - "margin-right": 0, - "margin-top": 0, - "memory": { - "format": "󰍛 {}%", - "format-alt": "󰍛 {used}/{total} GiB", - "interval": 5 - }, - "modules-center": [ - "custom/playerlabel", - ], - "modules-left": [ - "cava#left", - "custom/playerctl#backward", - "custom/playerctl#play", - "custom/playerctl#foward", - ], - "modules-right": [ - "tray", - "battery", - "pulseaudio", - "network", - ], - - "network": { - "format-disconnected": "󰖪 0% ", - "format-ethernet": "󰈀 100% ", - "format-linked": "{ifname} (No IP)", - "format-wifi": " {signalStrength}%", - "tooltip-format": "Connected to {essid} {ifname} via {gwaddr}" - }, - "position": "top", - "pulseaudio": { - "format": "{icon} {volume}%", - "format-icons": { - "default": [ - "󰕿", - "󰖀", - "󰕾" - ] - }, - "format-muted": "󰝟", - "on-click": "pavucontrol", - "scroll-step": 5 - }, - "tray": { - "icon-size": 20, - "spacing": 8 - }, - "wlr/workspaces": { - "active-only": false, - "all-outputs": false, - "disable-scroll": false, - "format": "{name}", - "format-icons": { - "active": "", - "default": "", - "sort-by-number": true, - "urgent": "" - }, - "on-click": "activate", - "on-scroll-down": "hyprctl dispatch workspace e+1", - "on-scroll-up": "hyprctl dispatch workspace e-1" - } - } -] diff --git a/hosts/laptop/modules/home/nix/sway/raw/config.rasi b/hosts/laptop/modules/home/nix/sway/raw/config.rasi deleted file mode 100644 index f1ab9c7..0000000 --- a/hosts/laptop/modules/home/nix/sway/raw/config.rasi +++ /dev/null @@ -1,76 +0,0 @@ -configuration { - display-drun: "Applications:"; - drun-display-format: "{icon} {name}"; - font: "JetBrainsMono Nerd Font Medium 10"; - show-icons: true; - modi: "drun"; -} - -@theme "/dev/null" - -* { - - opacity: 0.5; - color0: #39305320; - color1: #494d6420; - color3: #d8dee9; - color4: #7b68ee; - color5: #cbe3e7; - - - background-color: transparent; - text-color: @color3; - accent-color: @color5; - - margin: 0px; - border: 0px; - padding: 0px; - spacing: 0px; -} - -window { - background-color: @color0; - border-color: @accent-color; - - width: 50%; - border: 2px; -} - -inputbar { - padding: 10px 12px; - spacing: 12px; - children: [ prompt, entry ]; -} - -prompt, entry, element-text, element-icon { - vertical-align: 0.5; -} - -prompt { - text-color: @accent-color; - enabled: true; - text-color: @color4; -} - -listview { - lines: 8; - columns: 2; - -} - -element { - padding: 8px; - spacing: 8px; -} - -element selected { - text-color: @color4; -} - -element-icon { - size: 20; -} - -element-text { - text-color: inherit; -} diff --git a/hosts/laptop/modules/home/nix/sway/raw/style.css b/hosts/laptop/modules/home/nix/sway/raw/style.css deleted file mode 100644 index a1f056e..0000000 --- a/hosts/laptop/modules/home/nix/sway/raw/style.css +++ /dev/null @@ -1,134 +0,0 @@ -* { - border: none; - border-radius: 0px; - font-family: RobotoMono Nerd Font; - font-size: 14px; - min-height: 0; -} - -window#waybar { - /* background: rgba(17,17,27,1); */ - background: transparent; -} - -#cava.left, #cava.right { - /* background: #25253a; */ - - /*background: #25253a;*/ - background: #010101; - margin: 5px; - padding: 8px 16px; - color: #cba6f7; -} -#cava.left { - border-radius: 24px 24px 24px 24px; -} -#cava.right { - border-radius: 10px 24px 10px 24px; -} -#workspaces { - background: #11111b; - margin: 5px 5px; - padding: 8px 5px; - border-radius: 16px; - color: #cba6f7 -} -#workspaces button { - padding: 0px 5px; - margin: 0px 3px; - border-radius: 16px; - color: transparent; - background: rgba(17,17,27,1); - transition: all 0.3s ease-in-out; -} - -#workspaces button.active { - background-color: #89b4fa; - color: #11111B; - border-radius: 16px; - min-width: 50px; - background-size: 400% 400%; - transition: all 0.3s ease-in-out; -} - -#workspaces button:hover { - background-color: #f5f5f5; - color: #11111B; - border-radius: 16px; - min-width: 50px; - background-size: 400% 400%; -} - -#tray, #pulseaudio, #network, #battery, -#custom-playerctl.backward, #custom-playerctl.play, #custom-playerctl.foward{ - background: #010101; - font-weight: bold; - margin: 5px 0px; - opacity: 1; -} -#tray, #pulseaudio, #network, #battery{ - color: #f5f5f5; - border-radius: 24px 24px 24px 24px; - padding: 0 20px; - margin-left: 7px; -} -#clock { - color: #f5f5f5; - background: #010101; - border-radius: 0px 0px 0px 40px; - padding: 10px 10px 15px 25px; - margin-left: 7px; - font-weight: bold; - font-size: 16px; -} -#custom-launcher { - color: #89b4fa; - background: #010101; - border-radius: 0px 0px 40px 0px; - margin: 0px; - padding: 0px 35px 0px 15px; - font-size: 28px; -} - -#custom-playerctl.backward, #custom-playerctl.play, #custom-playerctl.foward { - background: #010101; - font-size: 22px; -} -#custom-playerctl.backward:hover, #custom-playerctl.play:hover, #custom-playerctl.foward:hover{ - color: #f5f5f5; -} -#custom-playerctl.backward { - color: #cba6f7; - border-radius: 24px 0px 0px 24px; - padding-left: 16px; - margin-left: 7px; -} -#custom-playerctl.play { - color: #89b4fa; - padding: 0 5px; -} -#custom-playerctl.foward { - color: #cba6f7; - border-radius: 0px 24px 24px 0px; - padding-right: 12px; - margin-right: 7px -} -#custom-playerlabel { - background: #010101; - color: #f5f5f5; - padding: 0 20px; - border-radius: 24px 24px 24px 24px; - margin: 5px 0; - font-weight: bold; -} -#window{ - /*background: #25253a; */ - padding-left: 15px; - padding-right: 15px; - border-radius: 16px; - margin-top: 5px; - margin-bottom: 5px; - font-weight: normal; - font-style: normal; - opacity: 0.1; -} diff --git a/hosts/laptop/modules/home/nix/sway/sway.nix b/hosts/laptop/modules/home/nix/sway/sway.nix deleted file mode 100644 index 837b3e9..0000000 --- a/hosts/laptop/modules/home/nix/sway/sway.nix +++ /dev/null @@ -1,109 +0,0 @@ -{config, pkgs, ... }: -{ - wayland.windowManager.sway = { - enable = true; - xwayland = true; - package = pkgs.swayfx-unwrapped; - wrapperFeatures.gtk = true; - checkConfig = false; - extraSessionCommands = '' - export _JAVA_AWT_WM_NONREPARENTING=1 - export QT_QPA_PLATFORM=wayland - export XDG_CURRENT_DESKTOP=sway - ''; - - config = rec { - modifier = "Mod4"; - terminal = "alacritty"; - menu = "${pkgs.rofi}/bin/rofi -show run -c .config/rofi/config.rasi"; - startup = [ - {command = "swaybg -i $HOME/.wp/soyuz.png";} - ]; - bars = [{ command = "waybar"; }]; - gaps = { - outer = 5; - inner = 10; - }; - - window = { - border = 0; - }; - - keybindings = { - # IMPORTANT STUFF # - "${modifier}+Return" = "exec ${terminal}"; - "${modifier}+space" = "exec ${menu}"; - "${modifier}+Q" = "kill"; - "${modifier}+Shift+R" = "reload"; - "${modifier}+Shift+S" = "${pkgs.grim}/bin/grim -g '$(${pkgs.slurp}/bin/slurp)'"; - # WINDOW STUFF # - "${modifier}+Shift+space" = "floating toggle"; - "${modifier}+Shift+F" = "fullscreen toggle"; - "${modifier}+Left" = "focus left"; - "${modifier}+Down" = "focus down"; - "${modifier}+Up" = "focus up"; - "${modifier}+Right" = "focus right"; - - "${modifier}+Ctrl+Right" = "resize shrink width 3 px or 3 ppt"; - "${modifier}+Ctrl+Down" = "resize grow height 3 px or 3 ppt"; - "${modifier}+Ctrl+Up" = "resize shrink height 3 px or 3 ppt"; - "${modifier}+Ctrl+Left" = "resize grow width 3 px or 3 ppt"; - - "${modifier}+Shift+Left" = "move left"; - "${modifier}+Shift+Down" = "move down"; - "${modifier}+Shift+Up" = "move up"; - "${modifier}+Shift+Right" = "move right"; - - # WORKSPACES # - "${modifier}+1" = "workspace number 1"; - "${modifier}+2" = "workspace number 2"; - "${modifier}+3" = "workspace number 3"; - "${modifier}+4" = "workspace number 4"; - "${modifier}+5" = "workspace number 5"; - "${modifier}+6" = "workspace number 6"; - "${modifier}+7" = "workspace number 7"; - "${modifier}+8" = "workspace number 8"; - "${modifier}+9" = "workspace number 9"; - - # MOVE WINDOW TO OTHER WS # - "${modifier}+Shift+1" = "move container to workspace number 1"; - "${modifier}+Shift+2" = "move container to workspace number 2"; - "${modifier}+Shift+3" = "move container to workspace number 3"; - "${modifier}+Shift+4" = "move container to workspace number 4"; - "${modifier}+Shift+5" = "move container to workspace number 5"; - "${modifier}+Shift+6" = "move container to workspace number 6"; - "${modifier}+Shift+7" = "move container to workspace number 7"; - "${modifier}+Shift+8" = "move container to workspace number 8"; - "${modifier}+Shift+9" = "move container to workspace number 9"; - - # Audio - "XF86AudioRaiseVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +10%"; - "XF86AudioLowerVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -10%"; - "XF86AudioMute" = "exec ${pkgs.pulseaudio}/bin/pactl set-volume toggle-mute"; - "XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl stop"; - "XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous"; - "XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next"; - "XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause"; - - "XF86MonBrightnessDown" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set 15%-"; - "XF86MonBrightnessUp" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set +15%"; - }; - }; - - extraConfig = '' - shadows enable - corner_radius 12 - blur_radius 7 - blur_passes 4 - default_dim_inactive 0.2 - - for_window [app_id="wezterm"] blur enable - for_window [app_id="code"] blur enable - for_window [app_id="rofi"] blur enable - - default_border pixel 0px - default_floating_border none - titlebar_border_thickness 0 - ''; - }; -} diff --git a/hosts/laptop/modules/system/nix/default.nix b/hosts/laptop/modules/system/nix/default.nix index 0c69b63..2ebdfd1 100644 --- a/hosts/laptop/modules/system/nix/default.nix +++ b/hosts/laptop/modules/system/nix/default.nix @@ -4,17 +4,17 @@ ... }: { imports = [ - ./x/dwm/default.nix - ./nvim/default.nix + ../../../../default/windowManager/dwm/default.nix + ../../../../default/editors/nvim/default.nix ./networking.nix ./users.nix ./services.nix - ./gaming.nix ./firefox.nix ./pkgs.nix ./sec.nix ./virt.nix ./boot.nix ./hw.nix + ./fingerprint.nix ]; } diff --git a/hosts/laptop/modules/system/nix/fingerprint.nix b/hosts/laptop/modules/system/nix/fingerprint.nix new file mode 100644 index 0000000..0cb3c4a --- /dev/null +++ b/hosts/laptop/modules/system/nix/fingerprint.nix @@ -0,0 +1,6 @@ +{ config, pkgs, ... }: +{ + services.fprintd = { + enable = true; + }; +} diff --git a/hosts/laptop/modules/system/nix/gaming.nix b/hosts/laptop/modules/system/nix/gaming.nix deleted file mode 100644 index 979af86..0000000 --- a/hosts/laptop/modules/system/nix/gaming.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - config, - pkgs, - ... -}: -{ - programs = { - steam = { - enable = true; - }; - }; -} diff --git a/hosts/laptop/modules/system/nix/nvim/cmp.nix b/hosts/laptop/modules/system/nix/nvim/cmp.nix deleted file mode 100644 index 64e5b6b..0000000 --- a/hosts/laptop/modules/system/nix/nvim/cmp.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - pkgs, - lib, - ... -}: { - programs.nvf.settings.vim = { - extraLuaFiles = [ - (builtins.path { - path = ./raw/cmp.lua; - name = "my-lua-file"; - }) - ]; - autocomplete = { - nvim-cmp = { - enable = true; - setupOpts = { - completion = { - completeopt = "menu,menuone,noinsert,noselect"; - }; - }; - #sourcePlugins = [ - # "crates-nvim" - # "cmp-nvim-lsp" - # "rustaceanvim" - #]; - }; - }; - }; -} diff --git a/hosts/laptop/modules/system/nix/nvim/default.nix b/hosts/laptop/modules/system/nix/nvim/default.nix deleted file mode 100644 index fa2ae1d..0000000 --- a/hosts/laptop/modules/system/nix/nvim/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - pkgs, - lib, - ... -}: { - imports = [ - ./lsp.nix - ./terminal.nix - ./neotree.nix - ./cmp.nix - ./lualine.nix - ./snip.nix - ./extraPlugins.nix - ]; - programs.nvf = { - enable = true; - settings = { - vim = { - ui = { - noice = { - enable = true; - }; - }; - extraLuaFiles = [ - (builtins.path { - path = ./raw/opts.lua; - name = "opts.lua"; - }) - ]; - autopairs.nvim-autopairs.enable = true; - telescope.enable = true; - theme = { - enable = true; - name = "oxocarbon"; - style = "dark"; - }; - }; - }; - }; -} - diff --git a/hosts/laptop/modules/system/nix/nvim/extraPlugins.nix b/hosts/laptop/modules/system/nix/nvim/extraPlugins.nix deleted file mode 100644 index 845d9b4..0000000 --- a/hosts/laptop/modules/system/nix/nvim/extraPlugins.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, lib, ... }: -{ - programs.nvf.settings.vim = { - extraPlugins = with pkgs; { - neocord = { - package = vimPlugins.neocord; - setup = "require('neocord').setup {}"; - }; - }; - }; -} diff --git a/hosts/laptop/modules/system/nix/nvim/lsp.nix b/hosts/laptop/modules/system/nix/nvim/lsp.nix deleted file mode 100644 index a8c2dbd..0000000 --- a/hosts/laptop/modules/system/nix/nvim/lsp.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - pkgs, - lib, - ... -}: { - programs.nvf.settings.vim = { - languages = { - clang = { - enable = true; - dap.enable = true; - treesitter.enable = true; - lsp.enable = true; - }; - python = { - enable = true; - lsp.enable = true; - treesitter.enable = true; - }; - go = { - enable = true; - lsp.enable = true; - treesitter.enable = true; - }; - lua = { - enable = true; - }; - rust = { - enable = true; - dap.enable = true; - format.enable = true; - lsp.enable = true; - }; - html = { - enable = true; - treesitter = { - enable = true; - autotagHtml = true; - }; - }; - css = { - enable = true; - treesitter.enable = true; - lsp.enable = true; - }; - assembly = { - enable = true; - lsp.enable = true; - treesitter.enable = true; - }; - bash = { - enable = true; - lsp.enable = true; - treesitter.enable = true; - }; - ts = { - enable = true; - extraDiagnostics.enable = true; - treesitter.enable = true; - lsp.enable = true; - }; - nix = { - enable = true; - extraDiagnostics = { - enable = true; - }; - format = { - enable = true; - type = "alejandra"; - }; - lsp.enable = true; - treesitter.enable = true; - }; - }; - lsp = { - trouble = { - enable = true; - }; - }; - }; -} diff --git a/hosts/laptop/modules/system/nix/nvim/lualine.nix b/hosts/laptop/modules/system/nix/nvim/lualine.nix deleted file mode 100644 index c86ffeb..0000000 --- a/hosts/laptop/modules/system/nix/nvim/lualine.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ pkgs, lib, ... }: -{ - programs.nvf.settings.vim = { - statusline = { - lualine = { - enable = true; - theme = "oxocarbon"; - globalStatus = true; - icons.enable = true; - ignoreFocus = [ - "neo-tree" - "filename" - "location" - ]; - componentSeparator = { - left = ""; - right = ""; - }; - sectionSeparator = { - left = ""; - right = ""; - }; - }; - }; - }; -} diff --git a/hosts/laptop/modules/system/nix/nvim/neotree.nix b/hosts/laptop/modules/system/nix/nvim/neotree.nix deleted file mode 100644 index 0605dde..0000000 --- a/hosts/laptop/modules/system/nix/nvim/neotree.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - pkgs, - lib, - ... -}: { - programs.nvf.settings.vim = { - filetree = { - neo-tree = { - enable = true; - setupOpts = { - enable = true; - enable_git_status = true; - enable_diagnostics = true; - enable_refresh_on_write = true; - auto_clean_after_session_restore = true; - git_status_async = true; - }; - }; - }; - }; -} diff --git a/hosts/laptop/modules/system/nix/nvim/raw/cmp.lua b/hosts/laptop/modules/system/nix/nvim/raw/cmp.lua deleted file mode 100644 index 187207c..0000000 --- a/hosts/laptop/modules/system/nix/nvim/raw/cmp.lua +++ /dev/null @@ -1,59 +0,0 @@ -local cmp = require("cmp") -vim.opt.completeopt = { "menu", "menuone", "noinsert", "noselect" } -cmp.setup({ - snippet = { - expand = function(args) - require('luasnip').lsp_expand(args.body) - end, - }, - sorting = { - comparators = { - cmp.config.compare.offset, - cmp.config.compare.exact, - cmp.config.compare.recently_used, - cmp.config.compare.kind, - cmp.config.compare.sort_text, - cmp.config.compare.length, - cmp.config.compare.order, - }, - }, - window = { - completion = cmp.config.window.bordered(), - documentation = cmp.config.window.bordered(), - }, - mapping = cmp.mapping.preset.insert({ - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - else - fallback() - end - end, { "i", "s" }), - - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - else - fallback() - end - end, { "i", "s" }), - - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.abort(), - [""] = cmp.mapping.abort(), - [""] = cmp.mapping.confirm({ select = false }), - }), - sources = cmp.config.sources({ - { name = 'nvim_lsp' }, - { name = 'luasnip' }, - { name = 'buffer' }, - { name = 'path' }, - { name = 'nvim_lua' }, - { name = 'emoji' }, - }), - highlight = { - default = "Subtle" - }, -}) diff --git a/hosts/laptop/modules/system/nix/nvim/raw/opts.lua b/hosts/laptop/modules/system/nix/nvim/raw/opts.lua deleted file mode 100644 index d8fff10..0000000 --- a/hosts/laptop/modules/system/nix/nvim/raw/opts.lua +++ /dev/null @@ -1,40 +0,0 @@ -vim.opt.shiftwidth = 4 -vim.opt.tabstop = 4 -vim.opt.cursorline = true -vim.opt.cursorcolumn = true -vim.opt.expandtab = true -vim.opt.autoindent = true -vim.opt.smartindent = true -vim.opt.softtabstop = 4 -vim.opt.relativenumber = true - -vim.diagnostic.config({ - virtual_text = true, - virtual_lines = true, -}) - -local map = vim.api.nvim_set_keymap -local opts = { noremap = true, silent = true } - -vim.g.mapleader = "\\" -map('n', '', ":ToggleTerm size=15", opts) -map('n', '', ":Neotree filesystem reveal toggle", opts) -map('v', '', '>gv', opts) -map('v', '', 'ff', 'Telescope find_files', opts) -map('n', 'gs', 'Telescope grep_string', opts) - -vim.cmd [[ - set nobackup - cnoreabbrev W! w! - cnoreabbrev Q! q! - cnoreabbrev Qall! qall! - cnoreabbrev Wq wq - cnoreabbrev Wa wa - cnoreabbrev wQ wq - cnoreabbrev WQ wq - cnoreabbrev W w - cnoreabbrev Q q - cnoreabbrev Qall qall -]] - diff --git a/hosts/laptop/modules/system/nix/nvim/snip.nix b/hosts/laptop/modules/system/nix/nvim/snip.nix deleted file mode 100644 index b39c07b..0000000 --- a/hosts/laptop/modules/system/nix/nvim/snip.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ pkgs, lib,...}: -{ - programs.nvf.settings.vim = { - snippets = { - luasnip = { - enable = true; - loaders = "require('luasnip.loaders.from_snipmate').lazy_load()"; - #providers = [ - # "friendly-snippets" - # "crates-nvim" - # "lspkind" - # "lspsaga" - # "rustaceanvim" - #]; - setupOpts = { - enable_autosnippets = false; - }; - }; - }; - }; -} diff --git a/hosts/laptop/modules/system/nix/nvim/terminal.nix b/hosts/laptop/modules/system/nix/nvim/terminal.nix deleted file mode 100644 index f6d0436..0000000 --- a/hosts/laptop/modules/system/nix/nvim/terminal.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - pkgs, - lib, - ... -}: { - programs.nvf.settings.vim = { - terminal = { - toggleterm = { - enable = true; - lazygit.enable = true; - }; - }; - }; -} diff --git a/hosts/laptop/modules/system/nix/pkgs.nix b/hosts/laptop/modules/system/nix/pkgs.nix index 7b0df4a..fc1e249 100644 --- a/hosts/laptop/modules/system/nix/pkgs.nix +++ b/hosts/laptop/modules/system/nix/pkgs.nix @@ -105,7 +105,7 @@ fonts = { fontconfig.enable = true; packages = with pkgs; [ - terminus-nerdfont + noto-fonts noto-fonts-emoji liberation_ttf @@ -115,8 +115,9 @@ mplus-outline-fonts.githubRelease dina-font proggyfonts - pkgs.nerd-fonts._0xproto - pkgs.nerd-fonts.droid-sans-mono + nerd-fonts._0xproto + nerd-fonts.droid-sans-mono + nerd-fonts.terminess-ttf ]; }; diff --git a/hosts/laptop/modules/system/nix/sec.nix b/hosts/laptop/modules/system/nix/sec.nix index a63b7e5..d2d83c2 100644 --- a/hosts/laptop/modules/system/nix/sec.nix +++ b/hosts/laptop/modules/system/nix/sec.nix @@ -1,6 +1,12 @@ { config, pkgs, ... }: { security = { + rtkit = { + enable = true; + }; + polkit = { + enable = true; + }; doas = { enable = true; extraRules = [ @@ -12,4 +18,8 @@ ]; }; }; + environment.systemPackages = with pkgs; [ + polkit + polkit_gnome + ]; } diff --git a/hosts/laptop/modules/system/nix/x/dwm/default.nix b/hosts/laptop/modules/system/nix/x/dwm/default.nix deleted file mode 100644 index f1a7108..0000000 --- a/hosts/laptop/modules/system/nix/x/dwm/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ config, pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - dmenu - ]; - services = { - xserver = { - enable = true; - displayManager.startx.enable = true; - windowManager = { - dwm = { - enable = true; - package = pkgs.dwm.overrideAttrs { - src = ./source/dwm; - }; - }; - }; - }; - }; -} diff --git a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/Makefile b/hosts/laptop/modules/system/nix/x/dwm/source/dwm/Makefile deleted file mode 100644 index 2c9ccc8..0000000 --- a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# dwm - dynamic window manager -# See LICENSE file for copyright and license details. - -include config.mk - -SRC = drw.c dwm.c util.c -OBJ = ${SRC:.c=.o} - -all: dwm - -.c.o: - ${CC} -c ${CFLAGS} $< - -${OBJ}: config.h config.mk - -config.h: - cp config.def.h $@ - -dwm: ${OBJ} - ${CC} -o $@ ${OBJ} ${LDFLAGS} - -clean: - rm -f config.h dwm ${OBJ} dwm-${VERSION}.tar.gz - -dist: clean - mkdir -p dwm-${VERSION} - cp -R LICENSE Makefile README config.def.h config.mk\ - dwm.1 drw.h util.h ${SRC} dwm.png transient.c dwm-${VERSION} - tar -cf dwm-${VERSION}.tar dwm-${VERSION} - gzip dwm-${VERSION}.tar - rm -rf config.h dwm-${VERSION} -install: all - mkdir -p ${DESTDIR}${PREFIX}/bin - cp -f dwm ${DESTDIR}${PREFIX}/bin - chmod 755 ${DESTDIR}${PREFIX}/bin/dwm - mkdir -p ${DESTDIR}${MANPREFIX}/man1 - sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1 - chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1 - -uninstall: - rm -f ${DESTDIR}${PREFIX}/bin/dwm\ - ${DESTDIR}${MANPREFIX}/man1/dwm.1 - -.PHONY: all clean dist install uninstall diff --git a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/config.def.h b/hosts/laptop/modules/system/nix/x/dwm/source/dwm/config.def.h deleted file mode 100644 index 3e6f6cf..0000000 --- a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/config.def.h +++ /dev/null @@ -1,168 +0,0 @@ -static const unsigned int borderpx = 1; /* border pixel of windows */ -static const unsigned int snap = 32; /* snap pixel */ -static const unsigned int gappih = 10; /* horiz inner gap between windows */ -static const unsigned int gappiv = 10; /* vert inner gap between windows */ -static const unsigned int gappoh = - 10; /* horiz outer gap between windows and screen edge */ -static const unsigned int gappov = - 10; /* vert outer gap between windows and screen edge */ -static int smartgaps = - 0; /* 1 means no outer gap when there is only one window */ -static const int showbar = 1; /* 0 means no bar */ -static const int topbar = 1; /* 0 means bottom bar */ -static const char *fonts[] = {"Fantasque Sans Mono:size=10"}; -static const char dmenufont[] = "Fantasque Sans Mono:size=10"; - -//static const char col_gray1[] = "#262626"; -//static const char col_gray2[] = "#ffffff"; -//static const char col_gray3[] = "#dde1e6"; -//static const char col_gray4[] = "#ffffff"; -//static const char col_cyan[] = "#262626"; - -static const char col_gray1[] = "#121212"; -static const char col_gray2[] = "#ffffff"; -static const char col_gray3[] = "#dde1e6"; -static const char col_gray4[] = "#ffffff"; -static const char col_cyan[] = "#121212"; - - -static const char *colors[][3] = { - /* fg bg border */ - [SchemeNorm] = {col_gray3, col_gray1, col_gray1}, - [SchemeSel] = {col_gray4, col_cyan, col_gray2}, -}; - -/* tagging */ -static const char *tags[] = {"1", "2", "3", "4", "5", "6", "7", "8", "9"}; - -static const Rule rules[] = { - {"Gimp", NULL, NULL, 0, 1, -1}, -}; - -/* layout(s) */ -static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ -static const int nmaster = 1; /* number of clients in master area */ -static const int resizehints = - 1; /* 1 means respect size hints in tiled resizals */ -static const int lockfullscreen = - 1; /* 1 will force focus on the fullscreen window */ - -#define FORCE_VSPLIT \ - 1 /* nrowgrid layout: force two clients to always split vertically */ -#include "vanitygaps.c" -#include - -static const Layout layouts[] = { - {"[\\]", dwindle}, - {NULL, centeredfloatingmaster}, - {"|M|", centeredmaster}, - {"[]=", tile}, /* first entry is default */ - {"[M]", monocle}, - {"[@]", spiral}, - {"H[]", deck}, - {"TTT", bstack}, - {"===", bstackhoriz}, - {"HHH", grid}, - {"###", nrowgrid}, - {"---", horizgrid}, - {":::", gaplessgrid}, - {"><>", NULL}, /* no layout function means floating behavior */ - {NULL, NULL}, -}; - -#define MODKEY Mod4Mask - -#define TAGKEYS(KEY, TAG) \ - {MODKEY, KEY, view, {.ui = 1 << TAG}}, \ - {MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}}, \ - {MODKEY | ShiftMask, KEY, tag, {.ui = 1 << TAG}}, \ - {MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}}, - -#define SHCMD(cmd) \ - { \ - .v = (const char *[]) { "/bin/sh", "-c", cmd, NULL } \ - } - -static char dmenumon[2] = - "0"; /* component of dmenucmd, manipulated in spawn() */ -static const char *termcmd[] = {"alacritty", NULL}; -static const char *dmenucmd[] = { - "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, - "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL}; -static const char *upvol[] = {"wpctl", "set-volume", "@DEFAULT_AUDIO_SINK@", - "5%+", NULL}; -static const char *downvol[] = {"wpctl", "set-volume", "@DEFAULT_AUDIO_SINK@", - "5%-", NULL}; -static const char *mutevol[] = {"wpctl", "set-mute", "@DEFAULT_AUDIO_SINK@", - "toggle", NULL}; -static const char *screenshot[] = {"flameshot", "gui", NULL}; - -static const Key keys[] = { - /* modifier key function argument */ - {MODKEY, XK_space, spawn, {.v = dmenucmd}}, - {MODKEY, XK_Return, spawn, {.v = termcmd}}, - {MODKEY|ShiftMask, XK_s, spawn, {.v = screenshot}}, - {MODKEY | ShiftMask, XK_m, quit, {0}}, - {MODKEY, XK_Right, focusstack, {.i = +1}}, - {MODKEY, XK_Left, focusstack, {.i = -1}}, - {MODKEY, XK_i, incnmaster, {.i = +1}}, - {MODKEY, XK_d, incnmaster, {.i = -1}}, - {MODKEY, XK_r, rotatestack, {.i = -1}}, - {MODKEY | ShiftMask, XK_Left, setmfact, {.f = -0.05}}, - {MODKEY | ShiftMask, XK_Right, setmfact, {.f = +0.05}}, - {MODKEY, XK_Tab, view, {0}}, - {MODKEY, XK_q, killclient, {0}}, - {MODKEY | ShiftMask, XK_space, togglefloating, {0}}, - {MODKEY, XK_0, view, {.ui = ~0}}, - {MODKEY | ShiftMask, XK_0, tag, {.ui = ~0}}, - {MODKEY, XK_comma, focusmon, {.i = -1}}, - {MODKEY, XK_period, focusmon, {.i = +1}}, - {MODKEY | ShiftMask, XK_comma, tagmon, {.i = -1}}, - {MODKEY | ShiftMask, XK_period, tagmon, {.i = +1}}, - {MODKEY, XK_b, togglebar, {0}}, - - // Vanity Gaps shit // - {MODKEY | ShiftMask, XK_h, setcfact, {.f = +0.25}}, - {MODKEY | ShiftMask, XK_l, setcfact, {.f = -0.25}}, - {MODKEY | ShiftMask, XK_o, setcfact, {.f = 0.00}}, - {MODKEY | Mod1Mask, XK_u, incrgaps, {.i = +3}}, - {MODKEY | Mod1Mask | ShiftMask, XK_u, incrgaps, {.i = -3}}, - {MODKEY | Mod1Mask, XK_i, incrigaps, {.i = +1}}, - {MODKEY | Mod1Mask | ShiftMask, XK_i, incrigaps, {.i = -1}}, - {MODKEY | Mod1Mask, XK_o, incrogaps, {.i = +1}}, - {MODKEY | Mod1Mask | ShiftMask, XK_o, incrogaps, {.i = -1}}, - {MODKEY | Mod1Mask, XK_6, incrihgaps, {.i = +1}}, - {MODKEY | Mod1Mask | ShiftMask, XK_6, incrihgaps, {.i = -1}}, - {MODKEY | Mod1Mask, XK_7, incrivgaps, {.i = +5}}, - {MODKEY | Mod1Mask | ShiftMask, XK_7, incrivgaps, {.i = -5}}, - {MODKEY | Mod1Mask, XK_8, incrohgaps, {.i = +1}}, - {MODKEY | Mod1Mask | ShiftMask, XK_8, incrohgaps, {.i = -1}}, - {MODKEY | Mod1Mask, XK_9, incrovgaps, {.i = +1}}, - {MODKEY | Mod1Mask | ShiftMask, XK_9, incrovgaps, {.i = -1}}, - {MODKEY | Mod1Mask, XK_0, togglegaps, {0}}, - {MODKEY | Mod1Mask | ShiftMask, XK_0, defaultgaps, {0}}, - - // WS - TAGKEYS(XK_1, 0) TAGKEYS(XK_2, 1) TAGKEYS(XK_3, 2) TAGKEYS(XK_4, 3) - TAGKEYS(XK_5, 4) TAGKEYS(XK_6, 5) TAGKEYS(XK_7, 6) TAGKEYS(XK_8, 7) - TAGKEYS(XK_9, 8) - - // Media Keys // - {0, XF86XK_AudioLowerVolume, spawn, {.v = downvol}}, - {0, XF86XK_AudioMute, spawn, {.v = mutevol}}, - {0, XF86XK_AudioRaiseVolume, spawn, {.v = upvol}}, - -}; - -static const Button buttons[] = { - {ClkLtSymbol, 0, Button1, setlayout, {0}}, - {ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]}}, - {ClkWinTitle, 0, Button2, zoom, {0}}, - {ClkStatusText, 0, Button2, spawn, {.v = termcmd}}, - {ClkClientWin, MODKEY, Button1, movemouse, {0}}, - {ClkClientWin, MODKEY, Button3, resizemouse, {0}}, - {ClkTagBar, 0, Button1, view, {0}}, - {ClkTagBar, 0, Button3, toggleview, {0}}, - {ClkTagBar, MODKEY, Button1, tag, {0}}, - {ClkTagBar, MODKEY, Button3, toggletag, {0}}, -}; diff --git a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/config.mk b/hosts/laptop/modules/system/nix/x/dwm/source/dwm/config.mk deleted file mode 100644 index e8352d1..0000000 --- a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/config.mk +++ /dev/null @@ -1,39 +0,0 @@ -# dwm version -VERSION = 6.5 - -# Customize below to fit your system - -# paths -PREFIX = /usr/local -MANPREFIX = ${PREFIX}/share/man - -X11INC = ${PREFIX}/include -X11LIB = ${PREFIX}/lib - -# Xinerama, comment if you don't want it -XINERAMALIBS = -lXinerama -XINERAMAFLAGS = -DXINERAMA - -# freetype -FREETYPELIBS = -lfontconfig -lXft -FREETYPEINC = ${PREFIX}/include/freetype2 -# OpenBSD (uncomment) -FREETYPEINC = ${X11INC}/freetype2 -MANPREFIX = ${PREFIX}/man - -# includes and libs -INCS = -I${X11INC} -I${FREETYPEINC} -LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} - -# flags -CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} -#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} -CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} -LDFLAGS = ${LIBS} - -# Solaris -#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" -#LDFLAGS = ${LIBS} - -# compiler and linker -CC = cc diff --git a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/drw.c b/hosts/laptop/modules/system/nix/x/dwm/source/dwm/drw.c deleted file mode 100644 index 8f53beb..0000000 --- a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/drw.c +++ /dev/null @@ -1,425 +0,0 @@ -/* See LICENSE file for copyright and license details. */ -#include -#include -#include -#include -#include - -#include "drw.h" -#include "util.h" - -#define UTF_INVALID 0xFFFD -#define UTF_SIZ 4 - -static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0}; -static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, - 0xF8}; -static const long utfmin[UTF_SIZ + 1] = {0, 0, 0x80, 0x800, 0x10000}; -static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, - 0x10FFFF}; - -static long utf8decodebyte(const char c, size_t *i) { - for (*i = 0; *i < (UTF_SIZ + 1); ++(*i)) - if (((unsigned char)c & utfmask[*i]) == utfbyte[*i]) - return (unsigned char)c & ~utfmask[*i]; - return 0; -} - -static size_t utf8validate(long *u, size_t i) { - if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF)) - *u = UTF_INVALID; - for (i = 1; *u > utfmax[i]; ++i) - ; - return i; -} - -static size_t utf8decode(const char *c, long *u, size_t clen) { - size_t i, j, len, type; - long udecoded; - - *u = UTF_INVALID; - if (!clen) - return 0; - udecoded = utf8decodebyte(c[0], &len); - if (!BETWEEN(len, 1, UTF_SIZ)) - return 1; - for (i = 1, j = 1; i < clen && j < len; ++i, ++j) { - udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type); - if (type) - return j; - } - if (j < len) - return 0; - *u = udecoded; - utf8validate(u, len); - - return len; -} - -Drw *drw_create(Display *dpy, int screen, Window root, unsigned int w, - unsigned int h) { - Drw *drw = ecalloc(1, sizeof(Drw)); - - drw->dpy = dpy; - drw->screen = screen; - drw->root = root; - drw->w = w; - drw->h = h; - drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen)); - drw->gc = XCreateGC(dpy, root, 0, NULL); - XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter); - - return drw; -} - -void drw_resize(Drw *drw, unsigned int w, unsigned int h) { - if (!drw) - return; - - drw->w = w; - drw->h = h; - if (drw->drawable) - XFreePixmap(drw->dpy, drw->drawable); - drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, - DefaultDepth(drw->dpy, drw->screen)); -} - -void drw_free(Drw *drw) { - XFreePixmap(drw->dpy, drw->drawable); - XFreeGC(drw->dpy, drw->gc); - drw_fontset_free(drw->fonts); - free(drw); -} - -/* This function is an implementation detail. Library users should use - * drw_fontset_create instead. - */ -static Fnt *xfont_create(Drw *drw, const char *fontname, - FcPattern *fontpattern) { - Fnt *font; - XftFont *xfont = NULL; - FcPattern *pattern = NULL; - - if (fontname) { - /* Using the pattern found at font->xfont->pattern does not yield the - * same substitution results as using the pattern returned by - * FcNameParse; using the latter results in the desired fallback - * behaviour whereas the former just results in missing-character - * rectangles being drawn, at least with some fonts. */ - if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) { - fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname); - return NULL; - } - if (!(pattern = FcNameParse((FcChar8 *)fontname))) { - fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", - fontname); - XftFontClose(drw->dpy, xfont); - return NULL; - } - } else if (fontpattern) { - if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) { - fprintf(stderr, "error, cannot load font from pattern.\n"); - return NULL; - } - } else { - die("no font specified."); - } - - font = ecalloc(1, sizeof(Fnt)); - font->xfont = xfont; - font->pattern = pattern; - font->h = xfont->ascent + xfont->descent; - font->dpy = drw->dpy; - - return font; -} - -static void xfont_free(Fnt *font) { - if (!font) - return; - if (font->pattern) - FcPatternDestroy(font->pattern); - XftFontClose(font->dpy, font->xfont); - free(font); -} - -Fnt *drw_fontset_create(Drw *drw, const char *fonts[], size_t fontcount) { - Fnt *cur, *ret = NULL; - size_t i; - - if (!drw || !fonts) - return NULL; - - for (i = 1; i <= fontcount; i++) { - if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) { - cur->next = ret; - ret = cur; - } - } - return (drw->fonts = ret); -} - -void drw_fontset_free(Fnt *font) { - if (font) { - drw_fontset_free(font->next); - xfont_free(font); - } -} - -void drw_clr_create(Drw *drw, Clr *dest, const char *clrname) { - if (!drw || !dest || !clrname) - return; - - if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen), - DefaultColormap(drw->dpy, drw->screen), clrname, dest)) - die("error, cannot allocate color '%s'", clrname); -} - -/* Wrapper to create color schemes. The caller has to call free(3) on the - * returned color scheme when done using it. */ -Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount) { - size_t i; - Clr *ret; - - /* need at least two colors for a scheme */ - if (!drw || !clrnames || clrcount < 2 || - !(ret = ecalloc(clrcount, sizeof(XftColor)))) - return NULL; - - for (i = 0; i < clrcount; i++) - drw_clr_create(drw, &ret[i], clrnames[i]); - return ret; -} - -void drw_setfontset(Drw *drw, Fnt *set) { - if (drw) - drw->fonts = set; -} - -void drw_setscheme(Drw *drw, Clr *scm) { - if (drw) - drw->scheme = scm; -} - -void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, - int filled, int invert) { - if (!drw || !drw->scheme) - return; - XSetForeground(drw->dpy, drw->gc, - invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel); - if (filled) - XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); - else - XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1); -} - -int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, - unsigned int lpad, const char *text, int invert) { - int i, ty, ellipsis_x = 0; - unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len; - XftDraw *d = NULL; - Fnt *usedfont, *curfont, *nextfont; - int utf8strlen, utf8charlen, render = x || y || w || h; - long utf8codepoint = 0; - const char *utf8str; - FcCharSet *fccharset; - FcPattern *fcpattern; - FcPattern *match; - XftResult result; - int charexists = 0, overflow = 0; - /* keep track of a couple codepoints for which we have no match. */ - enum { nomatches_len = 64 }; - static struct { - long codepoint[nomatches_len]; - unsigned int idx; - } nomatches; - static unsigned int ellipsis_width = 0; - - if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts) - return 0; - - if (!render) { - w = invert ? invert : ~invert; - } else { - XSetForeground(drw->dpy, drw->gc, - drw->scheme[invert ? ColFg : ColBg].pixel); - XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); - d = XftDrawCreate(drw->dpy, drw->drawable, - DefaultVisual(drw->dpy, drw->screen), - DefaultColormap(drw->dpy, drw->screen)); - x += lpad; - w -= lpad; - } - - usedfont = drw->fonts; - if (!ellipsis_width && render) - ellipsis_width = drw_fontset_getwidth(drw, "..."); - while (1) { - ew = ellipsis_len = utf8strlen = 0; - utf8str = text; - nextfont = NULL; - while (*text) { - utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ); - for (curfont = drw->fonts; curfont; curfont = curfont->next) { - charexists = charexists || - XftCharExists(drw->dpy, curfont->xfont, utf8codepoint); - if (charexists) { - drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL); - if (ew + ellipsis_width <= w) { - /* keep track where the ellipsis still fits */ - ellipsis_x = x + ew; - ellipsis_w = w - ew; - ellipsis_len = utf8strlen; - } - - if (ew + tmpw > w) { - overflow = 1; - /* called from drw_fontset_getwidth_clamp(): - * it wants the width AFTER the overflow - */ - if (!render) - x += tmpw; - else - utf8strlen = ellipsis_len; - } else if (curfont == usedfont) { - utf8strlen += utf8charlen; - text += utf8charlen; - ew += tmpw; - } else { - nextfont = curfont; - } - break; - } - } - - if (overflow || !charexists || nextfont) - break; - else - charexists = 0; - } - - if (utf8strlen) { - if (render) { - ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent; - XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg], - usedfont->xfont, x, ty, (XftChar8 *)utf8str, - utf8strlen); - } - x += ew; - w -= ew; - } - if (render && overflow) - drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, "...", invert); - - if (!*text || overflow) { - break; - } else if (nextfont) { - charexists = 0; - usedfont = nextfont; - } else { - /* Regardless of whether or not a fallback font is found, the - * character must be drawn. */ - charexists = 1; - - for (i = 0; i < nomatches_len; ++i) { - /* avoid calling XftFontMatch if we know we won't find a match */ - if (utf8codepoint == nomatches.codepoint[i]) - goto no_match; - } - - fccharset = FcCharSetCreate(); - FcCharSetAddChar(fccharset, utf8codepoint); - - if (!drw->fonts->pattern) { - /* Refer to the comment in xfont_create for more information. */ - die("the first font in the cache must be loaded from a font string."); - } - - fcpattern = FcPatternDuplicate(drw->fonts->pattern); - FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); - FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue); - - FcConfigSubstitute(NULL, fcpattern, FcMatchPattern); - FcDefaultSubstitute(fcpattern); - match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result); - - FcCharSetDestroy(fccharset); - FcPatternDestroy(fcpattern); - - if (match) { - usedfont = xfont_create(drw, NULL, match); - if (usedfont && - XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) { - for (curfont = drw->fonts; curfont->next; curfont = curfont->next) - ; /* NOP */ - curfont->next = usedfont; - } else { - xfont_free(usedfont); - nomatches.codepoint[++nomatches.idx % nomatches_len] = utf8codepoint; - no_match: - usedfont = drw->fonts; - } - } - } - } - if (d) - XftDrawDestroy(d); - - return x + (render ? w : 0); -} - -void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, - unsigned int h) { - if (!drw) - return; - - XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y); - XSync(drw->dpy, False); -} - -unsigned int drw_fontset_getwidth(Drw *drw, const char *text) { - if (!drw || !drw->fonts || !text) - return 0; - return drw_text(drw, 0, 0, 0, 0, 0, text, 0); -} - -unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, - unsigned int n) { - unsigned int tmp = 0; - if (drw && drw->fonts && text && n) - tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n); - return MIN(n, tmp); -} - -void drw_font_getexts(Fnt *font, const char *text, unsigned int len, - unsigned int *w, unsigned int *h) { - XGlyphInfo ext; - - if (!font || !text) - return; - - XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext); - if (w) - *w = ext.xOff; - if (h) - *h = font->h; -} - -Cur *drw_cur_create(Drw *drw, int shape) { - Cur *cur; - - if (!drw || !(cur = ecalloc(1, sizeof(Cur)))) - return NULL; - - cur->cursor = XCreateFontCursor(drw->dpy, shape); - - return cur; -} - -void drw_cur_free(Drw *drw, Cur *cursor) { - if (!cursor) - return; - - XFreeCursor(drw->dpy, cursor->cursor); - free(cursor); -} diff --git a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/drw.h b/hosts/laptop/modules/system/nix/x/dwm/source/dwm/drw.h deleted file mode 100644 index e645d43..0000000 --- a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/drw.h +++ /dev/null @@ -1,64 +0,0 @@ -/* See LICENSE file for copyright and license details. */ - -typedef struct { - Cursor cursor; -} Cur; - -typedef struct Fnt { - Display *dpy; - unsigned int h; - XftFont *xfont; - FcPattern *pattern; - struct Fnt *next; -} Fnt; - -enum { ColFg, ColBg, ColBorder }; /* Clr scheme index */ -typedef XftColor Clr; - -typedef struct { - unsigned int w, h; - Display *dpy; - int screen; - Window root; - Drawable drawable; - GC gc; - Clr *scheme; - Fnt *fonts; -} Drw; - -/* Drawable abstraction */ -Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, - unsigned int h); -void drw_resize(Drw *drw, unsigned int w, unsigned int h); -void drw_free(Drw *drw); - -/* Fnt abstraction */ -Fnt *drw_fontset_create(Drw *drw, const char *fonts[], size_t fontcount); -void drw_fontset_free(Fnt *set); -unsigned int drw_fontset_getwidth(Drw *drw, const char *text); -unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, - unsigned int n); -void drw_font_getexts(Fnt *font, const char *text, unsigned int len, - unsigned int *w, unsigned int *h); - -/* Colorscheme abstraction */ -void drw_clr_create(Drw *drw, Clr *dest, const char *clrname); -Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount); - -/* Cursor abstraction */ -Cur *drw_cur_create(Drw *drw, int shape); -void drw_cur_free(Drw *drw, Cur *cursor); - -/* Drawing context manipulation */ -void drw_setfontset(Drw *drw, Fnt *set); -void drw_setscheme(Drw *drw, Clr *scm); - -/* Drawing functions */ -void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, - int filled, int invert); -int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, - unsigned int lpad, const char *text, int invert); - -/* Map functions */ -void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, - unsigned int h); diff --git a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/dwm.1 b/hosts/laptop/modules/system/nix/x/dwm/source/dwm/dwm.1 deleted file mode 100644 index ddc8321..0000000 --- a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/dwm.1 +++ /dev/null @@ -1,176 +0,0 @@ -.TH DWM 1 dwm\-VERSION -.SH NAME -dwm \- dynamic window manager -.SH SYNOPSIS -.B dwm -.RB [ \-v ] -.SH DESCRIPTION -dwm is a dynamic window manager for X. It manages windows in tiled, monocle -and floating layouts. Either layout can be applied dynamically, optimising the -environment for the application in use and the task performed. -.P -In tiled layouts windows are managed in a master and stacking area. The master -area on the left contains one window by default, and the stacking area on the -right contains all other windows. The number of master area windows can be -adjusted from zero to an arbitrary number. In monocle layout all windows are -maximised to the screen size. In floating layout windows can be resized and -moved freely. Dialog windows are always managed floating, regardless of the -layout applied. -.P -Windows are grouped by tags. Each window can be tagged with one or multiple -tags. Selecting certain tags displays all windows with these tags. -.P -Each screen contains a small status bar which displays all available tags, the -layout, the title of the focused window, and the text read from the root window -name property, if the screen is focused. A floating window is indicated with an -empty square and a maximised floating window is indicated with a filled square -before the windows title. The selected tags are indicated with a different -color. The tags of the focused window are indicated with a filled square in the -top left corner. The tags which are applied to one or more windows are -indicated with an empty square in the top left corner. -.P -dwm draws a small border around windows to indicate the focus state. -.SH OPTIONS -.TP -.B \-v -prints version information to stderr, then exits. -.SH USAGE -.SS Status bar -.TP -.B X root window name -is read and displayed in the status text area. It can be set with the -.BR xsetroot (1) -command. -.TP -.B Button1 -click on a tag label to display all windows with that tag, click on the layout -label toggles between tiled and floating layout. -.TP -.B Button3 -click on a tag label adds/removes all windows with that tag to/from the view. -.TP -.B Mod1\-Button1 -click on a tag label applies that tag to the focused window. -.TP -.B Mod1\-Button3 -click on a tag label adds/removes that tag to/from the focused window. -.SS Keyboard commands -.TP -.B Mod1\-Shift\-Return -Start -.BR st(1). -.TP -.B Mod1\-p -Spawn -.BR dmenu(1) -for launching other programs. -.TP -.B Mod1\-, -Focus previous screen, if any. -.TP -.B Mod1\-. -Focus next screen, if any. -.TP -.B Mod1\-Shift\-, -Send focused window to previous screen, if any. -.TP -.B Mod1\-Shift\-. -Send focused window to next screen, if any. -.TP -.B Mod1\-b -Toggles bar on and off. -.TP -.B Mod1\-t -Sets tiled layout. -.TP -.B Mod1\-f -Sets floating layout. -.TP -.B Mod1\-m -Sets monocle layout. -.TP -.B Mod1\-space -Toggles between current and previous layout. -.TP -.B Mod1\-j -Focus next window. -.TP -.B Mod1\-k -Focus previous window. -.TP -.B Mod1\-i -Increase number of windows in master area. -.TP -.B Mod1\-d -Decrease number of windows in master area. -.TP -.B Mod1\-l -Increase master area size. -.TP -.B Mod1\-h -Decrease master area size. -.TP -.B Mod1\-Return -Zooms/cycles focused window to/from master area (tiled layouts only). -.TP -.B Mod1\-Shift\-c -Close focused window. -.TP -.B Mod1\-Shift\-space -Toggle focused window between tiled and floating state. -.TP -.B Mod1\-Tab -Toggles to the previously selected tags. -.TP -.B Mod1\-Shift\-[1..n] -Apply nth tag to focused window. -.TP -.B Mod1\-Shift\-0 -Apply all tags to focused window. -.TP -.B Mod1\-Control\-Shift\-[1..n] -Add/remove nth tag to/from focused window. -.TP -.B Mod1\-[1..n] -View all windows with nth tag. -.TP -.B Mod1\-0 -View all windows with any tag. -.TP -.B Mod1\-Control\-[1..n] -Add/remove all windows with nth tag to/from the view. -.TP -.B Mod1\-Shift\-q -Quit dwm. -.SS Mouse commands -.TP -.B Mod1\-Button1 -Move focused window while dragging. Tiled windows will be toggled to the floating state. -.TP -.B Mod1\-Button2 -Toggles focused window between floating and tiled state. -.TP -.B Mod1\-Button3 -Resize focused window while dragging. Tiled windows will be toggled to the floating state. -.SH CUSTOMIZATION -dwm is customized by creating a custom config.h and (re)compiling the source -code. This keeps it fast, secure and simple. -.SH SEE ALSO -.BR dmenu (1), -.BR st (1) -.SH ISSUES -Java applications which use the XToolkit/XAWT backend may draw grey windows -only. The XToolkit/XAWT backend breaks ICCCM-compliance in recent JDK 1.5 and early -JDK 1.6 versions, because it assumes a reparenting window manager. Possible workarounds -are using JDK 1.4 (which doesn't contain the XToolkit/XAWT backend) or setting the -environment variable -.BR AWT_TOOLKIT=MToolkit -(to use the older Motif backend instead) or running -.B xprop -root -f _NET_WM_NAME 32a -set _NET_WM_NAME LG3D -or -.B wmname LG3D -(to pretend that a non-reparenting window manager is running that the -XToolkit/XAWT backend can recognize) or when using OpenJDK setting the environment variable -.BR _JAVA_AWT_WM_NONREPARENTING=1 . -.SH BUGS -Send all bug reports with a patch to hackers@suckless.org. diff --git a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/dwm.c b/hosts/laptop/modules/system/nix/x/dwm/source/dwm/dwm.c deleted file mode 100644 index 1794c3f..0000000 --- a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/dwm.c +++ /dev/null @@ -1,2209 +0,0 @@ -/* See LICENSE file for copyright and license details. - * - * dynamic window manager is designed like any other X client as well. It is - * driven through handling X events. In contrast to other X clients, a window - * manager selects for SubstructureRedirectMask on the root window, to receive - * events about window (dis-)appearance. Only one X connection at a time is - * allowed to select for this event mask. - * - * The event handlers of dwm are organized in an array which is accessed - * whenever a new event has been fetched. This allows event dispatching - * in O(1) time. - * - * Each child of the root window is called a client, except windows which have - * set the override_redirect flag. Clients are organized in a linked client - * list on each monitor, the focus history is remembered through a stack list - * on each monitor. Each client contains a bit array to indicate the tags of a - * client. - * - * Keys and tagging rules are organized as arrays and defined in config.h. - * - * To understand everything else, start reading main(). - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef XINERAMA -#include -#endif /* XINERAMA */ -#include - -#include "drw.h" -#include "util.h" - -/* macros */ -#define BUTTONMASK (ButtonPressMask | ButtonReleaseMask) -#define CLEANMASK(mask) \ - (mask & ~(numlockmask | LockMask) & \ - (ShiftMask | ControlMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | \ - Mod5Mask)) -#define INTERSECT(x, y, w, h, m) \ - (MAX(0, MIN((x) + (w), (m)->wx + (m)->ww) - MAX((x), (m)->wx)) * \ - MAX(0, MIN((y) + (h), (m)->wy + (m)->wh) - MAX((y), (m)->wy))) -#define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags])) -#define LENGTH(X) (sizeof X / sizeof X[0]) -#define MOUSEMASK (BUTTONMASK | PointerMotionMask) -#define WIDTH(X) ((X)->w + 2 * (X)->bw) -#define HEIGHT(X) ((X)->h + 2 * (X)->bw) -#define TAGMASK ((1 << LENGTH(tags)) - 1) -#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) - -/* enums */ -enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ -enum { SchemeNorm, SchemeSel }; /* color schemes */ -enum { - NetSupported, - NetWMName, - NetWMState, - NetWMCheck, - NetWMFullscreen, - NetActiveWindow, - NetWMWindowType, - NetWMWindowTypeDialog, - NetClientList, - NetLast -}; /* EWMH atoms */ -enum { - WMProtocols, - WMDelete, - WMState, - WMTakeFocus, - WMLast -}; /* default atoms */ -enum { - ClkTagBar, - ClkLtSymbol, - ClkStatusText, - ClkWinTitle, - ClkClientWin, - ClkRootWin, - ClkLast -}; /* clicks */ - -typedef union { - int i; - unsigned int ui; - float f; - const void *v; -} Arg; - -typedef struct { - unsigned int click; - unsigned int mask; - unsigned int button; - void (*func)(const Arg *arg); - const Arg arg; -} Button; - -typedef struct Monitor Monitor; -typedef struct Client Client; -struct Client { - char name[256]; - float mina, maxa; - float cfact; - int x, y, w, h; - int oldx, oldy, oldw, oldh; - int basew, baseh, incw, inch, maxw, maxh, minw, minh, hintsvalid; - int bw, oldbw; - unsigned int tags; - int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen; - Client *next; - Client *snext; - Monitor *mon; - Window win; -}; - -typedef struct { - unsigned int mod; - KeySym keysym; - void (*func)(const Arg *); - const Arg arg; -} Key; - -typedef struct { - const char *symbol; - void (*arrange)(Monitor *); -} Layout; - -struct Monitor { - char ltsymbol[16]; - float mfact; - int nmaster; - int num; - int by; /* bar geometry */ - int mx, my, mw, mh; /* screen size */ - int wx, wy, ww, wh; /* window area */ - int gappih; /* horizontal gap between windows */ - int gappiv; /* vertical gap between windows */ - int gappoh; /* horizontal outer gaps */ - int gappov; /* vertical outer gaps */ - unsigned int seltags; - unsigned int sellt; - unsigned int tagset[2]; - int showbar; - int topbar; - Client *clients; - Client *sel; - Client *stack; - Monitor *next; - Window barwin; - const Layout *lt[2]; -}; - -typedef struct { - const char *class; - const char *instance; - const char *title; - unsigned int tags; - int isfloating; - int monitor; -} Rule; - -/* function declarations */ -static void applyrules(Client *c); -static int applysizehints(Client *c, int *x, int *y, int *w, int *h, - int interact); -static void arrange(Monitor *m); -static void arrangemon(Monitor *m); -static void attach(Client *c); -static void attachstack(Client *c); -static void buttonpress(XEvent *e); -static void checkotherwm(void); -static void cleanup(void); -static void cleanupmon(Monitor *mon); -static void clientmessage(XEvent *e); -static void configure(Client *c); -static void configurenotify(XEvent *e); -static void configurerequest(XEvent *e); -static Monitor *createmon(void); -static void destroynotify(XEvent *e); -static void detach(Client *c); -static void detachstack(Client *c); -static Monitor *dirtomon(int dir); -static void drawbar(Monitor *m); -static void drawbars(void); -static int drawstatusbar(Monitor *m, int bh, char *text); -static void enternotify(XEvent *e); -static void expose(XEvent *e); -static void focus(Client *c); -static void focusin(XEvent *e); -static void focusmon(const Arg *arg); -static void focusstack(const Arg *arg); -static Atom getatomprop(Client *c, Atom prop); -static int getrootptr(int *x, int *y); -static long getstate(Window w); -static int gettextprop(Window w, Atom atom, char *text, unsigned int size); -static void grabbuttons(Client *c, int focused); -static void grabkeys(void); -static void incnmaster(const Arg *arg); -static void keypress(XEvent *e); -static void killclient(const Arg *arg); -static void manage(Window w, XWindowAttributes *wa); -static void mappingnotify(XEvent *e); -static void maprequest(XEvent *e); -static void monocle(Monitor *m); -static void motionnotify(XEvent *e); -static void movemouse(const Arg *arg); -static Client *nexttiled(Client *c); -static void pop(Client *c); -static void propertynotify(XEvent *e); -static void quit(const Arg *arg); -static Monitor *recttomon(int x, int y, int w, int h); -static void resize(Client *c, int x, int y, int w, int h, int interact); -static void resizeclient(Client *c, int x, int y, int w, int h); -static void resizemouse(const Arg *arg); -static void restack(Monitor *m); -static void rotatestack(const Arg *arg); -static void run(void); -static void scan(void); -static int sendevent(Client *c, Atom proto); -static void sendmon(Client *c, Monitor *m); -static void setclientstate(Client *c, long state); -static void setfocus(Client *c); -static void setfullscreen(Client *c, int fullscreen); -static void setlayout(const Arg *arg); -static void setcfact(const Arg *arg); -static void setmfact(const Arg *arg); -static void setup(void); -static void seturgent(Client *c, int urg); -static void showhide(Client *c); -static void spawn(const Arg *arg); -static void tag(const Arg *arg); -static void tagmon(const Arg *arg); -static void togglebar(const Arg *arg); -static void togglefloating(const Arg *arg); -static void toggletag(const Arg *arg); -static void toggleview(const Arg *arg); -static void unfocus(Client *c, int setfocus); -static void unmanage(Client *c, int destroyed); -static void unmapnotify(XEvent *e); -static void updatebarpos(Monitor *m); -static void updatebars(void); -static void updateclientlist(void); -static int updategeom(void); -static void updatenumlockmask(void); -static void updatesizehints(Client *c); -static void updatestatus(void); -static void updatetitle(Client *c); -static void updatewindowtype(Client *c); -static void updatewmhints(Client *c); -static void view(const Arg *arg); -static Client *wintoclient(Window w); -static Monitor *wintomon(Window w); -static int xerror(Display *dpy, XErrorEvent *ee); -static int xerrordummy(Display *dpy, XErrorEvent *ee); -static int xerrorstart(Display *dpy, XErrorEvent *ee); -static void zoom(const Arg *arg); - -/* variables */ -static const char broken[] = "broken"; -static char stext[1024]; -static int screen; -static int sw, sh; /* X display screen geometry width, height */ -static int bh; /* bar height */ -static int lrpad; /* sum of left and right padding for text */ -static int (*xerrorxlib)(Display *, XErrorEvent *); -static unsigned int numlockmask = 0; -static void (*handler[LASTEvent])(XEvent *) = { - [ButtonPress] = buttonpress, - [ClientMessage] = clientmessage, - [ConfigureRequest] = configurerequest, - [ConfigureNotify] = configurenotify, - [DestroyNotify] = destroynotify, - [EnterNotify] = enternotify, - [Expose] = expose, - [FocusIn] = focusin, - [KeyPress] = keypress, - [MappingNotify] = mappingnotify, - [MapRequest] = maprequest, - [MotionNotify] = motionnotify, - [PropertyNotify] = propertynotify, - [UnmapNotify] = unmapnotify}; -static Atom wmatom[WMLast], netatom[NetLast]; -static int running = 1; -static Cur *cursor[CurLast]; -static Clr **scheme; -static Display *dpy; -static Drw *drw; -static Monitor *mons, *selmon; -static Window root, wmcheckwin; - -/* configuration, allows nested code to access above variables */ -#include "config.h" - -/* compile-time check if all tags fit into an unsigned int bit array. */ -struct NumTags { - char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; -}; - -/* function implementations */ -void applyrules(Client *c) { - const char *class, *instance; - unsigned int i; - const Rule *r; - Monitor *m; - XClassHint ch = {NULL, NULL}; - - /* rule matching */ - c->isfloating = 0; - c->tags = 0; - XGetClassHint(dpy, c->win, &ch); - class = ch.res_class ? ch.res_class : broken; - instance = ch.res_name ? ch.res_name : broken; - - for (i = 0; i < LENGTH(rules); i++) { - r = &rules[i]; - if ((!r->title || strstr(c->name, r->title)) && - (!r->class || strstr(class, r->class)) && - (!r->instance || strstr(instance, r->instance))) { - c->isfloating = r->isfloating; - c->tags |= r->tags; - for (m = mons; m && m->num != r->monitor; m = m->next) - ; - if (m) - c->mon = m; - } - } - if (ch.res_class) - XFree(ch.res_class); - if (ch.res_name) - XFree(ch.res_name); - c->tags = - c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags]; -} - -int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact) { - int baseismin; - Monitor *m = c->mon; - - /* set minimum possible */ - *w = MAX(1, *w); - *h = MAX(1, *h); - if (interact) { - if (*x > sw) - *x = sw - WIDTH(c); - if (*y > sh) - *y = sh - HEIGHT(c); - if (*x + *w + 2 * c->bw < 0) - *x = 0; - if (*y + *h + 2 * c->bw < 0) - *y = 0; - } else { - if (*x >= m->wx + m->ww) - *x = m->wx + m->ww - WIDTH(c); - if (*y >= m->wy + m->wh) - *y = m->wy + m->wh - HEIGHT(c); - if (*x + *w + 2 * c->bw <= m->wx) - *x = m->wx; - if (*y + *h + 2 * c->bw <= m->wy) - *y = m->wy; - } - if (*h < bh) - *h = bh; - if (*w < bh) - *w = bh; - if (resizehints || c->isfloating || !c->mon->lt[c->mon->sellt]->arrange) { - if (!c->hintsvalid) - updatesizehints(c); - /* see last two sentences in ICCCM 4.1.2.3 */ - baseismin = c->basew == c->minw && c->baseh == c->minh; - if (!baseismin) { /* temporarily remove base dimensions */ - *w -= c->basew; - *h -= c->baseh; - } - /* adjust for aspect limits */ - if (c->mina > 0 && c->maxa > 0) { - if (c->maxa < (float)*w / *h) - *w = *h * c->maxa + 0.5; - else if (c->mina < (float)*h / *w) - *h = *w * c->mina + 0.5; - } - if (baseismin) { /* increment calculation requires this */ - *w -= c->basew; - *h -= c->baseh; - } - /* adjust for increment value */ - if (c->incw) - *w -= *w % c->incw; - if (c->inch) - *h -= *h % c->inch; - /* restore base dimensions */ - *w = MAX(*w + c->basew, c->minw); - *h = MAX(*h + c->baseh, c->minh); - if (c->maxw) - *w = MIN(*w, c->maxw); - if (c->maxh) - *h = MIN(*h, c->maxh); - } - return *x != c->x || *y != c->y || *w != c->w || *h != c->h; -} - -void arrange(Monitor *m) { - if (m) - showhide(m->stack); - else - for (m = mons; m; m = m->next) - showhide(m->stack); - if (m) { - arrangemon(m); - restack(m); - } else - for (m = mons; m; m = m->next) - arrangemon(m); -} - -void arrangemon(Monitor *m) { - strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol); - if (m->lt[m->sellt]->arrange) - m->lt[m->sellt]->arrange(m); -} - -void attach(Client *c) { - c->next = c->mon->clients; - c->mon->clients = c; -} - -void attachstack(Client *c) { - c->snext = c->mon->stack; - c->mon->stack = c; -} - -void buttonpress(XEvent *e) { - unsigned int i, x, click; - Arg arg = {0}; - Client *c; - Monitor *m; - XButtonPressedEvent *ev = &e->xbutton; - - click = ClkRootWin; - /* focus monitor if necessary */ - if ((m = wintomon(ev->window)) && m != selmon) { - unfocus(selmon->sel, 1); - selmon = m; - focus(NULL); - } - if (ev->window == selmon->barwin) { - i = x = 0; - do - x += TEXTW(tags[i]); - while (ev->x >= x && ++i < LENGTH(tags)); - if (i < LENGTH(tags)) { - click = ClkTagBar; - arg.ui = 1 << i; - } else if (ev->x < x + TEXTW(selmon->ltsymbol)) - click = ClkLtSymbol; - else if (ev->x > selmon->ww - (int)TEXTW(stext)) - click = ClkStatusText; - else - click = ClkWinTitle; - } else if ((c = wintoclient(ev->window))) { - focus(c); - restack(selmon); - XAllowEvents(dpy, ReplayPointer, CurrentTime); - click = ClkClientWin; - } - for (i = 0; i < LENGTH(buttons); i++) - if (click == buttons[i].click && buttons[i].func && - buttons[i].button == ev->button && - CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) - buttons[i].func( - click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg); -} - -void checkotherwm(void) { - xerrorxlib = XSetErrorHandler(xerrorstart); - /* this causes an error if some other window manager is running */ - XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask); - XSync(dpy, False); - XSetErrorHandler(xerror); - XSync(dpy, False); -} - -void cleanup(void) { - Arg a = {.ui = ~0}; - Layout foo = {"", NULL}; - Monitor *m; - size_t i; - - view(&a); - selmon->lt[selmon->sellt] = &foo; - for (m = mons; m; m = m->next) - while (m->stack) - unmanage(m->stack, 0); - XUngrabKey(dpy, AnyKey, AnyModifier, root); - while (mons) - cleanupmon(mons); - for (i = 0; i < CurLast; i++) - drw_cur_free(drw, cursor[i]); - for (i = 0; i < LENGTH(colors) + 1; i++) - free(scheme[i]); - free(scheme); - XDestroyWindow(dpy, wmcheckwin); - drw_free(drw); - XSync(dpy, False); - XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); - XDeleteProperty(dpy, root, netatom[NetActiveWindow]); -} - -void cleanupmon(Monitor *mon) { - Monitor *m; - - if (mon == mons) - mons = mons->next; - else { - for (m = mons; m && m->next != mon; m = m->next) - ; - m->next = mon->next; - } - XUnmapWindow(dpy, mon->barwin); - XDestroyWindow(dpy, mon->barwin); - free(mon); -} - -void clientmessage(XEvent *e) { - XClientMessageEvent *cme = &e->xclient; - Client *c = wintoclient(cme->window); - - if (!c) - return; - if (cme->message_type == netatom[NetWMState]) { - if (cme->data.l[1] == netatom[NetWMFullscreen] || - cme->data.l[2] == netatom[NetWMFullscreen]) - setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD */ - || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && - !c->isfullscreen))); - } else if (cme->message_type == netatom[NetActiveWindow]) { - if (c != selmon->sel && !c->isurgent) - seturgent(c, 1); - } -} - -void configure(Client *c) { - XConfigureEvent ce; - - ce.type = ConfigureNotify; - ce.display = dpy; - ce.event = c->win; - ce.window = c->win; - ce.x = c->x; - ce.y = c->y; - ce.width = c->w; - ce.height = c->h; - ce.border_width = c->bw; - ce.above = None; - ce.override_redirect = False; - XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce); -} - -void configurenotify(XEvent *e) { - Monitor *m; - Client *c; - XConfigureEvent *ev = &e->xconfigure; - int dirty; - - /* TODO: updategeom handling sucks, needs to be simplified */ - if (ev->window == root) { - dirty = (sw != ev->width || sh != ev->height); - sw = ev->width; - sh = ev->height; - if (updategeom() || dirty) { - drw_resize(drw, sw, bh); - updatebars(); - for (m = mons; m; m = m->next) { - for (c = m->clients; c; c = c->next) - if (c->isfullscreen) - resizeclient(c, m->mx, m->my, m->mw, m->mh); - XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh); - } - focus(NULL); - arrange(NULL); - } - } -} - -void configurerequest(XEvent *e) { - Client *c; - Monitor *m; - XConfigureRequestEvent *ev = &e->xconfigurerequest; - XWindowChanges wc; - - if ((c = wintoclient(ev->window))) { - if (ev->value_mask & CWBorderWidth) - c->bw = ev->border_width; - else if (c->isfloating || !selmon->lt[selmon->sellt]->arrange) { - m = c->mon; - if (ev->value_mask & CWX) { - c->oldx = c->x; - c->x = m->mx + ev->x; - } - if (ev->value_mask & CWY) { - c->oldy = c->y; - c->y = m->my + ev->y; - } - if (ev->value_mask & CWWidth) { - c->oldw = c->w; - c->w = ev->width; - } - if (ev->value_mask & CWHeight) { - c->oldh = c->h; - c->h = ev->height; - } - if ((c->x + c->w) > m->mx + m->mw && c->isfloating) - c->x = m->mx + (m->mw / 2 - WIDTH(c) / 2); /* center in x direction */ - if ((c->y + c->h) > m->my + m->mh && c->isfloating) - c->y = m->my + (m->mh / 2 - HEIGHT(c) / 2); /* center in y direction */ - if ((ev->value_mask & (CWX | CWY)) && - !(ev->value_mask & (CWWidth | CWHeight))) - configure(c); - if (ISVISIBLE(c)) - XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); - } else - configure(c); - } else { - wc.x = ev->x; - wc.y = ev->y; - wc.width = ev->width; - wc.height = ev->height; - wc.border_width = ev->border_width; - wc.sibling = ev->above; - wc.stack_mode = ev->detail; - XConfigureWindow(dpy, ev->window, ev->value_mask, &wc); - } - XSync(dpy, False); -} - -Monitor *createmon(void) { - Monitor *m; - - m = ecalloc(1, sizeof(Monitor)); - m->tagset[0] = m->tagset[1] = 1; - m->mfact = mfact; - m->nmaster = nmaster; - m->showbar = showbar; - m->topbar = topbar; - m->gappih = gappih; - m->gappiv = gappiv; - m->gappoh = gappoh; - m->gappov = gappov; - m->lt[0] = &layouts[0]; - m->lt[1] = &layouts[1 % LENGTH(layouts)]; - strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol); - return m; -} - -void destroynotify(XEvent *e) { - Client *c; - XDestroyWindowEvent *ev = &e->xdestroywindow; - - if ((c = wintoclient(ev->window))) - unmanage(c, 1); -} - -void detach(Client *c) { - Client **tc; - - for (tc = &c->mon->clients; *tc && *tc != c; tc = &(*tc)->next) - ; - *tc = c->next; -} - -void detachstack(Client *c) { - Client **tc, *t; - - for (tc = &c->mon->stack; *tc && *tc != c; tc = &(*tc)->snext) - ; - *tc = c->snext; - - if (c == c->mon->sel) { - for (t = c->mon->stack; t && !ISVISIBLE(t); t = t->snext) - ; - c->mon->sel = t; - } -} - -Monitor *dirtomon(int dir) { - Monitor *m = NULL; - - if (dir > 0) { - if (!(m = selmon->next)) - m = mons; - } else if (selmon == mons) - for (m = mons; m->next; m = m->next) - ; - else - for (m = mons; m->next != selmon; m = m->next) - ; - return m; -} - -int drawstatusbar(Monitor *m, int bh, char *stext) { - int ret, i, w, x, len; - short isCode = 0; - char *text; - char *p; - - len = strlen(stext) + 1; - if (!(text = (char *)malloc(sizeof(char) * len))) - die("malloc"); - p = text; - memcpy(text, stext, len); - - /* compute width of the status text */ - w = 0; - i = -1; - while (text[++i]) { - if (text[i] == '^') { - if (!isCode) { - isCode = 1; - text[i] = '\0'; - w += TEXTW(text) - lrpad; - text[i] = '^'; - if (text[++i] == 'f') - w += atoi(text + ++i); - } else { - isCode = 0; - text = text + i + 1; - i = -1; - } - } - } - if (!isCode) - w += TEXTW(text) - lrpad; - else - isCode = 0; - text = p; - - w += 2; /* 1px padding on both sides */ - ret = x = m->ww - w; - - drw_setscheme(drw, scheme[LENGTH(colors)]); - drw->scheme[ColFg] = scheme[SchemeNorm][ColFg]; - drw->scheme[ColBg] = scheme[SchemeNorm][ColBg]; - drw_rect(drw, x, 0, w, bh, 1, 1); - x++; - - /* process status text */ - i = -1; - while (text[++i]) { - if (text[i] == '^' && !isCode) { - isCode = 1; - - text[i] = '\0'; - w = TEXTW(text) - lrpad; - drw_text(drw, x, 0, w, bh, 0, text, 0); - - x += w; - - /* process code */ - while (text[++i] != '^') { - if (text[i] == 'c') { - char buf[8]; - memcpy(buf, (char *)text + i + 1, 7); - buf[7] = '\0'; - drw_clr_create(drw, &drw->scheme[ColFg], buf); - i += 7; - } else if (text[i] == 'b') { - char buf[8]; - memcpy(buf, (char *)text + i + 1, 7); - buf[7] = '\0'; - drw_clr_create(drw, &drw->scheme[ColBg], buf); - i += 7; - } else if (text[i] == 'd') { - drw->scheme[ColFg] = scheme[SchemeNorm][ColFg]; - drw->scheme[ColBg] = scheme[SchemeNorm][ColBg]; - } else if (text[i] == 'r') { - int rx = atoi(text + ++i); - while (text[++i] != ',') - ; - int ry = atoi(text + ++i); - while (text[++i] != ',') - ; - int rw = atoi(text + ++i); - while (text[++i] != ',') - ; - int rh = atoi(text + ++i); - - drw_rect(drw, rx + x, ry, rw, rh, 1, 0); - } else if (text[i] == 'f') { - x += atoi(text + ++i); - } - } - - text = text + i + 1; - i = -1; - isCode = 0; - } - } - - if (!isCode) { - w = TEXTW(text) - lrpad; - drw_text(drw, x, 0, w, bh, 0, text, 0); - } - - drw_setscheme(drw, scheme[SchemeNorm]); - free(p); - - return ret; -} - -void drawbar(Monitor *m) { - int x, w, tw = 0; - int boxs = drw->fonts->h / 9; - int boxw = drw->fonts->h / 6 + 2; - unsigned int i, occ = 0, urg = 0; - Client *c; - - if (!m->showbar) - return; - - /* draw status first so it can be overdrawn by tags later */ - if (m == selmon) { /* status is only drawn on selected monitor */ - tw = m->ww - drawstatusbar(m, bh, stext); - } - - for (c = m->clients; c; c = c->next) { - occ |= c->tags; - if (c->isurgent) - urg |= c->tags; - } - x = 0; - for (i = 0; i < LENGTH(tags); i++) { - w = TEXTW(tags[i]); - drw_setscheme( - drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]); - drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i); - if (occ & 1 << i) - drw_rect(drw, x + boxs, boxs, boxw, boxw, - m == selmon && selmon->sel && selmon->sel->tags & 1 << i, - urg & 1 << i); - x += w; - } - w = TEXTW(m->ltsymbol); - drw_setscheme(drw, scheme[SchemeNorm]); - x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0); - - if ((w = m->ww - tw - x) > bh) { - if (m->sel) { - drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]); - drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0); - if (m->sel->isfloating) - drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0); - } else { - drw_setscheme(drw, scheme[SchemeNorm]); - drw_rect(drw, x, 0, w, bh, 1, 1); - } - } - drw_map(drw, m->barwin, 0, 0, m->ww, bh); -} - -void drawbars(void) { - Monitor *m; - - for (m = mons; m; m = m->next) - drawbar(m); -} - -void enqueue(Client *c) { - Client *l; - for (l = c->mon->clients; l && l->next; l = l->next) - ; - if (l) { - l->next = c; - c->next = NULL; - } -} - -void enqueuestack(Client *c) { - Client *l; - for (l = c->mon->stack; l && l->snext; l = l->snext) - ; - if (l) { - l->snext = c; - c->snext = NULL; - } -} - -void enternotify(XEvent *e) { - Client *c; - Monitor *m; - XCrossingEvent *ev = &e->xcrossing; - - if ((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && - ev->window != root) - return; - c = wintoclient(ev->window); - m = c ? c->mon : wintomon(ev->window); - if (m != selmon) { - unfocus(selmon->sel, 1); - selmon = m; - } else if (!c || c == selmon->sel) - return; - focus(c); -} - -void expose(XEvent *e) { - Monitor *m; - XExposeEvent *ev = &e->xexpose; - - if (ev->count == 0 && (m = wintomon(ev->window))) - drawbar(m); -} - -void focus(Client *c) { - if (!c || !ISVISIBLE(c)) - for (c = selmon->stack; c && !ISVISIBLE(c); c = c->snext) - ; - if (selmon->sel && selmon->sel != c) - unfocus(selmon->sel, 0); - if (c) { - if (c->mon != selmon) - selmon = c->mon; - if (c->isurgent) - seturgent(c, 0); - detachstack(c); - attachstack(c); - grabbuttons(c, 1); - XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel); - setfocus(c); - } else { - XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); - XDeleteProperty(dpy, root, netatom[NetActiveWindow]); - } - selmon->sel = c; - drawbars(); -} - -/* there are some broken focus acquiring clients needing extra handling */ -void focusin(XEvent *e) { - XFocusChangeEvent *ev = &e->xfocus; - - if (selmon->sel && ev->window != selmon->sel->win) - setfocus(selmon->sel); -} - -void focusmon(const Arg *arg) { - Monitor *m; - - if (!mons->next) - return; - if ((m = dirtomon(arg->i)) == selmon) - return; - unfocus(selmon->sel, 0); - selmon = m; - focus(NULL); -} - -void focusstack(const Arg *arg) { - Client *c = NULL, *i; - - if (!selmon->sel || (selmon->sel->isfullscreen && lockfullscreen)) - return; - if (arg->i > 0) { - for (c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next) - ; - if (!c) - for (c = selmon->clients; c && !ISVISIBLE(c); c = c->next) - ; - } else { - for (i = selmon->clients; i != selmon->sel; i = i->next) - if (ISVISIBLE(i)) - c = i; - if (!c) - for (; i; i = i->next) - if (ISVISIBLE(i)) - c = i; - } - if (c) { - focus(c); - restack(selmon); - } -} - -Atom getatomprop(Client *c, Atom prop) { - int di; - unsigned long dl; - unsigned char *p = NULL; - Atom da, atom = None; - - if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM, - &da, &di, &dl, &dl, &p) == Success && - p) { - atom = *(Atom *)p; - XFree(p); - } - return atom; -} - -int getrootptr(int *x, int *y) { - int di; - unsigned int dui; - Window dummy; - - return XQueryPointer(dpy, root, &dummy, &dummy, x, y, &di, &di, &dui); -} - -long getstate(Window w) { - int format; - long result = -1; - unsigned char *p = NULL; - unsigned long n, extra; - Atom real; - - if (XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, - wmatom[WMState], &real, &format, &n, &extra, - (unsigned char **)&p) != Success) - return -1; - if (n != 0) - result = *p; - XFree(p); - return result; -} - -int gettextprop(Window w, Atom atom, char *text, unsigned int size) { - char **list = NULL; - int n; - XTextProperty name; - - if (!text || size == 0) - return 0; - text[0] = '\0'; - if (!XGetTextProperty(dpy, w, &name, atom) || !name.nitems) - return 0; - if (name.encoding == XA_STRING) { - strncpy(text, (char *)name.value, size - 1); - } else if (XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success && - n > 0 && *list) { - strncpy(text, *list, size - 1); - XFreeStringList(list); - } - text[size - 1] = '\0'; - XFree(name.value); - return 1; -} - -void grabbuttons(Client *c, int focused) { - updatenumlockmask(); - { - unsigned int i, j; - unsigned int modifiers[] = {0, LockMask, numlockmask, - numlockmask | LockMask}; - XUngrabButton(dpy, AnyButton, AnyModifier, c->win); - if (!focused) - XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK, - GrabModeSync, GrabModeSync, None, None); - for (i = 0; i < LENGTH(buttons); i++) - if (buttons[i].click == ClkClientWin) - for (j = 0; j < LENGTH(modifiers); j++) - XGrabButton(dpy, buttons[i].button, buttons[i].mask | modifiers[j], - c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, - None, None); - } -} - -void grabkeys(void) { - updatenumlockmask(); - { - unsigned int i, j, k; - unsigned int modifiers[] = {0, LockMask, numlockmask, - numlockmask | LockMask}; - int start, end, skip; - KeySym *syms; - - XUngrabKey(dpy, AnyKey, AnyModifier, root); - XDisplayKeycodes(dpy, &start, &end); - syms = XGetKeyboardMapping(dpy, start, end - start + 1, &skip); - if (!syms) - return; - for (k = start; k <= end; k++) - for (i = 0; i < LENGTH(keys); i++) - /* skip modifier codes, we do that ourselves */ - if (keys[i].keysym == syms[(k - start) * skip]) - for (j = 0; j < LENGTH(modifiers); j++) - XGrabKey(dpy, k, keys[i].mod | modifiers[j], root, True, - GrabModeAsync, GrabModeAsync); - XFree(syms); - } -} - -void incnmaster(const Arg *arg) { - selmon->nmaster = MAX(selmon->nmaster + arg->i, 0); - arrange(selmon); -} - -#ifdef XINERAMA -static int isuniquegeom(XineramaScreenInfo *unique, size_t n, - XineramaScreenInfo *info) { - while (n--) - if (unique[n].x_org == info->x_org && unique[n].y_org == info->y_org && - unique[n].width == info->width && unique[n].height == info->height) - return 0; - return 1; -} -#endif /* XINERAMA */ - -void keypress(XEvent *e) { - unsigned int i; - KeySym keysym; - XKeyEvent *ev; - - ev = &e->xkey; - keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); - for (i = 0; i < LENGTH(keys); i++) - if (keysym == keys[i].keysym && - CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) && keys[i].func) - keys[i].func(&(keys[i].arg)); -} - -void killclient(const Arg *arg) { - if (!selmon->sel) - return; - if (!sendevent(selmon->sel, wmatom[WMDelete])) { - XGrabServer(dpy); - XSetErrorHandler(xerrordummy); - XSetCloseDownMode(dpy, DestroyAll); - XKillClient(dpy, selmon->sel->win); - XSync(dpy, False); - XSetErrorHandler(xerror); - XUngrabServer(dpy); - } -} - -void manage(Window w, XWindowAttributes *wa) { - Client *c, *t = NULL; - Window trans = None; - XWindowChanges wc; - - c = ecalloc(1, sizeof(Client)); - c->win = w; - /* geometry */ - c->x = c->oldx = wa->x; - c->y = c->oldy = wa->y; - c->w = c->oldw = wa->width; - c->h = c->oldh = wa->height; - c->oldbw = wa->border_width; - c->cfact = 1.0; - - updatetitle(c); - if (XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) { - c->mon = t->mon; - c->tags = t->tags; - } else { - c->mon = selmon; - applyrules(c); - } - - if (c->x + WIDTH(c) > c->mon->wx + c->mon->ww) - c->x = c->mon->wx + c->mon->ww - WIDTH(c); - if (c->y + HEIGHT(c) > c->mon->wy + c->mon->wh) - c->y = c->mon->wy + c->mon->wh - HEIGHT(c); - c->x = MAX(c->x, c->mon->wx); - c->y = MAX(c->y, c->mon->wy); - c->bw = borderpx; - - wc.border_width = c->bw; - XConfigureWindow(dpy, w, CWBorderWidth, &wc); - XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel); - configure(c); /* propagates border_width, if size doesn't change */ - updatewindowtype(c); - updatesizehints(c); - updatewmhints(c); - XSelectInput(dpy, w, - EnterWindowMask | FocusChangeMask | PropertyChangeMask | - StructureNotifyMask); - grabbuttons(c, 0); - if (!c->isfloating) - c->isfloating = c->oldstate = trans != None || c->isfixed; - if (c->isfloating) - XRaiseWindow(dpy, c->win); - attach(c); - attachstack(c); - XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, - PropModeAppend, (unsigned char *)&(c->win), 1); - XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, - c->h); /* some windows require this */ - setclientstate(c, NormalState); - if (c->mon == selmon) - unfocus(selmon->sel, 0); - c->mon->sel = c; - arrange(c->mon); - XMapWindow(dpy, c->win); - focus(NULL); -} - -void mappingnotify(XEvent *e) { - XMappingEvent *ev = &e->xmapping; - - XRefreshKeyboardMapping(ev); - if (ev->request == MappingKeyboard) - grabkeys(); -} - -void maprequest(XEvent *e) { - static XWindowAttributes wa; - XMapRequestEvent *ev = &e->xmaprequest; - - if (!XGetWindowAttributes(dpy, ev->window, &wa) || wa.override_redirect) - return; - if (!wintoclient(ev->window)) - manage(ev->window, &wa); -} - -void monocle(Monitor *m) { - unsigned int n = 0; - Client *c; - - for (c = m->clients; c; c = c->next) - if (ISVISIBLE(c)) - n++; - if (n > 0) /* override layout symbol */ - snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n); - for (c = nexttiled(m->clients); c; c = nexttiled(c->next)) - resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0); -} - -void motionnotify(XEvent *e) { - static Monitor *mon = NULL; - Monitor *m; - XMotionEvent *ev = &e->xmotion; - - if (ev->window != root) - return; - if ((m = recttomon(ev->x_root, ev->y_root, 1, 1)) != mon && mon) { - unfocus(selmon->sel, 1); - selmon = m; - focus(NULL); - } - mon = m; -} - -void movemouse(const Arg *arg) { - int x, y, ocx, ocy, nx, ny; - Client *c; - Monitor *m; - XEvent ev; - Time lasttime = 0; - - if (!(c = selmon->sel)) - return; - if (c->isfullscreen) /* no support moving fullscreen windows by mouse */ - return; - restack(selmon); - ocx = c->x; - ocy = c->y; - if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, - None, cursor[CurMove]->cursor, CurrentTime) != GrabSuccess) - return; - if (!getrootptr(&x, &y)) - return; - do { - XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev); - switch (ev.type) { - case ConfigureRequest: - case Expose: - case MapRequest: - handler[ev.type](&ev); - break; - case MotionNotify: - if ((ev.xmotion.time - lasttime) <= (1000 / 60)) - continue; - lasttime = ev.xmotion.time; - - nx = ocx + (ev.xmotion.x - x); - ny = ocy + (ev.xmotion.y - y); - if (abs(selmon->wx - nx) < snap) - nx = selmon->wx; - else if (abs((selmon->wx + selmon->ww) - (nx + WIDTH(c))) < snap) - nx = selmon->wx + selmon->ww - WIDTH(c); - if (abs(selmon->wy - ny) < snap) - ny = selmon->wy; - else if (abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap) - ny = selmon->wy + selmon->wh - HEIGHT(c); - if (!c->isfloating && selmon->lt[selmon->sellt]->arrange && - (abs(nx - c->x) > snap || abs(ny - c->y) > snap)) - togglefloating(NULL); - if (!selmon->lt[selmon->sellt]->arrange || c->isfloating) - resize(c, nx, ny, c->w, c->h, 1); - break; - } - } while (ev.type != ButtonRelease); - XUngrabPointer(dpy, CurrentTime); - if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) { - sendmon(c, m); - selmon = m; - focus(NULL); - } -} - -Client *nexttiled(Client *c) { - for (; c && (c->isfloating || !ISVISIBLE(c)); c = c->next) - ; - return c; -} - -void pop(Client *c) { - detach(c); - attach(c); - focus(c); - arrange(c->mon); -} - -void propertynotify(XEvent *e) { - Client *c; - Window trans; - XPropertyEvent *ev = &e->xproperty; - - if ((ev->window == root) && (ev->atom == XA_WM_NAME)) - updatestatus(); - else if (ev->state == PropertyDelete) - return; /* ignore */ - else if ((c = wintoclient(ev->window))) { - switch (ev->atom) { - default: - break; - case XA_WM_TRANSIENT_FOR: - if (!c->isfloating && (XGetTransientForHint(dpy, c->win, &trans)) && - (c->isfloating = (wintoclient(trans)) != NULL)) - arrange(c->mon); - break; - case XA_WM_NORMAL_HINTS: - c->hintsvalid = 0; - break; - case XA_WM_HINTS: - updatewmhints(c); - drawbars(); - break; - } - if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) { - updatetitle(c); - if (c == c->mon->sel) - drawbar(c->mon); - } - if (ev->atom == netatom[NetWMWindowType]) - updatewindowtype(c); - } -} - -void quit(const Arg *arg) { running = 0; } - -Monitor *recttomon(int x, int y, int w, int h) { - Monitor *m, *r = selmon; - int a, area = 0; - - for (m = mons; m; m = m->next) - if ((a = INTERSECT(x, y, w, h, m)) > area) { - area = a; - r = m; - } - return r; -} - -void resize(Client *c, int x, int y, int w, int h, int interact) { - if (applysizehints(c, &x, &y, &w, &h, interact)) - resizeclient(c, x, y, w, h); -} - -void resizeclient(Client *c, int x, int y, int w, int h) { - XWindowChanges wc; - - c->oldx = c->x; - c->x = wc.x = x; - c->oldy = c->y; - c->y = wc.y = y; - c->oldw = c->w; - c->w = wc.width = w; - c->oldh = c->h; - c->h = wc.height = h; - wc.border_width = c->bw; - XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, - &wc); - configure(c); - XSync(dpy, False); -} - -void resizemouse(const Arg *arg) { - int ocx, ocy, nw, nh; - Client *c; - Monitor *m; - XEvent ev; - Time lasttime = 0; - - if (!(c = selmon->sel)) - return; - if (c->isfullscreen) /* no support resizing fullscreen windows by mouse */ - return; - restack(selmon); - ocx = c->x; - ocy = c->y; - if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, - None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess) - return; - XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, - c->h + c->bw - 1); - do { - XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev); - switch (ev.type) { - case ConfigureRequest: - case Expose: - case MapRequest: - handler[ev.type](&ev); - break; - case MotionNotify: - if ((ev.xmotion.time - lasttime) <= (1000 / 60)) - continue; - lasttime = ev.xmotion.time; - - nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1); - nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1); - if (c->mon->wx + nw >= selmon->wx && - c->mon->wx + nw <= selmon->wx + selmon->ww && - c->mon->wy + nh >= selmon->wy && - c->mon->wy + nh <= selmon->wy + selmon->wh) { - if (!c->isfloating && selmon->lt[selmon->sellt]->arrange && - (abs(nw - c->w) > snap || abs(nh - c->h) > snap)) - togglefloating(NULL); - } - if (!selmon->lt[selmon->sellt]->arrange || c->isfloating) - resize(c, c->x, c->y, nw, nh, 1); - break; - } - } while (ev.type != ButtonRelease); - XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, - c->h + c->bw - 1); - XUngrabPointer(dpy, CurrentTime); - while (XCheckMaskEvent(dpy, EnterWindowMask, &ev)) - ; - if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) { - sendmon(c, m); - selmon = m; - focus(NULL); - } -} - -void restack(Monitor *m) { - Client *c; - XEvent ev; - XWindowChanges wc; - - drawbar(m); - if (!m->sel) - return; - if (m->sel->isfloating || !m->lt[m->sellt]->arrange) - XRaiseWindow(dpy, m->sel->win); - if (m->lt[m->sellt]->arrange) { - wc.stack_mode = Below; - wc.sibling = m->barwin; - for (c = m->stack; c; c = c->snext) - if (!c->isfloating && ISVISIBLE(c)) { - XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc); - wc.sibling = c->win; - } - } - XSync(dpy, False); - while (XCheckMaskEvent(dpy, EnterWindowMask, &ev)) - ; -} - -void rotatestack(const Arg *arg) { - Client *c = NULL, *f; - - if (!selmon->sel) - return; - f = selmon->sel; - if (arg->i > 0) { - for (c = nexttiled(selmon->clients); c && nexttiled(c->next); - c = nexttiled(c->next)) - ; - if (c) { - detach(c); - attach(c); - detachstack(c); - attachstack(c); - } - } else { - if ((c = nexttiled(selmon->clients))) { - detach(c); - enqueue(c); - detachstack(c); - enqueuestack(c); - } - } - if (c) { - arrange(selmon); - // unfocus(f, 1); - focus(f); - restack(selmon); - } -} - -void run(void) { - XEvent ev; - /* main event loop */ - XSync(dpy, False); - while (running && !XNextEvent(dpy, &ev)) - if (handler[ev.type]) - handler[ev.type](&ev); /* call handler */ -} - -void scan(void) { - unsigned int i, num; - Window d1, d2, *wins = NULL; - XWindowAttributes wa; - - if (XQueryTree(dpy, root, &d1, &d2, &wins, &num)) { - for (i = 0; i < num; i++) { - if (!XGetWindowAttributes(dpy, wins[i], &wa) || wa.override_redirect || - XGetTransientForHint(dpy, wins[i], &d1)) - continue; - if (wa.map_state == IsViewable || getstate(wins[i]) == IconicState) - manage(wins[i], &wa); - } - for (i = 0; i < num; i++) { /* now the transients */ - if (!XGetWindowAttributes(dpy, wins[i], &wa)) - continue; - if (XGetTransientForHint(dpy, wins[i], &d1) && - (wa.map_state == IsViewable || getstate(wins[i]) == IconicState)) - manage(wins[i], &wa); - } - if (wins) - XFree(wins); - } -} - -void sendmon(Client *c, Monitor *m) { - if (c->mon == m) - return; - unfocus(c, 1); - detach(c); - detachstack(c); - c->mon = m; - c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */ - attach(c); - attachstack(c); - focus(NULL); - arrange(NULL); -} - -void setclientstate(Client *c, long state) { - long data[] = {state, None}; - - XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32, - PropModeReplace, (unsigned char *)data, 2); -} - -int sendevent(Client *c, Atom proto) { - int n; - Atom *protocols; - int exists = 0; - XEvent ev; - - if (XGetWMProtocols(dpy, c->win, &protocols, &n)) { - while (!exists && n--) - exists = protocols[n] == proto; - XFree(protocols); - } - if (exists) { - ev.type = ClientMessage; - ev.xclient.window = c->win; - ev.xclient.message_type = wmatom[WMProtocols]; - ev.xclient.format = 32; - ev.xclient.data.l[0] = proto; - ev.xclient.data.l[1] = CurrentTime; - XSendEvent(dpy, c->win, False, NoEventMask, &ev); - } - return exists; -} - -void setfocus(Client *c) { - if (!c->neverfocus) { - XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); - XChangeProperty(dpy, root, netatom[NetActiveWindow], XA_WINDOW, 32, - PropModeReplace, (unsigned char *)&(c->win), 1); - } - sendevent(c, wmatom[WMTakeFocus]); -} - -void setfullscreen(Client *c, int fullscreen) { - if (fullscreen && !c->isfullscreen) { - XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32, - PropModeReplace, (unsigned char *)&netatom[NetWMFullscreen], - 1); - c->isfullscreen = 1; - c->oldstate = c->isfloating; - c->oldbw = c->bw; - c->bw = 0; - c->isfloating = 1; - resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh); - XRaiseWindow(dpy, c->win); - } else if (!fullscreen && c->isfullscreen) { - XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32, - PropModeReplace, (unsigned char *)0, 0); - c->isfullscreen = 0; - c->isfloating = c->oldstate; - c->bw = c->oldbw; - c->x = c->oldx; - c->y = c->oldy; - c->w = c->oldw; - c->h = c->oldh; - resizeclient(c, c->x, c->y, c->w, c->h); - arrange(c->mon); - } -} - -void setlayout(const Arg *arg) { - if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt]) - selmon->sellt ^= 1; - if (arg && arg->v) - selmon->lt[selmon->sellt] = (Layout *)arg->v; - strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, - sizeof selmon->ltsymbol); - if (selmon->sel) - arrange(selmon); - else - drawbar(selmon); -} - -void setcfact(const Arg *arg) { - float f; - Client *c; - - c = selmon->sel; - - if (!arg || !c || !selmon->lt[selmon->sellt]->arrange) - return; - f = arg->f + c->cfact; - if (arg->f == 0.0) - f = 1.0; - else if (f < 0.25 || f > 4.0) - return; - c->cfact = f; - arrange(selmon); -} - -/* arg > 1.0 will set mfact absolutely */ -void setmfact(const Arg *arg) { - float f; - - if (!arg || !selmon->lt[selmon->sellt]->arrange) - return; - f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0; - if (f < 0.05 || f > 0.95) - return; - selmon->mfact = f; - arrange(selmon); -} - -void setup(void) { - int i; - XSetWindowAttributes wa; - Atom utf8string; - struct sigaction sa; - - /* do not transform children into zombies when they terminate */ - sigemptyset(&sa.sa_mask); - sa.sa_flags = SA_NOCLDSTOP | SA_NOCLDWAIT | SA_RESTART; - sa.sa_handler = SIG_IGN; - sigaction(SIGCHLD, &sa, NULL); - - /* clean up any zombies (inherited from .xinitrc etc) immediately */ - while (waitpid(-1, NULL, WNOHANG) > 0) - ; - - /* init screen */ - screen = DefaultScreen(dpy); - sw = DisplayWidth(dpy, screen); - sh = DisplayHeight(dpy, screen); - root = RootWindow(dpy, screen); - drw = drw_create(dpy, screen, root, sw, sh); - if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) - die("no fonts could be loaded."); - lrpad = drw->fonts->h; - bh = drw->fonts->h + 2; - updategeom(); - /* init atoms */ - utf8string = XInternAtom(dpy, "UTF8_STRING", False); - wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False); - wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False); - wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False); - wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False); - netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False); - netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False); - netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False); - netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False); - netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False); - netatom[NetWMFullscreen] = - XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False); - netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False); - netatom[NetWMWindowTypeDialog] = - XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False); - netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False); - /* init cursors */ - cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr); - cursor[CurResize] = drw_cur_create(drw, XC_sizing); - cursor[CurMove] = drw_cur_create(drw, XC_fleur); - /* init appearance */ - scheme = ecalloc(LENGTH(colors) + 1, sizeof(Clr *)); - scheme[LENGTH(colors)] = drw_scm_create(drw, colors[0], 3); - for (i = 0; i < LENGTH(colors); i++) - scheme[i] = drw_scm_create(drw, colors[i], 3); - /* init bars */ - updatebars(); - updatestatus(); - /* supporting window for NetWMCheck */ - wmcheckwin = XCreateSimpleWindow(dpy, root, 0, 0, 1, 1, 0, 0, 0); - XChangeProperty(dpy, wmcheckwin, netatom[NetWMCheck], XA_WINDOW, 32, - PropModeReplace, (unsigned char *)&wmcheckwin, 1); - XChangeProperty(dpy, wmcheckwin, netatom[NetWMName], utf8string, 8, - PropModeReplace, (unsigned char *)"dwm", 3); - XChangeProperty(dpy, root, netatom[NetWMCheck], XA_WINDOW, 32, - PropModeReplace, (unsigned char *)&wmcheckwin, 1); - /* EWMH support per view */ - XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32, - PropModeReplace, (unsigned char *)netatom, NetLast); - XDeleteProperty(dpy, root, netatom[NetClientList]); - /* select events */ - wa.cursor = cursor[CurNormal]->cursor; - wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask | - ButtonPressMask | PointerMotionMask | EnterWindowMask | - LeaveWindowMask | StructureNotifyMask | PropertyChangeMask; - XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa); - XSelectInput(dpy, root, wa.event_mask); - grabkeys(); - focus(NULL); -} - -void seturgent(Client *c, int urg) { - XWMHints *wmh; - - c->isurgent = urg; - if (!(wmh = XGetWMHints(dpy, c->win))) - return; - wmh->flags = urg ? (wmh->flags | XUrgencyHint) : (wmh->flags & ~XUrgencyHint); - XSetWMHints(dpy, c->win, wmh); - XFree(wmh); -} - -void showhide(Client *c) { - if (!c) - return; - if (ISVISIBLE(c)) { - /* show clients top down */ - XMoveWindow(dpy, c->win, c->x, c->y); - if ((!c->mon->lt[c->mon->sellt]->arrange || c->isfloating) && - !c->isfullscreen) - resize(c, c->x, c->y, c->w, c->h, 0); - showhide(c->snext); - } else { - /* hide clients bottom up */ - showhide(c->snext); - XMoveWindow(dpy, c->win, WIDTH(c) * -2, c->y); - } -} - -void spawn(const Arg *arg) { - struct sigaction sa; - - if (arg->v == dmenucmd) - dmenumon[0] = '0' + selmon->num; - if (fork() == 0) { - if (dpy) - close(ConnectionNumber(dpy)); - setsid(); - - sigemptyset(&sa.sa_mask); - sa.sa_flags = 0; - sa.sa_handler = SIG_DFL; - sigaction(SIGCHLD, &sa, NULL); - - execvp(((char **)arg->v)[0], (char **)arg->v); - die("dwm: execvp '%s' failed:", ((char **)arg->v)[0]); - } -} - -void tag(const Arg *arg) { - if (selmon->sel && arg->ui & TAGMASK) { - selmon->sel->tags = arg->ui & TAGMASK; - focus(NULL); - arrange(selmon); - } -} - -void tagmon(const Arg *arg) { - if (!selmon->sel || !mons->next) - return; - sendmon(selmon->sel, dirtomon(arg->i)); -} - -void togglebar(const Arg *arg) { - selmon->showbar = !selmon->showbar; - updatebarpos(selmon); - XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, - bh); - arrange(selmon); -} - -void togglefloating(const Arg *arg) { - if (!selmon->sel) - return; - if (selmon->sel->isfullscreen) /* no support for fullscreen windows */ - return; - selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed; - if (selmon->sel->isfloating) - resize(selmon->sel, selmon->sel->x, selmon->sel->y, selmon->sel->w, - selmon->sel->h, 0); - arrange(selmon); -} - -void toggletag(const Arg *arg) { - unsigned int newtags; - - if (!selmon->sel) - return; - newtags = selmon->sel->tags ^ (arg->ui & TAGMASK); - if (newtags) { - selmon->sel->tags = newtags; - focus(NULL); - arrange(selmon); - } -} - -void toggleview(const Arg *arg) { - unsigned int newtagset = - selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK); - - if (newtagset) { - selmon->tagset[selmon->seltags] = newtagset; - focus(NULL); - arrange(selmon); - } -} - -void unfocus(Client *c, int setfocus) { - if (!c) - return; - grabbuttons(c, 0); - XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel); - if (setfocus) { - XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); - XDeleteProperty(dpy, root, netatom[NetActiveWindow]); - } -} - -void unmanage(Client *c, int destroyed) { - Monitor *m = c->mon; - XWindowChanges wc; - - detach(c); - detachstack(c); - if (!destroyed) { - wc.border_width = c->oldbw; - XGrabServer(dpy); /* avoid race conditions */ - XSetErrorHandler(xerrordummy); - XSelectInput(dpy, c->win, NoEventMask); - XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */ - XUngrabButton(dpy, AnyButton, AnyModifier, c->win); - setclientstate(c, WithdrawnState); - XSync(dpy, False); - XSetErrorHandler(xerror); - XUngrabServer(dpy); - } - free(c); - focus(NULL); - updateclientlist(); - arrange(m); -} - -void unmapnotify(XEvent *e) { - Client *c; - XUnmapEvent *ev = &e->xunmap; - - if ((c = wintoclient(ev->window))) { - if (ev->send_event) - setclientstate(c, WithdrawnState); - else - unmanage(c, 0); - } -} - -void updatebars(void) { - Monitor *m; - XSetWindowAttributes wa = {.override_redirect = True, - .background_pixmap = ParentRelative, - .event_mask = ButtonPressMask | ExposureMask}; - XClassHint ch = {"dwm", "dwm"}; - for (m = mons; m; m = m->next) { - if (m->barwin) - continue; - m->barwin = XCreateWindow( - dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen), - CopyFromParent, DefaultVisual(dpy, screen), - CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); - XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor); - XMapRaised(dpy, m->barwin); - XSetClassHint(dpy, m->barwin, &ch); - } -} - -void updatebarpos(Monitor *m) { - m->wy = m->my; - m->wh = m->mh; - if (m->showbar) { - m->wh -= bh; - m->by = m->topbar ? m->wy : m->wy + m->wh; - m->wy = m->topbar ? m->wy + bh : m->wy; - } else - m->by = -bh; -} - -void updateclientlist(void) { - Client *c; - Monitor *m; - - XDeleteProperty(dpy, root, netatom[NetClientList]); - for (m = mons; m; m = m->next) - for (c = m->clients; c; c = c->next) - XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, - PropModeAppend, (unsigned char *)&(c->win), 1); -} - -int updategeom(void) { - int dirty = 0; - -#ifdef XINERAMA - if (XineramaIsActive(dpy)) { - int i, j, n, nn; - Client *c; - Monitor *m; - XineramaScreenInfo *info = XineramaQueryScreens(dpy, &nn); - XineramaScreenInfo *unique = NULL; - - for (n = 0, m = mons; m; m = m->next, n++) - ; - /* only consider unique geometries as separate screens */ - unique = ecalloc(nn, sizeof(XineramaScreenInfo)); - for (i = 0, j = 0; i < nn; i++) - if (isuniquegeom(unique, j, &info[i])) - memcpy(&unique[j++], &info[i], sizeof(XineramaScreenInfo)); - XFree(info); - nn = j; - - /* new monitors if nn > n */ - for (i = n; i < nn; i++) { - for (m = mons; m && m->next; m = m->next) - ; - if (m) - m->next = createmon(); - else - mons = createmon(); - } - for (i = 0, m = mons; i < nn && m; m = m->next, i++) - if (i >= n || unique[i].x_org != m->mx || unique[i].y_org != m->my || - unique[i].width != m->mw || unique[i].height != m->mh) { - dirty = 1; - m->num = i; - m->mx = m->wx = unique[i].x_org; - m->my = m->wy = unique[i].y_org; - m->mw = m->ww = unique[i].width; - m->mh = m->wh = unique[i].height; - updatebarpos(m); - } - /* removed monitors if n > nn */ - for (i = nn; i < n; i++) { - for (m = mons; m && m->next; m = m->next) - ; - while ((c = m->clients)) { - dirty = 1; - m->clients = c->next; - detachstack(c); - c->mon = mons; - attach(c); - attachstack(c); - } - if (m == selmon) - selmon = mons; - cleanupmon(m); - } - free(unique); - } else -#endif /* XINERAMA */ - { /* default monitor setup */ - if (!mons) - mons = createmon(); - if (mons->mw != sw || mons->mh != sh) { - dirty = 1; - mons->mw = mons->ww = sw; - mons->mh = mons->wh = sh; - updatebarpos(mons); - } - } - if (dirty) { - selmon = mons; - selmon = wintomon(root); - } - return dirty; -} - -void updatenumlockmask(void) { - unsigned int i, j; - XModifierKeymap *modmap; - - numlockmask = 0; - modmap = XGetModifierMapping(dpy); - for (i = 0; i < 8; i++) - for (j = 0; j < modmap->max_keypermod; j++) - if (modmap->modifiermap[i * modmap->max_keypermod + j] == - XKeysymToKeycode(dpy, XK_Num_Lock)) - numlockmask = (1 << i); - XFreeModifiermap(modmap); -} - -void updatesizehints(Client *c) { - long msize; - XSizeHints size; - - if (!XGetWMNormalHints(dpy, c->win, &size, &msize)) - /* size is uninitialized, ensure that size.flags aren't used */ - size.flags = PSize; - if (size.flags & PBaseSize) { - c->basew = size.base_width; - c->baseh = size.base_height; - } else if (size.flags & PMinSize) { - c->basew = size.min_width; - c->baseh = size.min_height; - } else - c->basew = c->baseh = 0; - if (size.flags & PResizeInc) { - c->incw = size.width_inc; - c->inch = size.height_inc; - } else - c->incw = c->inch = 0; - if (size.flags & PMaxSize) { - c->maxw = size.max_width; - c->maxh = size.max_height; - } else - c->maxw = c->maxh = 0; - if (size.flags & PMinSize) { - c->minw = size.min_width; - c->minh = size.min_height; - } else if (size.flags & PBaseSize) { - c->minw = size.base_width; - c->minh = size.base_height; - } else - c->minw = c->minh = 0; - if (size.flags & PAspect) { - c->mina = (float)size.min_aspect.y / size.min_aspect.x; - c->maxa = (float)size.max_aspect.x / size.max_aspect.y; - } else - c->maxa = c->mina = 0.0; - c->isfixed = (c->maxw && c->maxh && c->maxw == c->minw && c->maxh == c->minh); - c->hintsvalid = 1; -} - -void updatestatus(void) { - if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext))) - strcpy(stext, "dwm-" VERSION); - drawbar(selmon); -} - -void updatetitle(Client *c) { - if (!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name)) - gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name); - if (c->name[0] == '\0') /* hack to mark broken clients */ - strcpy(c->name, broken); -} - -void updatewindowtype(Client *c) { - Atom state = getatomprop(c, netatom[NetWMState]); - Atom wtype = getatomprop(c, netatom[NetWMWindowType]); - - if (state == netatom[NetWMFullscreen]) - setfullscreen(c, 1); - if (wtype == netatom[NetWMWindowTypeDialog]) - c->isfloating = 1; -} - -void updatewmhints(Client *c) { - XWMHints *wmh; - - if ((wmh = XGetWMHints(dpy, c->win))) { - if (c == selmon->sel && wmh->flags & XUrgencyHint) { - wmh->flags &= ~XUrgencyHint; - XSetWMHints(dpy, c->win, wmh); - } else - c->isurgent = (wmh->flags & XUrgencyHint) ? 1 : 0; - if (wmh->flags & InputHint) - c->neverfocus = !wmh->input; - else - c->neverfocus = 0; - XFree(wmh); - } -} - -void view(const Arg *arg) { - if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags]) - return; - selmon->seltags ^= 1; /* toggle sel tagset */ - if (arg->ui & TAGMASK) - selmon->tagset[selmon->seltags] = arg->ui & TAGMASK; - focus(NULL); - arrange(selmon); -} - -Client *wintoclient(Window w) { - Client *c; - Monitor *m; - - for (m = mons; m; m = m->next) - for (c = m->clients; c; c = c->next) - if (c->win == w) - return c; - return NULL; -} - -Monitor *wintomon(Window w) { - int x, y; - Client *c; - Monitor *m; - - if (w == root && getrootptr(&x, &y)) - return recttomon(x, y, 1, 1); - for (m = mons; m; m = m->next) - if (w == m->barwin) - return m; - if ((c = wintoclient(w))) - return c->mon; - return selmon; -} - -/* There's no way to check accesses to destroyed windows, thus those cases are - * ignored (especially on UnmapNotify's). Other types of errors call Xlibs - * default error handler, which may call exit. */ -int xerror(Display *dpy, XErrorEvent *ee) { - if (ee->error_code == BadWindow || - (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch) || - (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable) || - (ee->request_code == X_PolyFillRectangle && - ee->error_code == BadDrawable) || - (ee->request_code == X_PolySegment && ee->error_code == BadDrawable) || - (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch) || - (ee->request_code == X_GrabButton && ee->error_code == BadAccess) || - (ee->request_code == X_GrabKey && ee->error_code == BadAccess) || - (ee->request_code == X_CopyArea && ee->error_code == BadDrawable)) - return 0; - fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n", - ee->request_code, ee->error_code); - return xerrorxlib(dpy, ee); /* may call exit */ -} - -int xerrordummy(Display *dpy, XErrorEvent *ee) { return 0; } - -/* Startup Error handler to check if another window manager - * is already running. */ -int xerrorstart(Display *dpy, XErrorEvent *ee) { - die("dwm: another window manager is already running"); - return -1; -} - -void zoom(const Arg *arg) { - Client *c = selmon->sel; - - if (!selmon->lt[selmon->sellt]->arrange || !c || c->isfloating) - return; - if (c == nexttiled(selmon->clients) && !(c = nexttiled(c->next))) - return; - pop(c); -} - -int main(int argc, char *argv[]) { - if (argc == 2 && !strcmp("-v", argv[1])) - die("dwm-" VERSION); - else if (argc != 1) - die("usage: dwm [-v]"); - if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) - fputs("warning: no locale support\n", stderr); - if (!(dpy = XOpenDisplay(NULL))) - die("dwm: cannot open display"); - checkotherwm(); - setup(); -#ifdef __OpenBSD__ - if (pledge("stdio rpath proc exec", NULL) == -1) - die("pledge"); -#endif /* __OpenBSD__ */ - scan(); - run(); - cleanup(); - XCloseDisplay(dpy); - return EXIT_SUCCESS; -} diff --git a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/transient.c b/hosts/laptop/modules/system/nix/x/dwm/source/dwm/transient.c deleted file mode 100644 index 4e7fc13..0000000 --- a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/transient.c +++ /dev/null @@ -1,42 +0,0 @@ -/* cc transient.c -o transient -lX11 */ - -#include -#include -#include -#include - -int main(void) { - Display *d; - Window r, f, t = None; - XSizeHints h; - XEvent e; - - d = XOpenDisplay(NULL); - if (!d) - exit(1); - r = DefaultRootWindow(d); - - f = XCreateSimpleWindow(d, r, 100, 100, 400, 400, 0, 0, 0); - h.min_width = h.max_width = h.min_height = h.max_height = 400; - h.flags = PMinSize | PMaxSize; - XSetWMNormalHints(d, f, &h); - XStoreName(d, f, "floating"); - XMapWindow(d, f); - - XSelectInput(d, f, ExposureMask); - while (1) { - XNextEvent(d, &e); - - if (t == None) { - sleep(5); - t = XCreateSimpleWindow(d, r, 50, 50, 100, 100, 0, 0, 0); - XSetTransientForHint(d, t, f); - XStoreName(d, t, "transient"); - XMapWindow(d, t); - XSelectInput(d, t, ExposureMask); - } - } - - XCloseDisplay(d); - exit(0); -} diff --git a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/util.c b/hosts/laptop/modules/system/nix/x/dwm/source/dwm/util.c deleted file mode 100644 index 88ce6cf..0000000 --- a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/util.c +++ /dev/null @@ -1,32 +0,0 @@ -/* See LICENSE file for copyright and license details. */ -#include -#include -#include -#include - -#include "util.h" - -void die(const char *fmt, ...) { - va_list ap; - - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - - if (fmt[0] && fmt[strlen(fmt) - 1] == ':') { - fputc(' ', stderr); - perror(NULL); - } else { - fputc('\n', stderr); - } - - exit(1); -} - -void *ecalloc(size_t nmemb, size_t size) { - void *p; - - if (!(p = calloc(nmemb, size))) - die("calloc:"); - return p; -} diff --git a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/util.h b/hosts/laptop/modules/system/nix/x/dwm/source/dwm/util.h deleted file mode 100644 index 9a8e39c..0000000 --- a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/util.h +++ /dev/null @@ -1,8 +0,0 @@ -/* See LICENSE file for copyright and license details. */ - -#define MAX(A, B) ((A) > (B) ? (A) : (B)) -#define MIN(A, B) ((A) < (B) ? (A) : (B)) -#define BETWEEN(X, A, B) ((A) <= (X) && (X) <= (B)) - -void die(const char *fmt, ...); -void *ecalloc(size_t nmemb, size_t size); diff --git a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/vanitygaps.c b/hosts/laptop/modules/system/nix/x/dwm/source/dwm/vanitygaps.c deleted file mode 100644 index 3f82866..0000000 --- a/hosts/laptop/modules/system/nix/x/dwm/source/dwm/vanitygaps.c +++ /dev/null @@ -1,778 +0,0 @@ -/* Key binding functions */ -static void defaultgaps(const Arg *arg); -static void incrgaps(const Arg *arg); -static void incrigaps(const Arg *arg); -static void incrogaps(const Arg *arg); -static void incrohgaps(const Arg *arg); -static void incrovgaps(const Arg *arg); -static void incrihgaps(const Arg *arg); -static void incrivgaps(const Arg *arg); -static void togglegaps(const Arg *arg); -/* Layouts (delete the ones you do not need) */ -static void bstack(Monitor *m); -static void bstackhoriz(Monitor *m); -static void centeredmaster(Monitor *m); -static void centeredfloatingmaster(Monitor *m); -static void deck(Monitor *m); -static void dwindle(Monitor *m); -static void fibonacci(Monitor *m, int s); -static void grid(Monitor *m); -static void nrowgrid(Monitor *m); -static void spiral(Monitor *m); -static void tile(Monitor *m); -/* Internals */ -static void getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, - unsigned int *nc); -static void getfacts(Monitor *m, int msize, int ssize, float *mf, float *sf, - int *mr, int *sr); -static void setgaps(int oh, int ov, int ih, int iv); - -/* Settings */ -#if !PERTAG_PATCH -static int enablegaps = 1; -#endif // PERTAG_PATCH - -void setgaps(int oh, int ov, int ih, int iv) { - if (oh < 0) - oh = 0; - if (ov < 0) - ov = 0; - if (ih < 0) - ih = 0; - if (iv < 0) - iv = 0; - - selmon->gappoh = oh; - selmon->gappov = ov; - selmon->gappih = ih; - selmon->gappiv = iv; - arrange(selmon); -} - -void togglegaps(const Arg *arg) { -#if PERTAG_PATCH - selmon->pertag->enablegaps[selmon->pertag->curtag] = - !selmon->pertag->enablegaps[selmon->pertag->curtag]; -#else - enablegaps = !enablegaps; -#endif // PERTAG_PATCH - arrange(NULL); -} - -void defaultgaps(const Arg *arg) { setgaps(gappoh, gappov, gappih, gappiv); } - -void incrgaps(const Arg *arg) { - setgaps(selmon->gappoh + arg->i, selmon->gappov + arg->i, - selmon->gappih + arg->i, selmon->gappiv + arg->i); -} - -void incrigaps(const Arg *arg) { - setgaps(selmon->gappoh, selmon->gappov, selmon->gappih + arg->i, - selmon->gappiv + arg->i); -} - -void incrogaps(const Arg *arg) { - setgaps(selmon->gappoh + arg->i, selmon->gappov + arg->i, selmon->gappih, - selmon->gappiv); -} - -void incrohgaps(const Arg *arg) { - setgaps(selmon->gappoh + arg->i, selmon->gappov, selmon->gappih, - selmon->gappiv); -} - -void incrovgaps(const Arg *arg) { - setgaps(selmon->gappoh, selmon->gappov + arg->i, selmon->gappih, - selmon->gappiv); -} - -void incrihgaps(const Arg *arg) { - setgaps(selmon->gappoh, selmon->gappov, selmon->gappih + arg->i, - selmon->gappiv); -} - -void incrivgaps(const Arg *arg) { - setgaps(selmon->gappoh, selmon->gappov, selmon->gappih, - selmon->gappiv + arg->i); -} - -void getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, unsigned int *nc) { - unsigned int n, oe, ie; -#if PERTAG_PATCH - oe = ie = selmon->pertag->enablegaps[selmon->pertag->curtag]; -#else - oe = ie = enablegaps; -#endif // PERTAG_PATCH - Client *c; - - for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) - ; - if (smartgaps && n == 1) { - oe = 0; // outer gaps disabled when only one client - } - - *oh = m->gappoh * oe; // outer horizontal gap - *ov = m->gappov * oe; // outer vertical gap - *ih = m->gappih * ie; // inner horizontal gap - *iv = m->gappiv * ie; // inner vertical gap - *nc = n; // number of clients -} - -void getfacts(Monitor *m, int msize, int ssize, float *mf, float *sf, int *mr, - int *sr) { - unsigned int n; - float mfacts = 0, sfacts = 0; - int mtotal = 0, stotal = 0; - Client *c; - - for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) - if (n < m->nmaster) - mfacts += c->cfact; - else - sfacts += c->cfact; - - for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) - if (n < m->nmaster) - mtotal += msize * (c->cfact / mfacts); - else - stotal += ssize * (c->cfact / sfacts); - - *mf = mfacts; // total factor of master area - *sf = sfacts; // total factor of stack area - *mr = msize - - mtotal; // the remainder (rest) of pixels after a cfacts master split - *sr = ssize - - stotal; // the remainder (rest) of pixels after a cfacts stack split -} - -/*** - * Layouts - */ - -/* - * Bottomstack layout + gaps - * https://dwm.suckless.org/patches/bottomstack/ - */ -static void bstack(Monitor *m) { - unsigned int i, n; - int oh, ov, ih, iv; - int mx = 0, my = 0, mh = 0, mw = 0; - int sx = 0, sy = 0, sh = 0, sw = 0; - float mfacts, sfacts; - int mrest, srest; - Client *c; - - getgaps(m, &oh, &ov, &ih, &iv, &n); - if (n == 0) - return; - - sx = mx = m->wx + ov; - sy = my = m->wy + oh; - sh = mh = m->wh - 2 * oh; - mw = m->ww - 2 * ov - iv * (MIN(n, m->nmaster) - 1); - sw = m->ww - 2 * ov - iv * (n - m->nmaster - 1); - - if (m->nmaster && n > m->nmaster) { - sh = (mh - ih) * (1 - m->mfact); - mh = mh - ih - sh; - sx = mx; - sy = my + mh + ih; - } - - getfacts(m, mw, sw, &mfacts, &sfacts, &mrest, &srest); - - for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { - if (i < m->nmaster) { - resize(c, mx, my, - mw * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2 * c->bw), - mh - (2 * c->bw), 0); - mx += WIDTH(c) + iv; - } else { - resize(c, sx, sy, - sw * (c->cfact / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - - (2 * c->bw), - sh - (2 * c->bw), 0); - sx += WIDTH(c) + iv; - } - } -} - -static void bstackhoriz(Monitor *m) { - unsigned int i, n; - int oh, ov, ih, iv; - int mx = 0, my = 0, mh = 0, mw = 0; - int sx = 0, sy = 0, sh = 0, sw = 0; - float mfacts, sfacts; - int mrest, srest; - Client *c; - - getgaps(m, &oh, &ov, &ih, &iv, &n); - if (n == 0) - return; - - sx = mx = m->wx + ov; - sy = my = m->wy + oh; - mh = m->wh - 2 * oh; - sh = m->wh - 2 * oh - ih * (n - m->nmaster - 1); - mw = m->ww - 2 * ov - iv * (MIN(n, m->nmaster) - 1); - sw = m->ww - 2 * ov; - - if (m->nmaster && n > m->nmaster) { - sh = (mh - ih) * (1 - m->mfact); - mh = mh - ih - sh; - sy = my + mh + ih; - sh = m->wh - mh - 2 * oh - ih * (n - m->nmaster); - } - - getfacts(m, mw, sh, &mfacts, &sfacts, &mrest, &srest); - - for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { - if (i < m->nmaster) { - resize(c, mx, my, - mw * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2 * c->bw), - mh - (2 * c->bw), 0); - mx += WIDTH(c) + iv; - } else { - resize(c, sx, sy, sw - (2 * c->bw), - sh * (c->cfact / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - - (2 * c->bw), - 0); - sy += HEIGHT(c) + ih; - } - } -} - -/* - * Centred master layout + gaps - * https://dwm.suckless.org/patches/centeredmaster/ - */ -void centeredmaster(Monitor *m) { - unsigned int i, n; - int oh, ov, ih, iv; - int mx = 0, my = 0, mh = 0, mw = 0; - int lx = 0, ly = 0, lw = 0, lh = 0; - int rx = 0, ry = 0, rw = 0, rh = 0; - float mfacts = 0, lfacts = 0, rfacts = 0; - int mtotal = 0, ltotal = 0, rtotal = 0; - int mrest = 0, lrest = 0, rrest = 0; - Client *c; - - getgaps(m, &oh, &ov, &ih, &iv, &n); - if (n == 0) - return; - - /* initialize areas */ - mx = m->wx + ov; - my = m->wy + oh; - mh = m->wh - 2 * oh - ih * ((!m->nmaster ? n : MIN(n, m->nmaster)) - 1); - mw = m->ww - 2 * ov; - lh = m->wh - 2 * oh - ih * (((n - m->nmaster) / 2) - 1); - rh = m->wh - 2 * oh - - ih * (((n - m->nmaster) / 2) - ((n - m->nmaster) % 2 ? 0 : 1)); - - if (m->nmaster && n > m->nmaster) { - /* go mfact box in the center if more than nmaster clients */ - if (n - m->nmaster > 1) { - /* ||<-S->|<---M--->|<-S->|| */ - mw = (m->ww - 2 * ov - 2 * iv) * m->mfact; - lw = (m->ww - mw - 2 * ov - 2 * iv) / 2; - rw = (m->ww - mw - 2 * ov - 2 * iv) - lw; - mx += lw + iv; - } else { - /* ||<---M--->|<-S->|| */ - mw = (mw - iv) * m->mfact; - lw = 0; - rw = m->ww - mw - iv - 2 * ov; - } - lx = m->wx + ov; - ly = m->wy + oh; - rx = mx + mw + iv; - ry = m->wy + oh; - } - - /* calculate facts */ - for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) { - if (!m->nmaster || n < m->nmaster) - mfacts += c->cfact; - else if ((n - m->nmaster) % 2) - lfacts += c->cfact; // total factor of left hand stack area - else - rfacts += c->cfact; // total factor of right hand stack area - } - - for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) - if (!m->nmaster || n < m->nmaster) - mtotal += mh * (c->cfact / mfacts); - else if ((n - m->nmaster) % 2) - ltotal += lh * (c->cfact / lfacts); - else - rtotal += rh * (c->cfact / rfacts); - - mrest = mh - mtotal; - lrest = lh - ltotal; - rrest = rh - rtotal; - - for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { - if (!m->nmaster || i < m->nmaster) { - /* nmaster clients are stacked vertically, in the center of the screen */ - resize(c, mx, my, mw - (2 * c->bw), - mh * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2 * c->bw), 0); - my += HEIGHT(c) + ih; - } else { - /* stack clients are stacked vertically */ - if ((i - m->nmaster) % 2) { - resize(c, lx, ly, lw - (2 * c->bw), - lh * (c->cfact / lfacts) + - ((i - 2 * m->nmaster) < 2 * lrest ? 1 : 0) - (2 * c->bw), - 0); - ly += HEIGHT(c) + ih; - } else { - resize(c, rx, ry, rw - (2 * c->bw), - rh * (c->cfact / rfacts) + - ((i - 2 * m->nmaster) < 2 * rrest ? 1 : 0) - (2 * c->bw), - 0); - ry += HEIGHT(c) + ih; - } - } - } -} - -void centeredfloatingmaster(Monitor *m) { - unsigned int i, n; - float mfacts, sfacts; - float mivf = 1.0; // master inner vertical gap factor - int oh, ov, ih, iv, mrest, srest; - int mx = 0, my = 0, mh = 0, mw = 0; - int sx = 0, sy = 0, sh = 0, sw = 0; - Client *c; - - getgaps(m, &oh, &ov, &ih, &iv, &n); - if (n == 0) - return; - - sx = mx = m->wx + ov; - sy = my = m->wy + oh; - sh = mh = m->wh - 2 * oh; - mw = m->ww - 2 * ov - iv * (n - 1); - sw = m->ww - 2 * ov - iv * (n - m->nmaster - 1); - - if (m->nmaster && n > m->nmaster) { - mivf = 0.8; - /* go mfact box in the center if more than nmaster clients */ - if (m->ww > m->wh) { - mw = m->ww * m->mfact - iv * mivf * (MIN(n, m->nmaster) - 1); - mh = m->wh * 0.9; - } else { - mw = m->ww * 0.9 - iv * mivf * (MIN(n, m->nmaster) - 1); - mh = m->wh * m->mfact; - } - mx = m->wx + (m->ww - mw) / 2; - my = m->wy + (m->wh - mh - 2 * oh) / 2; - - sx = m->wx + ov; - sy = m->wy + oh; - sh = m->wh - 2 * oh; - } - - getfacts(m, mw, sw, &mfacts, &sfacts, &mrest, &srest); - - for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) - if (i < m->nmaster) { - /* nmaster clients are stacked horizontally, in the center of the screen - */ - resize(c, mx, my, - mw * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2 * c->bw), - mh - (2 * c->bw), 0); - mx += WIDTH(c) + iv * mivf; - } else { - /* stack clients are stacked horizontally */ - resize(c, sx, sy, - sw * (c->cfact / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - - (2 * c->bw), - sh - (2 * c->bw), 0); - sx += WIDTH(c) + iv; - } -} - -/* - * Deck layout + gaps - * https://dwm.suckless.org/patches/deck/ - */ -void deck(Monitor *m) { - unsigned int i, n; - int oh, ov, ih, iv; - int mx = 0, my = 0, mh = 0, mw = 0; - int sx = 0, sy = 0, sh = 0, sw = 0; - float mfacts, sfacts; - int mrest, srest; - Client *c; - - getgaps(m, &oh, &ov, &ih, &iv, &n); - if (n == 0) - return; - - sx = mx = m->wx + ov; - sy = my = m->wy + oh; - sh = mh = m->wh - 2 * oh - ih * (MIN(n, m->nmaster) - 1); - sw = mw = m->ww - 2 * ov; - - if (m->nmaster && n > m->nmaster) { - sw = (mw - iv) * (1 - m->mfact); - mw = mw - iv - sw; - sx = mx + mw + iv; - sh = m->wh - 2 * oh; - } - - getfacts(m, mh, sh, &mfacts, &sfacts, &mrest, &srest); - - if (n - m->nmaster > 0) /* override layout symbol */ - snprintf(m->ltsymbol, sizeof m->ltsymbol, "D %d", n - m->nmaster); - - for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) - if (i < m->nmaster) { - resize(c, mx, my, mw - (2 * c->bw), - mh * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2 * c->bw), 0); - my += HEIGHT(c) + ih; - } else { - resize(c, sx, sy, sw - (2 * c->bw), sh - (2 * c->bw), 0); - } -} - -/* - * Fibonacci layout + gaps - * https://dwm.suckless.org/patches/fibonacci/ - */ -void fibonacci(Monitor *m, int s) { - unsigned int i, n; - int nx, ny, nw, nh; - int oh, ov, ih, iv; - int nv, hrest = 0, wrest = 0, r = 1; - Client *c; - - getgaps(m, &oh, &ov, &ih, &iv, &n); - if (n == 0) - return; - - nx = m->wx + ov; - ny = m->wy + oh; - nw = m->ww - 2 * ov; - nh = m->wh - 2 * oh; - - for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next)) { - if (r) { - if ((i % 2 && (nh - ih) / 2 <= (bh + 2 * c->bw)) || - (!(i % 2) && (nw - iv) / 2 <= (bh + 2 * c->bw))) { - r = 0; - } - if (r && i < n - 1) { - if (i % 2) { - nv = (nh - ih) / 2; - hrest = nh - 2 * nv - ih; - nh = nv; - } else { - nv = (nw - iv) / 2; - wrest = nw - 2 * nv - iv; - nw = nv; - } - - if ((i % 4) == 2 && !s) - nx += nw + iv; - else if ((i % 4) == 3 && !s) - ny += nh + ih; - } - - if ((i % 4) == 0) { - if (s) { - ny += nh + ih; - nh += hrest; - } else { - nh -= hrest; - ny -= nh + ih; - } - } else if ((i % 4) == 1) { - nx += nw + iv; - nw += wrest; - } else if ((i % 4) == 2) { - ny += nh + ih; - nh += hrest; - if (i < n - 1) - nw += wrest; - } else if ((i % 4) == 3) { - if (s) { - nx += nw + iv; - nw -= wrest; - } else { - nw -= wrest; - nx -= nw + iv; - nh += hrest; - } - } - if (i == 0) { - if (n != 1) { - nw = (m->ww - iv - 2 * ov) - (m->ww - iv - 2 * ov) * (1 - m->mfact); - wrest = 0; - } - ny = m->wy + oh; - } else if (i == 1) - nw = m->ww - nw - iv - 2 * ov; - i++; - } - - resize(c, nx, ny, nw - (2 * c->bw), nh - (2 * c->bw), False); - } -} - -void dwindle(Monitor *m) { fibonacci(m, 1); } - -void spiral(Monitor *m) { fibonacci(m, 0); } - -/* - * Gappless grid layout + gaps (ironically) - * https://dwm.suckless.org/patches/gaplessgrid/ - */ -void gaplessgrid(Monitor *m) { - unsigned int i, n; - int x, y, cols, rows, ch, cw, cn, rn, rrest, crest; // counters - int oh, ov, ih, iv; - Client *c; - - getgaps(m, &oh, &ov, &ih, &iv, &n); - if (n == 0) - return; - - /* grid dimensions */ - for (cols = 0; cols <= n / 2; cols++) - if (cols * cols >= n) - break; - if (n == - 5) /* set layout against the general calculation: not 1:2:2, but 2:3 */ - cols = 2; - rows = n / cols; - cn = rn = 0; // reset column no, row no, client count - - ch = (m->wh - 2 * oh - ih * (rows - 1)) / rows; - cw = (m->ww - 2 * ov - iv * (cols - 1)) / cols; - rrest = (m->wh - 2 * oh - ih * (rows - 1)) - ch * rows; - crest = (m->ww - 2 * ov - iv * (cols - 1)) - cw * cols; - x = m->wx + ov; - y = m->wy + oh; - - for (i = 0, c = nexttiled(m->clients); c; i++, c = nexttiled(c->next)) { - if (i / rows + 1 > cols - n % cols) { - rows = n / cols + 1; - ch = (m->wh - 2 * oh - ih * (rows - 1)) / rows; - rrest = (m->wh - 2 * oh - ih * (rows - 1)) - ch * rows; - } - resize(c, x, y + rn * (ch + ih) + MIN(rn, rrest), - cw + (cn < crest ? 1 : 0) - 2 * c->bw, - ch + (rn < rrest ? 1 : 0) - 2 * c->bw, 0); - rn++; - if (rn >= rows) { - rn = 0; - x += cw + ih + (cn < crest ? 1 : 0); - cn++; - } - } -} - -/* - * Gridmode layout + gaps - * https://dwm.suckless.org/patches/gridmode/ - */ -void grid(Monitor *m) { - unsigned int i, n; - int cx, cy, cw, ch, cc, cr, chrest, cwrest, cols, rows; - int oh, ov, ih, iv; - Client *c; - - getgaps(m, &oh, &ov, &ih, &iv, &n); - - /* grid dimensions */ - for (rows = 0; rows <= n / 2; rows++) - if (rows * rows >= n) - break; - cols = (rows && (rows - 1) * rows >= n) ? rows - 1 : rows; - - /* window geoms (cell height/width) */ - ch = (m->wh - 2 * oh - ih * (rows - 1)) / (rows ? rows : 1); - cw = (m->ww - 2 * ov - iv * (cols - 1)) / (cols ? cols : 1); - chrest = (m->wh - 2 * oh - ih * (rows - 1)) - ch * rows; - cwrest = (m->ww - 2 * ov - iv * (cols - 1)) - cw * cols; - for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { - cc = i / rows; - cr = i % rows; - cx = m->wx + ov + cc * (cw + iv) + MIN(cc, cwrest); - cy = m->wy + oh + cr * (ch + ih) + MIN(cr, chrest); - resize(c, cx, cy, cw + (cc < cwrest ? 1 : 0) - 2 * c->bw, - ch + (cr < chrest ? 1 : 0) - 2 * c->bw, False); - } -} - -/* - * Horizontal grid layout + gaps - * https://dwm.suckless.org/patches/horizgrid/ - */ -void horizgrid(Monitor *m) { - Client *c; - unsigned int n, i; - int oh, ov, ih, iv; - int mx = 0, my = 0, mh = 0, mw = 0; - int sx = 0, sy = 0, sh = 0, sw = 0; - int ntop, nbottom = 1; - float mfacts = 0, sfacts = 0; - int mrest, srest, mtotal = 0, stotal = 0; - - /* Count windows */ - getgaps(m, &oh, &ov, &ih, &iv, &n); - if (n == 0) - return; - - if (n <= 2) - ntop = n; - else { - ntop = n / 2; - nbottom = n - ntop; - } - sx = mx = m->wx + ov; - sy = my = m->wy + oh; - sh = mh = m->wh - 2 * oh; - sw = mw = m->ww - 2 * ov; - - if (n > ntop) { - sh = (mh - ih) / 2; - mh = mh - ih - sh; - sy = my + mh + ih; - mw = m->ww - 2 * ov - iv * (ntop - 1); - sw = m->ww - 2 * ov - iv * (nbottom - 1); - } - - /* calculate facts */ - for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) - if (i < ntop) - mfacts += c->cfact; - else - sfacts += c->cfact; - - for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) - if (i < ntop) - mtotal += mh * (c->cfact / mfacts); - else - stotal += sw * (c->cfact / sfacts); - - mrest = mh - mtotal; - srest = sw - stotal; - - for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) - if (i < ntop) { - resize(c, mx, my, - mw * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2 * c->bw), - mh - (2 * c->bw), 0); - mx += WIDTH(c) + iv; - } else { - resize(c, sx, sy, - sw * (c->cfact / sfacts) + ((i - ntop) < srest ? 1 : 0) - - (2 * c->bw), - sh - (2 * c->bw), 0); - sx += WIDTH(c) + iv; - } -} - -/* - * nrowgrid layout + gaps - * https://dwm.suckless.org/patches/nrowgrid/ - */ -void nrowgrid(Monitor *m) { - unsigned int n; - int ri = 0, ci = 0; /* counters */ - int oh, ov, ih, iv; /* vanitygap settings */ - unsigned int cx, cy, cw, ch; /* client geometry */ - unsigned int uw = 0, uh = 0, uc = 0; /* utilization trackers */ - unsigned int cols, rows = m->nmaster + 1; - Client *c; - - /* count clients */ - getgaps(m, &oh, &ov, &ih, &iv, &n); - - /* nothing to do here */ - if (n == 0) - return; - - /* force 2 clients to always split vertically */ - if (FORCE_VSPLIT && n == 2) - rows = 1; - - /* never allow empty rows */ - if (n < rows) - rows = n; - - /* define first row */ - cols = n / rows; - uc = cols; - cy = m->wy + oh; - ch = (m->wh - 2 * oh - ih * (rows - 1)) / rows; - uh = ch; - - for (c = nexttiled(m->clients); c; c = nexttiled(c->next), ci++) { - if (ci == cols) { - uw = 0; - ci = 0; - ri++; - - /* next row */ - cols = (n - uc) / (rows - ri); - uc += cols; - cy = m->wy + oh + uh + ih; - uh += ch + ih; - } - - cx = m->wx + ov + uw; - cw = (m->ww - 2 * ov - uw) / (cols - ci); - uw += cw + iv; - - resize(c, cx, cy, cw - (2 * c->bw), ch - (2 * c->bw), 0); - } -} - -/* - * Default tile layout + gaps - */ -static void tile(Monitor *m) { - unsigned int i, n; - int oh, ov, ih, iv; - int mx = 0, my = 0, mh = 0, mw = 0; - int sx = 0, sy = 0, sh = 0, sw = 0; - float mfacts, sfacts; - int mrest, srest; - Client *c; - - getgaps(m, &oh, &ov, &ih, &iv, &n); - if (n == 0) - return; - - sx = mx = m->wx + ov; - sy = my = m->wy + oh; - mh = m->wh - 2 * oh - ih * (MIN(n, m->nmaster) - 1); - sh = m->wh - 2 * oh - ih * (n - m->nmaster - 1); - sw = mw = m->ww - 2 * ov; - - if (m->nmaster && n > m->nmaster) { - sw = (mw - iv) * (1 - m->mfact); - mw = mw - iv - sw; - sx = mx + mw + iv; - } - - getfacts(m, mh, sh, &mfacts, &sfacts, &mrest, &srest); - - for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) - if (i < m->nmaster) { - resize(c, mx, my, mw - (2 * c->bw), - mh * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2 * c->bw), 0); - my += HEIGHT(c) + ih; - } else { - resize(c, sx, sy, sw - (2 * c->bw), - sh * (c->cfact / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - - (2 * c->bw), - 0); - sy += HEIGHT(c) + ih; - } -}