From 53ed0710624a99dd496e7beadab75f819cde9176 Mon Sep 17 00:00:00 2001 From: afonsofrancof Date: Mon, 2 Oct 2023 19:03:18 +0100 Subject: [PATCH 1/8] Added default compiler to Compiler Explorer --- .config/nvim/lazy-lock.json | 24 ++++++++++++------------ .config/nvim/lua/plugins/lazy.lua | 3 +++ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 00f8c18..bef18e1 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "480b032f6708573334f4437d3f83307d143f1a72" }, + "LuaSnip": { "branch": "master", "commit": "ea7d7ea510c641c4f15042becd27f35b3e5b3c2b" }, "bufferline.nvim": { "branch": "main", "commit": "243893ba9d5d1049dd451a25cab32ec7f8f67bcf" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, @@ -9,7 +9,7 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "compiler-explorer.nvim": { "branch": "master", "commit": "ee8e7a2808bdad67cd2acb61b5c9ffa7735c7ec9" }, - "copilot.lua": { "branch": "master", "commit": "1a8032ae496916ccc7a7a52ee79194fbef29f462" }, + "copilot.lua": { "branch": "master", "commit": "2c942f33ba5c621c906e625e00a1bb504b65e2f0" }, "dressing.nvim": { "branch": "master", "commit": "c1e1d5fa44fe08811b6ef4aadac2b50e602f9504" }, "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, "friendly-snippets": { "branch": "main", "commit": "ebf6d6e83494cdd88a54a429340256f4dbb6a052" }, @@ -17,20 +17,20 @@ "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" }, "leap.nvim": { "branch": "main", "commit": "5efe985cf68fac3b6a6dfe7a75fbfaca8db2af9c" }, "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "2451adb9bdb0fd32140bf3aa8dbc17ff60050db3" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "f014db32437aa61c86fc0ef1067cd2bc6a37205c" }, "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" }, - "neorg": { "branch": "main", "commit": "745715c873395840a5127413d1ef30a42735605e" }, + "neorg": { "branch": "main", "commit": "069cf8a460594ca6f4233c83aac1a31a96c62d98" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, - "nvim": { "branch": "main", "commit": "3d9a5ed556e289bce6c1fb0af89ec838360641b2" }, - "nvim-autopairs": { "branch": "master", "commit": "de4f7138a68d5d5063170f2182fd27faf06b0b54" }, + "nvim": { "branch": "main", "commit": "85e93601e0f0b48aa2c6bbfae4d0e9d7a1898280" }, + "nvim-autopairs": { "branch": "master", "commit": "defad64afbf19381fe31488a7582bbac421d6e38" }, "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, - "nvim-lspconfig": { "branch": "master", "commit": "bfdf2e91e7297a54bcc09d3e092a12bff69a1cf4" }, + "nvim-lspconfig": { "branch": "master", "commit": "cc388d3f6b9c7c943ae2b2dcd46ad470fd257f91" }, "nvim-tmux-navigation": { "branch": "main", "commit": "543f090a45cef28156162883d2412fffecb6b750" }, - "nvim-treesitter": { "branch": "master", "commit": "d6c9c85e14e15bc59478a0d5d810e88dad0ac53f" }, - "nvim-treesitter-context": { "branch": "master", "commit": "6795de086ef713383e06b53faa534a597436159a" }, - "nvim-web-devicons": { "branch": "master", "commit": "45d0237c427baba8cd05e0ab26d30e2ee58c2c82" }, - "oil.nvim": { "branch": "master", "commit": "96a334abeb85a26af87585ec3810116c7cb7d172" }, + "nvim-treesitter": { "branch": "master", "commit": "794266a4edc8ab57b0d637626f01b5278a9123d8" }, + "nvim-treesitter-context": { "branch": "master", "commit": "b6c763db8cc486215ba96e0a67418848a710ab25" }, + "nvim-web-devicons": { "branch": "master", "commit": "973ab742f143a796a779af4d786ec409116a0d87" }, + "oil.nvim": { "branch": "master", "commit": "9e036c6a4868b971127f3cb6bac6197bb4103723" }, "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, @@ -39,7 +39,7 @@ "telescope.nvim": { "branch": "master", "commit": "b79cd6c88b3d96b0f49cb7d240807cd59b610cd8" }, "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" }, - "vim-fugitive": { "branch": "master", "commit": "99db68d9b3304580bd383da7aaee05c7a954a344" }, + "vim-fugitive": { "branch": "master", "commit": "6fcb0ad03982de646e3fecb6915e585651b9a9fb" }, "vim-jukit": { "branch": "master", "commit": "4d1f4e4c3923464e12f86fce49eb198b6e61a2a9" }, "vim-obsession": { "branch": "master", "commit": "fe9d3e1a9a50171e7d316a52e1e56d868e4c1fe5" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, diff --git a/.config/nvim/lua/plugins/lazy.lua b/.config/nvim/lua/plugins/lazy.lua index 80b5899..26dd26c 100644 --- a/.config/nvim/lua/plugins/lazy.lua +++ b/.config/nvim/lua/plugins/lazy.lua @@ -119,6 +119,9 @@ lazy.setup({ compiler_flags = "", -- Default flags passed to the compiler. job_timeout_ms = 25000, -- Timeout for libuv job in milliseconds. languages = { -- Language specific default compiler/flags + c = { + compiler = "cg132" + } }, }) end From 2d0c6929fc2c1a3dc280e780b7fc54c7f64a17dd Mon Sep 17 00:00:00 2001 From: afonsofrancof Date: Mon, 2 Oct 2023 19:04:14 +0100 Subject: [PATCH 2/8] [MINOR] tmux remote sessions --- .config/tmux/plugins/tmux-remote-sessions | 1 + .config/tmux/tmux.conf | 1 + .config/xmonad/lib/Colors/Teal.hi | Bin 2201 -> 2203 bytes .config/xmonad/lib/Colors/Teal.o | Bin 8368 -> 8368 bytes 4 files changed, 2 insertions(+) create mode 160000 .config/tmux/plugins/tmux-remote-sessions diff --git a/.config/tmux/plugins/tmux-remote-sessions b/.config/tmux/plugins/tmux-remote-sessions new file mode 160000 index 0000000..df6cf18 --- /dev/null +++ b/.config/tmux/plugins/tmux-remote-sessions @@ -0,0 +1 @@ +Subproject commit df6cf18272581bf45f27a9cf387e135546eb93ad diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 0898e2f..916c200 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -39,6 +39,7 @@ set -g @plugin 'tmux-plugins/tmux-sensible' set -g @plugin 'catppuccin/tmux' set -g @plugin 'tmux-plugins/tmux-resurrect' set -g @plugin 'tmux-plugins/tmux-continuum' +set -g @plugin 'tomhey/tmux-remote-sessions' #Plugin settings set -g @catppuccin_flavour 'frappe' diff --git a/.config/xmonad/lib/Colors/Teal.hi b/.config/xmonad/lib/Colors/Teal.hi index b3cc7789007a74b7f225af72a90c15c6a982fd52..5645fbb107f88af53c4ba0acf459f80f1f4b3098 100644 GIT binary patch delta 313 zcmbO!I9t$x@z=Q&7E1#oQw9bGj#&&0ETKTm!oa}Dz;OJ*oTuL(AD$?8|Nfgv?Qfg^ zsvqchv+Hl)#)<0~|1A1At@ZcI#|9G}t{ZwW0reQ}+q|o5@!~rRzcNnQeX4y`&jmv=7gnC#AIU^VAa_rGa(Pj7k2xU}uq>%QerwpIg` zGcZm95z`q24o`TxqVv_3MK>5Pc3*n+ZsFr8PZ=5bfpU8%Z(vkrd^q_EqY5M2zlP#H57_%qG y0onbNn}F;slb16q3*BJtX=r%H0row}EzI{P-(i;G{sm(G2NEnSn;BVVumAum0eTex delta 311 zcmbO&I8)Gp@z=Q&7E1#oa|Q+mju{LLEWtp`#K6GFz;I>ZzFVhu&+E(H@%7G%C+p`t z-OYIW^~`C9KQ6kjb!YRA-jC2(stFsQhJH_~B(YJGlH=S8J%Gwq{mg%$%G6 xWcN;P0kStuUdgO1bd9yAq2U?O89={-0Q23+_n4))e}I^OfdmWFW@eTdEC5u1eLw&J diff --git a/.config/xmonad/lib/Colors/Teal.o b/.config/xmonad/lib/Colors/Teal.o index 3a5be9df2ed1259fcfaa9daf0ae78ba4b8c7d59e..31a2abac9fa197ca19ccac557da5d4e7dadb2be9 100644 GIT binary patch delta 147 zcmdnsxWRG5bPh(-%`-SsSnE^ci%W_ak_~f8VGM65Bi8`NNQW`XVGLg=BhLuN$b>N} YVGMsLBi{tZ$c8Z-VT{1d)qJKx0NfZdVgLXD delta 147 zcmdnsxWRG5bPh)I%`-SsSnDn0i%W_ak_~eTU<@}HBMi#OO@c9sU Date: Tue, 3 Oct 2023 18:07:47 +0100 Subject: [PATCH 3/8] [MINOR] whichkey and nvim-ghost --- .config/nvim/lua/plugins/lazy.lua | 34 +++++++++++++++------ .config/yubikey-touch-detector/service.conf | 2 ++ 2 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 .config/yubikey-touch-detector/service.conf diff --git a/.config/nvim/lua/plugins/lazy.lua b/.config/nvim/lua/plugins/lazy.lua index 26dd26c..f992f23 100644 --- a/.config/nvim/lua/plugins/lazy.lua +++ b/.config/nvim/lua/plugins/lazy.lua @@ -29,6 +29,22 @@ lazy.setup({ require('leap').add_default_mappings() end }, + --Nvim to browser + 'subnut/nvim-ghost.nvim', + + { + "folke/which-key.nvim", + event = "VeryLazy", + init = function() + vim.o.timeout = true + vim.o.timeoutlen = 300 + end, + opts = { + -- your configuration comes here + -- or leave it empty to use the default settings + -- refer to the configuration section below + } + }, { "folke/todo-comments.nvim", @@ -119,9 +135,9 @@ lazy.setup({ compiler_flags = "", -- Default flags passed to the compiler. job_timeout_ms = 25000, -- Timeout for libuv job in milliseconds. languages = { -- Language specific default compiler/flags - c = { - compiler = "cg132" - } + c = { + compiler = "cg132" + } }, }) end @@ -215,12 +231,12 @@ lazy.setup({ end }, - { - 'lervag/vimtex', - config = function() - require 'plugins.vimtex' - end - }, + { + 'lervag/vimtex', + config = function() + require 'plugins.vimtex' + end + }, ------------------------------------------------------------------------------------------- -- Syntax Highlighting diff --git a/.config/yubikey-touch-detector/service.conf b/.config/yubikey-touch-detector/service.conf new file mode 100644 index 0000000..eb5be7c --- /dev/null +++ b/.config/yubikey-touch-detector/service.conf @@ -0,0 +1,2 @@ +YUBIKEY_TOUCH_DETECTOR_VERBOSE=true +YUBIKEY_TOUCH_DETECTOR_LIBNOTIFY=true From adb4f860bfcf7586e364aa3e6fac7d44000fe876 Mon Sep 17 00:00:00 2001 From: afonsofrancof Date: Wed, 4 Oct 2023 00:59:33 +0100 Subject: [PATCH 4/8] [MINOR] Better hls config --- .config/nvim/lazy-lock.json | 34 ++++++++++++++------------ .config/nvim/lua/plugins/lspconfig.lua | 11 ++++++--- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index bef18e1..d5b308d 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "ea7d7ea510c641c4f15042becd27f35b3e5b3c2b" }, + "LuaSnip": { "branch": "master", "commit": "6085dfd1808fb0059e13d160317a10c3a68c5407" }, "bufferline.nvim": { "branch": "main", "commit": "243893ba9d5d1049dd451a25cab32ec7f8f67bcf" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, @@ -9,28 +9,29 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "compiler-explorer.nvim": { "branch": "master", "commit": "ee8e7a2808bdad67cd2acb61b5c9ffa7735c7ec9" }, - "copilot.lua": { "branch": "master", "commit": "2c942f33ba5c621c906e625e00a1bb504b65e2f0" }, - "dressing.nvim": { "branch": "master", "commit": "c1e1d5fa44fe08811b6ef4aadac2b50e602f9504" }, + "copilot.lua": { "branch": "master", "commit": "1a8032ae496916ccc7a7a52ee79194fbef29f462" }, + "dressing.nvim": { "branch": "master", "commit": "8f4d62b7817455896a3c73cab642002072c114bc" }, "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, - "friendly-snippets": { "branch": "main", "commit": "ebf6d6e83494cdd88a54a429340256f4dbb6a052" }, + "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, "impatient.nvim": { "branch": "main", "commit": "47302af74be7b79f002773011f0d8e85679a7618" }, - "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" }, + "lazy.nvim": { "branch": "main", "commit": "59335c5b9d116f5d3948f833288a89e2a829a005" }, "leap.nvim": { "branch": "main", "commit": "5efe985cf68fac3b6a6dfe7a75fbfaca8db2af9c" }, "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "f014db32437aa61c86fc0ef1067cd2bc6a37205c" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "e2705063f395b44f676cd26596a11007a2cbd3bd" }, "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" }, - "neorg": { "branch": "main", "commit": "069cf8a460594ca6f4233c83aac1a31a96c62d98" }, + "neorg": { "branch": "main", "commit": "745715c873395840a5127413d1ef30a42735605e" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, - "nvim": { "branch": "main", "commit": "85e93601e0f0b48aa2c6bbfae4d0e9d7a1898280" }, - "nvim-autopairs": { "branch": "master", "commit": "defad64afbf19381fe31488a7582bbac421d6e38" }, + "nvim": { "branch": "main", "commit": "7a4bcdadafc59a5bedbd866c643fa486d8cca4a1" }, + "nvim-autopairs": { "branch": "master", "commit": "de4f7138a68d5d5063170f2182fd27faf06b0b54" }, "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, - "nvim-lspconfig": { "branch": "master", "commit": "cc388d3f6b9c7c943ae2b2dcd46ad470fd257f91" }, + "nvim-ghost.nvim": { "branch": "main", "commit": "a1ca0b2dac59881066d7ac9373cf64d59ba29d6a" }, + "nvim-lspconfig": { "branch": "master", "commit": "361a2878a41f23452457eec12a807ff59bc75882" }, "nvim-tmux-navigation": { "branch": "main", "commit": "543f090a45cef28156162883d2412fffecb6b750" }, - "nvim-treesitter": { "branch": "master", "commit": "794266a4edc8ab57b0d637626f01b5278a9123d8" }, - "nvim-treesitter-context": { "branch": "master", "commit": "b6c763db8cc486215ba96e0a67418848a710ab25" }, - "nvim-web-devicons": { "branch": "master", "commit": "973ab742f143a796a779af4d786ec409116a0d87" }, - "oil.nvim": { "branch": "master", "commit": "9e036c6a4868b971127f3cb6bac6197bb4103723" }, + "nvim-treesitter": { "branch": "master", "commit": "812c2dd8fe838bb26cb53f0d251116468c2cae37" }, + "nvim-treesitter-context": { "branch": "master", "commit": "bc19b78e9c705d67be98d56e9fab96470af45f33" }, + "nvim-web-devicons": { "branch": "master", "commit": "45d0237c427baba8cd05e0ab26d30e2ee58c2c82" }, + "oil.nvim": { "branch": "master", "commit": "ac2928cca85ba3596e92f9f51940d46be2d606f8" }, "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, @@ -39,10 +40,11 @@ "telescope.nvim": { "branch": "master", "commit": "b79cd6c88b3d96b0f49cb7d240807cd59b610cd8" }, "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" }, - "vim-fugitive": { "branch": "master", "commit": "6fcb0ad03982de646e3fecb6915e585651b9a9fb" }, + "vim-fugitive": { "branch": "master", "commit": "99db68d9b3304580bd383da7aaee05c7a954a344" }, "vim-jukit": { "branch": "master", "commit": "4d1f4e4c3923464e12f86fce49eb198b6e61a2a9" }, "vim-obsession": { "branch": "master", "commit": "fe9d3e1a9a50171e7d316a52e1e56d868e4c1fe5" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "vimtex": { "branch": "master", "commit": "d08da8034bab1fae423bd36aa606ee3012cf2833" }, + "vimtex": { "branch": "master", "commit": "7d453a61b0256337f341a1195ca9eb3f3890a7df" }, + "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" }, "zen-mode.nvim": { "branch": "main", "commit": "68f554702de63f4b7b6b6d4bcb10178f41a0acc7" } } \ No newline at end of file diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua index 71e2bf9..0f36dc7 100644 --- a/.config/nvim/lua/plugins/lspconfig.lua +++ b/.config/nvim/lua/plugins/lspconfig.lua @@ -2,8 +2,7 @@ local mason_lspconfig = require "mason-lspconfig" local lspconfig = require "lspconfig" mason_lspconfig.setup({ - ensure_installed = { "lua_ls", "texlab", "hls", "yamlls" }, - automatic_installation = true + automatic_installation = false }) @@ -61,6 +60,13 @@ mason_lspconfig.setup_handlers { end, } +require('lspconfig')['hls'].setup { + filetypes = { 'haskell', 'lhaskell', 'cabal' }, + on_attach = on_attach, + flags = lsp_flags, + capabilities = capabilities, +} + require("rust-tools").setup({ server = { on_attach = on_attach, @@ -79,4 +85,3 @@ require("rust-tools").setup({ }, }, }) - From ed0cea5dc3b29a9575df6bff4087d04c7f6ae98e Mon Sep 17 00:00:00 2001 From: afonsofrancof Date: Wed, 4 Oct 2023 00:59:48 +0100 Subject: [PATCH 5/8] [MINOR] animations picom --- .config/picom/picom.conf | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf index e837075..fa2222f 100644 --- a/.config/picom/picom.conf +++ b/.config/picom/picom.conf @@ -1,15 +1,11 @@ ################################# # Animations # ################################# -# requires https://github.com/jonaburg/picom # (These are also the default values) -transition-length = 0 -transition-pow-x = 0.1 -transition-pow-y = 0.1 -transition-pow-w = 0.1 -transition-pow-h = 0.1 -size-transition = true - +animation-stiffness = 140; +animation-for-open-window = "slide-up"; +animation-for-unmap-window = "zoom"; +animation-dampening = 8; ################################# # Corners # From e6eeeed2801c14fa8f4cf3ec56afcaf2a2c1cc10 Mon Sep 17 00:00:00 2001 From: afonsofrancof Date: Wed, 4 Oct 2023 01:00:06 +0100 Subject: [PATCH 6/8] [MINOR] Rename xmobar --- .config/xmobar/{xmobarrc0 => xmobarrc} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .config/xmobar/{xmobarrc0 => xmobarrc} (100%) diff --git a/.config/xmobar/xmobarrc0 b/.config/xmobar/xmobarrc similarity index 100% rename from .config/xmobar/xmobarrc0 rename to .config/xmobar/xmobarrc From 50c64b0f3e1f17ae79731f9aa6ece504bf136754 Mon Sep 17 00:00:00 2001 From: afonsofrancof Date: Wed, 4 Oct 2023 01:04:22 +0100 Subject: [PATCH 7/8] [MINOR] Changed xmonad log in xmobar --- .config/xmobar/xmobarrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/xmobar/xmobarrc b/.config/xmobar/xmobarrc index 13bff9a..5b77932 100644 --- a/.config/xmobar/xmobarrc +++ b/.config/xmobar/xmobarrc @@ -22,7 +22,7 @@ Config {font = "Ubuntu bold 10" , persistent = False , iconRoot = "/home/afonso/.config/xmobar/xpm/" -- default: "." , commands = [ - Run UnsafeXPropertyLog "_XMONAD_LOG_0" + Run XMonadLog , Run Date "%a, %d %b  %H:%M" "date" 10 , Run Mpris2 "playerctld" ["-t", " - </fc>"] 10 , Run Memory ["-t","<fn=6></fn> <fc=#AAC0F0><usedratio></fc>%"] 10 @@ -38,7 +38,7 @@ Config {font = "Ubuntu bold 10" , alignSep = "}{" , template = " <icon=logo.xpm/> \ \ \ - \%_XMONAD_LOG_0%\ + \%XMonadLog%\ \}\ \%date%\ \<hspace=20/>\ From b069c185c1e25213d77507c3897fcf9df9d8a25b Mon Sep 17 00:00:00 2001 From: afonsofrancof <me@afonsofrancof.com> Date: Wed, 4 Oct 2023 01:05:31 +0100 Subject: [PATCH 8/8] [MAJOR] Cleanup xmonad config --- .config/xmonad/hie.yaml | 8 + .config/xmonad/lib/Colors/Teal.hi | Bin 2203 -> 2212 bytes .config/xmonad/lib/Colors/Teal.o | Bin 8368 -> 8368 bytes .config/xmonad/xmonad.hs | 73 +++------ .config/xmonad/xmonad.norg | 237 ------------------------------ 5 files changed, 32 insertions(+), 286 deletions(-) create mode 100644 .config/xmonad/hie.yaml delete mode 100644 .config/xmonad/xmonad.norg diff --git a/.config/xmonad/hie.yaml b/.config/xmonad/hie.yaml new file mode 100644 index 0000000..6c02501 --- /dev/null +++ b/.config/xmonad/hie.yaml @@ -0,0 +1,8 @@ +cradle: + stack: + - path: ./xmonad.hs + component: ./xmonad.hs + - path: ./xmonad-git/ + component: xmonad:lib + - path: ./xmonad-contrib-git/ + component: xmonad-contrib:lib diff --git a/.config/xmonad/lib/Colors/Teal.hi b/.config/xmonad/lib/Colors/Teal.hi index 5645fbb107f88af53c4ba0acf459f80f1f4b3098..fe0b1d147fd4edfec3819df46a18c3f0e31a21d4 100644 GIT binary patch delta 1018 zcmX|8ZBSHI7=F*$4=y0=Vg{mwwY!v2dt6pxqo$bvsWoY2WGC!LGhE@YY~8(gz4th? zJN^KxA1h^2hs?AYNsv|SM@@#4+Dsp$K~SrN)5lDO2^BgfjYEm!Oy|PTojLD3=Xsww z@AE$QU|wHdJDUHd#aihr55UCD=^uWa85qkQPW29abf&NK3IdRN0j!PU*a5_Ktbgy^ z<o@w*Z=<)4U;O)Y`ptKC{`vJwlRf*dP87Yi=k|$_<iGPb(P;ARf3EhNpGc$0pGGc! zH*x7eAL>tEIx>E0SLYB)&JOHNUHf%Z-u>C&_1B+Y+wK93Eg-&Zz*fLEuxEgj2~rkF z*&r<gDF>una5%w|w;J$rz;^&%0r*b9`G5-muLN8OcoksLEdqQO;9|gQ0N)Mx9>6ZZ zZonQWxfe?AgSGcV=>t&uAb1IQ*MYALz>l8A0N6j7`laWCg9px@MdRILbEE0O4?V(@ zW&P~%(EFcX-nTD>Zl$ju8JQdIY~mZyy2sDmNcJBa{N&6$`s(<hPmgwWckK}giI@(X zB?Znex~7iqo;h*&dvyMl3p3Z={jGZnfkX7hY!`NQO!Jed7|rsF$b<6vE#yXz@HN<l zp5xV`c5o_cFHd4OI>+A=^$Jg87q&R~4bkxP0*f0x!ymPH&`#bY@FD)Pz(f3)#l8Fw z+p8TN)6&8pGaXs};y+tfA}7zXZfZB#njx@8<%pVHqbZthkPwv>>o(b-CGn`H$}L_W zDGLxksq_XLBU`JOQQo?Fv(ngFTkQ)gfpY1|U=67j@=Oyvp=dIb!fnmom>!8PGpTw3 zNNt>Dvq+SB%Sf4@_=`5kOeP`zqCKCF+v2u5tyxxhz1_t(*)tzo!E{+QS~WdNbwiAQ zh*S`NVU4CTT~o-@rYRCKC8So@H9cqRA|(W^kud+#?s7U7-mlViIYFuujPl>@!~Eln z;?gYB(MF>#Vz3+&ZV5FA&vMvsHjC#)3X2mfNPtgec-kE;l*SCYUDz%s4-=nb$;1Z1 zH_+{Q=BC>;jd@v{w^C>V1q&%?I*o+Y2EDmXR>LHeh|$$1Z{BvuVJgy~su9t|24*ie zrc=feW;SF!sc?sAoQc>dYhnqJp2|p-s%lJTw1otBgxjc5|5V}sq9x5z$H{0krU<dO cO*USjin3~HED0_WBorhK39)XRXG(AU2O0QVC;$Ke delta 982 zcmX9*Z%i9y9R9uSd(e(`*H)&RI_3%vnY-hzg?4;07MYz49J9`bZ%6OiUAXqzyQ`M$ z1L!h=VL*5p8l5JvnW-Tf1Jk&FF_MUG#za36{{$4fWdli!Atuu?-<!$Zli&M1PoCfV z+@1Bk?MtEC-^sX12sQ$M>n#BMJbf_$0+?SqUHW@@ZnSD~adoW!kK=c0zZh7(aA)|F z(T~u-Q-4mJ_~+)bP&zw3@%6R!$py6Z%Eh_T<&_T(PM?|@p1JYYd3J63%k{y5kt+*m z^w{3sO7J<r2^bhCgK}_z8#X}&Yz7Z(0T#UA13zW__W@f8>{ej!2lfGAw*k8yybl6? z2=K#|fOi0{0=yIOBY<}S4gjtOTm$$~z`Ft00)7l|9pF8H9|yb_Fb9|irXKb&0<DOi zanOF^m6;1C&z$*ravhCdyxRZa%Rio+poPI7TzU7zr>8!i89H=);8OoP=LRPS5J{l= zCr<x1v@!9^wb`5Ky;r|l89w*>`D4@%Xv~H;z&rPP>HWc5vr`M``=K9htxYbEmk=!l z=rXg>*SAXMQ5E`?Tt_vij8r(P(H>Io2%t7{m|~6;C=&7}<v$~rDE>s2907;pF2T+K z3Xoc7HQG;Foi(VN<mfy?#_2puK6h687ns-j`mVd^Ci^}B&PB53+*S$B+xFou1^PF= zwj3hmxV3i<a7I$I70tS)8zvuDByCqh6giO>1wO<@QpMKxmhN0ePQ=V)ArqF`f<}`^ zG7PDQ6Zl5HffsO>WGeoop0#L@VwjW<Q$-YI$&xr(Nl69G;*y$V+LFizd4W3^kEJ>z z!ANhuqdodm#|sG~l9f}>va+J&OeIg(H_#B#C#!~%v~;6~G9k(Yy(v{wa*}oQo+Zc! zH>Hmzxh^%GEo5Bwm^0LjJ7Z}a)u=sZ=t+ex7VWq&FVvZerRhmYQz#|yb@W047tLu$ z^!&c=u25$<+NB+8Zw`0lU-VdN#&(JH;YBjSY>jR%WYr=~j@a3|iy1vD$#y6E+{8s2 z+7Fm5p_pkE8(%u0=VM1YdepQh(PrEDW<8ry)8qy&x;yo(BFAYud6KCmSMd&RJ5?=1 z*ZBXvaYM?Qe2Zb|hWqJQGrwQcCCg<`QTnaPw@iR+FyFZEF)c;QB=coeTRgUYIQ|@U OOKFp^<u%0b8v76a#4&pS diff --git a/.config/xmonad/lib/Colors/Teal.o b/.config/xmonad/lib/Colors/Teal.o index 31a2abac9fa197ca19ccac557da5d4e7dadb2be9..c933d59f46e4a954aa19d6e4c4361e85f1d5e873 100644 GIT binary patch literal 8368 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 literal 8368 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 diff --git a/.config/xmonad/xmonad.hs b/.config/xmonad/xmonad.hs index 299e38b..d5ece24 100644 --- a/.config/xmonad/xmonad.hs +++ b/.config/xmonad/xmonad.hs @@ -59,10 +59,10 @@ myClickJustFocuses = False windowCount :: X (Maybe String) windowCount = gets $ Just . show . length . W.integrate' . W.stack . W.workspace . W.current . windowset -myNormalBorderColor = "#008080" +myNormalBorderColor = "#534783" myFocusedBorderColor = "#01F9C6" -myBorderWidth = 2 +myBorderWidth = 1 myWorkspaces = ["main","web","text","code","social","monitoring"] myWorkspaceIndices = zip myWorkspaces [1..] @@ -112,18 +112,11 @@ myMouseBindings (XConfig {XMonad.modMask = modm}) = M.fromList $ , ((modm, button3), (\w -> focus w >> mouseResizeWindow w >> windows W.shiftMaster))] -myLayout = avoidStruts(tiled ||| Mirror tiled ||| Full) - where - tiled = Tall nmaster delta ratio - nmaster = 1 - ratio = 1/2 - delta = 3/100 - myManageHook = composeAll [ className =? "MPlayer" --> doFloat , className =? "Gimp" --> doFloat , resource =? "desktop_window" --> doIgnore - , className =? "QjackCtl" --> doFloat + , className =? "QjackCtl" --> doFloat , resource =? "kdesktop" --> doIgnore , className =? "firefox" --> doShift (myWorkspaces !! 1) , className =? "Code" --> doShift (myWorkspaces !! 3) @@ -146,65 +139,47 @@ myStartupHook = do spawnOnce "picom &" setWMName "LG3D" spawnOnce "nm-applet" - spawnOnce ("xsetroot -cursor_name left_ptr") - spawnOnce ("killall trayer ;sleep 1 && trayer --monitor 0 --edge top --align right --margin 4 --widthtype request --padding 8 --iconspacing 12 --SetDockType true --SetPartialStrut true --expand true --transparent true --alpha 0 --tint 0x2B2E37 --height 30 --distance 5 &") - spawnOnce ("slimbookbattery --minimize") - spawnOnce ("slimbookintelcontroller") - spawnOnce ("nextcloud") + spawnOnce "xsetroot -cursor_name left_ptr" + spawnOnce "killall trayer ;sleep 1 && trayer --monitor 0 --edge top --align right --margin 4 --widthtype request --padding 8 --iconspacing 12 --SetDockType true --SetPartialStrut true --expand true --transparent true --alpha 0 --tint 0x2B2E37 --height 30 --distance 5 &" + spawnOnce "slimbookbattery --minimize" + spawnOnce "slimbookintelcontroller" + spawnOnce "nextcloud" spawnOnOnce "web" myWebBrowser spawnOnOnce "main" myTerminalTmux -myStatusBarSpawner :: Applicative f => ScreenId -> f StatusBarConfig -myStatusBarSpawner (S s) = do - pure $ statusBarPropTo ("_XMONAD_LOG_" ++ show s) - ("xmobar -x " ++ show s ++ " ~/.config/xmobar/xmobarrc" ++ show s) - (pure $ myXmobarPP (S s)) +mySB = statusBarProp "/home/afonso/.local/bin/xmobar /home/afonso/.config/xmobar/xmobarrc" (pure myXmobarPP) - -myXmobarPP :: ScreenId -> PP -myXmobarPP s = def - { ppSep = "" - , ppWsSep = "" - , ppCurrent = xmobarColor cyan "" . const wsIconFull - , ppVisible = xmobarColor grey4 "" . const wsIconFull - , ppVisibleNoWindows = Just (xmobarColor grey4 "" . const wsIconFull) - , ppHidden = xmobarColor grey2 "" . const wsIconHidden - , ppHiddenNoWindows = xmobarColor grey2 "" . const wsIconEmpty - , ppUrgent = xmobarColor orange "" . const wsIconFull - , ppOrder = \(ws : _ : _ : extras) -> ws : extras - , ppExtras = [ wrapL " " " " $ layoutColorIsActive s (logLayoutOnScreen s) - ,titleColorIsActive s (shortenL 81 $ logTitleOnScreen s) - ] - } +myXmobarPP :: PP +myXmobarPP = def + { ppSep = "" + , ppWsSep = "" + , ppCurrent = xmobarColor cyan "" . const wsIconFull + , ppVisible = xmobarColor grey4 "" . const wsIconFull + , ppHidden = xmobarColor grey4 "" . const wsIconFull + , ppHiddenNoWindows = xmobarColor grey4 "" . const wsIconFull + , ppOrder = \(ws : _ : _ : extras) -> ws : extras + } where wsIconFull = " <fn=2>\xf111</fn> " - wsIconHidden = " <fn=2>\xf111</fn> " - wsIconEmpty = " <fn=2>\xf10c</fn> " - titleColorIsActive n l = do - c <- withWindowSet $ return . W.screen . W.current - if n == c then xmobarColorL cyan "" l else xmobarColorL grey3 "" l - layoutColorIsActive n l = do - c <- withWindowSet $ return . W.screen . W.current - if n == c then wrapL "<icon=/home/afonso/.config/xmobar/xpm/" "_selected.xpm/>" l else wrapL "<icon=/home/afonso/.config/xmobar/xpm/" ".xpm/>" l myConfig = def { terminal = myTerminal, - focusFollowsMouse = myFocusFollowsMouse, - clickJustFocuses = myClickJustFocuses, + focusFollowsMouse = True, + clickJustFocuses = False, borderWidth = myBorderWidth, modMask = myModMask, workspaces = myWorkspaces, normalBorderColor = myNormalBorderColor, focusedBorderColor = myFocusedBorderColor, - layoutHook = smartBorders . spacingWithEdge 15 $ myLayout, + layoutHook = avoidStruts $ smartBorders . smartSpacingWithEdge 5 $ layoutHook def, manageHook = manageSpawn <+> myManageHook <+> manageHook def, - handleEventHook = myEventHook <+> fullscreenEventHook <+> swallowEventHook (className=?"Alacritty") (return True), + handleEventHook = myEventHook <+> fullscreenEventHook, startupHook = myStartupHook } main :: IO () -main = xmonad . ewmh . ewmhFullscreen . dynamicSBs myStatusBarSpawner . docks $ additionalKeysP (removeKeysP myConfig myRemoveKeys) myKeys \ No newline at end of file +main = xmonad . ewmh . ewmhFullscreen . withSB mySB . docks $ additionalKeysP (removeKeysP myConfig myRemoveKeys) myKeys diff --git a/.config/xmonad/xmonad.norg b/.config/xmonad/xmonad.norg deleted file mode 100644 index 7bb4474..0000000 --- a/.config/xmonad/xmonad.norg +++ /dev/null @@ -1,237 +0,0 @@ -@document.meta -title: Xmonad Config -authors: Afonso Franco -categories: configs -tangle: /home/afonso/.config/xmonad/xmonad.hs -@end - -* Overrides -@code haskell -{-# OPTIONS_GHC -Wno-deprecations #-} -@end -* Imports -@code haskell - -import XMonad - ---Utils -import XMonad.Util.EZConfig (additionalKeysP,removeKeysP) -import XMonad.Util.Loggers (logLayoutOnScreen, logTitleOnScreen, shortenL, wrapL, xmobarColorL) -import XMonad.Util.Run -import XMonad.Util.SpawnOnce - ---Hooks -import XMonad.Hooks.DynamicLog -import XMonad.Hooks.SetWMName -import XMonad.Hooks.StatusBar -import XMonad.Hooks.EwmhDesktops -import XMonad.Hooks.ManageDocks -import XMonad.Hooks.ManageHelpers -import XMonad.Hooks.WindowSwallowing - ---Actions -import XMonad.Actions.SpawnOn -import XMonad.Actions.UpdateFocus (focusUnderPointer) - ---Layouts -import XMonad.Layout.NoBorders -import XMonad.Layout.Spacing - - --- MultiMonitorFocusHook -import Control.Monad (when) -import Data.Foldable (find) -import Foreign.C (CInt) -import Data.Maybe (fromMaybe) -import Data.Monoid (All (All)) - ---Miscellaneous -import qualified XMonad.StackSet as W -import qualified Data.Map as M -import System.Exit - ---Color Scheme -import Colors.Teal - -@end -* Variables -@code haskell - -myTerminal = "kitty" -myTerminalTmux = myTerminal ++ " -e tmux a" -myTextEditor = "nvim" -myWebBrowser = "firefox" -myModMask = mod4Mask - -myFocusFollowsMouse :: Bool -myFocusFollowsMouse = True - -myClickJustFocuses :: Bool -myClickJustFocuses = False - -windowCount :: X (Maybe String) -windowCount = gets $ Just . show . length . W.integrate' . W.stack . W.workspace . W.current . windowset - -myNormalBorderColor = "#008080" -myFocusedBorderColor = "#01F9C6" - -myBorderWidth = 2 - -myWorkspaces = ["main","web","text","code","social","monitoring"] -myWorkspaceIndices = zip myWorkspaces [1..] - - @end - -* Keybinds -@code haskell -myKeys :: [(String, X ())] -myKeys = - [ ("M-x" ,spawn myTerminalTmux ) - , ("M-p", spawn "rofi -show drun -show-icons") - , ("M-S-p", spawn "rofi -show p -modi p:rofi-power-menu") - , ("M-s", spawn "selected=$(ls ~/scripts/|rofi -dmenu -p \"Run: \") && bash ~/.config/rofi/scripts/$selected") - , ("M-b", spawn myWebBrowser) - , ("<Print>", spawn "flameshot gui") - , ("<XF86AudioMute>", spawn "pamixer set --toggle-mute") - , ("<XF86AudioLowerVolume>", spawn "pamixer -d 5") - , ("<XF86AudioRaiseVolume>", spawn "pamixer -i 5") - , ("<XF86MonBrightnessUp>", spawn "lux -a 10%") - , ("<XF86MonBrightnessDown>", spawn "lux -s 10%") - , ("M-n", spawn $ myTerminal ++ " -e nmtui") - , ("M-q", kill) - , ("M-S-<Space>", sendMessage NextLayout) - , ("M-<Down>", windows W.focusDown) - , ("M-<Up>", windows W.focusUp ) - , ("M-m", windows W.focusMaster ) - , ("M-<Return>", windows W.swapMaster) - , ("M-h", sendMessage Shrink) - , ("M-l", sendMessage Expand) - , ("M-t", withFocused $ windows . W.sink) - , ("M-S-u", io (exitWith ExitSuccess)) - , ("M-u", spawn "xmonad --recompile; xmonad --restart") - ] - ++ - [("M-" ++ m ++ (show k), windows $ f i) - | (i, k) <- myWorkspaceIndices - , (f, m) <- [(W.greedyView, "0"), (W.shift, "S-")]] - ++ - [("M-" ++ m ++ key, screenWorkspace sc >>= flip whenJust (windows . f)) - | (key, sc) <- zip ["w", "e", "r"] [0..] - , (f, m) <- [(W.view, "0"), (W.shift, "S-")]] - -myRemoveKeys = ["M-S-<Return>","M-S-p","M-S-c","M-<Space>","M-n","M-S-q"] - -myMouseBindings (XConfig {XMonad.modMask = modm}) = M.fromList $ - [ ((modm, button1), (\w -> focus w >> mouseMoveWindow w - >> windows W.shiftMaster)) - , ((modm, button2), (\w -> focus w >> windows W.shiftMaster)) - , ((modm, button3), (\w -> focus w >> mouseResizeWindow w - >> windows W.shiftMaster))] - @end -* Layouts -@code haskell -myLayout = avoidStruts(tiled ||| Mirror tiled ||| Full) - where - tiled = Tall nmaster delta ratio - nmaster = 1 - ratio = 1/2 - delta = 3/100 -@end -* Hooks -@code haskell -myManageHook = composeAll - [ className =? "MPlayer" --> doFloat - , className =? "Gimp" --> doFloat - , resource =? "desktop_window" --> doIgnore - , className =? "QjackCtl" --> doFloat - , resource =? "kdesktop" --> doIgnore - , className =? "firefox" --> doShift (myWorkspaces !! 1) - , className =? "Code" --> doShift (myWorkspaces !! 3) - , className =? "discord" --> doShift (myWorkspaces !! 4) - , title =? "JetBrains Toolbox" --> doShift (myWorkspaces !! 3) - , className =? "main" --> doFloat - , className =? "Mailspring" --> doShift (myWorkspaces !! 5) - , className =? "Xmessage" --> doFloat - , title =? "Steam - News" --> doFloat - , title =? "Friends List" --> doFloat - , isFullscreen --> doFullFloat] - - -myEventHook = ewmhDesktopsEventHook - -myStartupHook = do - spawnOnce "pasystray" - spawnOnce "nitrogen --restore &" - spawnOnce "playerctld" - spawnOnce "picom &" - setWMName "LG3D" - spawnOnce "nm-applet" - spawnOnce ("xsetroot -cursor_name left_ptr") - spawnOnce ("killall trayer ;sleep 1 && trayer --monitor 0 --edge top --align right --margin 4 --widthtype request --padding 8 --iconspacing 12 --SetDockType true --SetPartialStrut true --expand true --transparent true --alpha 0 --tint 0x2B2E37 --height 30 --distance 5 &") - spawnOnce ("slimbookbattery --minimize") - spawnOnce ("slimbookintelcontroller") - spawnOnce ("nextcloud") - spawnOnOnce "web" myWebBrowser - spawnOnOnce "main" myTerminalTmux -@end -* XMobar Config -@code haskell - -myStatusBarSpawner :: Applicative f => ScreenId -> f StatusBarConfig -myStatusBarSpawner (S s) = do - pure $ statusBarPropTo ("_XMONAD_LOG_" ++ show s) - ("xmobar -x " ++ show s ++ " ~/.config/xmobar/xmobarrc" ++ show s) - (pure $ myXmobarPP (S s)) - - -myXmobarPP :: ScreenId -> PP -myXmobarPP s = def - { ppSep = "" - , ppWsSep = "" - , ppCurrent = xmobarColor cyan "" . const wsIconFull - , ppVisible = xmobarColor grey4 "" . const wsIconFull - , ppVisibleNoWindows = Just (xmobarColor grey4 "" . const wsIconFull) - , ppHidden = xmobarColor grey2 "" . const wsIconHidden - , ppHiddenNoWindows = xmobarColor grey2 "" . const wsIconEmpty - , ppUrgent = xmobarColor orange "" . const wsIconFull - , ppOrder = \(ws : _ : _ : extras) -> ws : extras - , ppExtras = [ wrapL " " " " $ layoutColorIsActive s (logLayoutOnScreen s) - ,titleColorIsActive s (shortenL 81 $ logTitleOnScreen s) - ] - } - where - wsIconFull = " <fn=2>\xf111</fn> " - wsIconHidden = " <fn=2>\xf111</fn> " - wsIconEmpty = " <fn=2>\xf10c</fn> " - titleColorIsActive n l = do - c <- withWindowSet $ return . W.screen . W.current - if n == c then xmobarColorL cyan "" l else xmobarColorL grey3 "" l - layoutColorIsActive n l = do - c <- withWindowSet $ return . W.screen . W.current - if n == c then wrapL "<icon=/home/afonso/.config/xmobar/xpm/" "_selected.xpm/>" l else wrapL "<icon=/home/afonso/.config/xmobar/xpm/" ".xpm/>" l - @end -* Config Variables binding -@code haskell - -myConfig = def - { - terminal = myTerminal, - focusFollowsMouse = myFocusFollowsMouse, - clickJustFocuses = myClickJustFocuses, - borderWidth = myBorderWidth, - modMask = myModMask, - workspaces = myWorkspaces, - normalBorderColor = myNormalBorderColor, - focusedBorderColor = myFocusedBorderColor, - layoutHook = smartBorders . spacingWithEdge 15 $ myLayout, - manageHook = manageSpawn <+> myManageHook <+> manageHook def, - handleEventHook = myEventHook <+> fullscreenEventHook <+> swallowEventHook (className=?"Alacritty") (return True), - startupHook = myStartupHook - } -@end -* Main -@code haskell - -main :: IO () -main = xmonad . ewmh . ewmhFullscreen . dynamicSBs myStatusBarSpawner . docks $ additionalKeysP (removeKeysP myConfig myRemoveKeys) myKeys -@end