From 21f0a97250b8f76d7a9d87879e87c06b147d84c6 Mon Sep 17 00:00:00 2001 From: "E. Almqvist" Date: Wed, 8 Feb 2023 18:26:09 +0100 Subject: [PATCH 1/3] Cleanup --- README.md | 4 +- conky/.config/conky/conky.conf | 46 ------ conky/.config/conky/launch.sh | 4 - xmonad/.xmonad/bin/autostart.sh | 36 ----- xmonad/.xmonad/xmonad.hs | 279 -------------------------------- 5 files changed, 2 insertions(+), 367 deletions(-) delete mode 100644 conky/.config/conky/conky.conf delete mode 100755 conky/.config/conky/launch.sh delete mode 100755 xmonad/.xmonad/bin/autostart.sh delete mode 100644 xmonad/.xmonad/xmonad.hs diff --git a/README.md b/README.md index ac9d1c1..b527b9e 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ ## Stuff I use - **OS**: [Arch Linux](https://archlinux.org/) - **Kernel**: [lqx](https://liquorix.net/) *(standard linux as fallback)* - - **WM**: [ewm](http://github.com/E-Almqvist/ewm) or [XMonad](https://xmonad.org/) + - **WM**: [LeftWM](https://leftwm.org/) - **Terminal**: [Alacritty](https://github.com/alacritty/alacritty) - - **Editor**: [nvim](https://neovim.io/) + - **Editor**: [Emacs](https://www.gnu.org/software/emacs/) or [nvim](https://neovim.io/) - **Compositor**: [picom](https://github.com/yshui/picom) - **Bar**: [eww](https://github.com/elkowar/eww) - **Launcher**: [rofi](https://github.com/davatorium/rofi) diff --git a/conky/.config/conky/conky.conf b/conky/.config/conky/conky.conf deleted file mode 100644 index 80995fc..0000000 --- a/conky/.config/conky/conky.conf +++ /dev/null @@ -1,46 +0,0 @@ -conky.config = { - alignment = 'top_left', - background = true, - border_width = 1, - cpu_avg_samples = 2, - default_color = 'white', - default_outline_color = 'red', - default_shade_color = 'white', - double_buffer = true, - draw_borders = false, - draw_graph_borders = true, - draw_outline = false, - draw_shades = false, - extra_newline = false, - font = 'Space Mono:size=14', - gap_x = 40, - gap_y = 40, - minimum_height = 5, - minimum_width = 260, - net_avg_samples = 2, - no_buffers = true, - out_to_console = false, - out_to_ncurses = false, - out_to_stderr = false, - out_to_x = true, - own_window = true, - own_window_class = 'Conky', - own_window_type = 'override', - own_window_title = 'Conky', - own_window_transparent = true, - show_graph_range = false, - show_graph_scale = false, - stippled_borders = 0, - update_interval = 1.0, - uppercase = false, - use_spacer = 'none', - use_xft = true, -} - -conky.text = [[ -TODO: -${exec cat ~/.todo} - -MINER STATS: -${execi 12 ~/.scripts/ethstatus.py} -]] diff --git a/conky/.config/conky/launch.sh b/conky/.config/conky/launch.sh deleted file mode 100755 index 1706150..0000000 --- a/conky/.config/conky/launch.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -killall -q conky - -conky -q -c $HOME/.config/conky/conky.conf diff --git a/xmonad/.xmonad/bin/autostart.sh b/xmonad/.xmonad/bin/autostart.sh deleted file mode 100755 index 637ccae..0000000 --- a/xmonad/.xmonad/bin/autostart.sh +++ /dev/null @@ -1,36 +0,0 @@ -# Keyboard layout -setxkbmap se & - -# Display settings -$HOME/.screenlayout/layout.sh & - -# Compositor -$HOME/.config/picom/launch & - -# Background -nitrogen --restore & - -# Notification daemon -dunst & - -# Anti sleep -xset s off & -xset -dpms & - -# EWW widgets etc -#eww daemon -#eww open bar - -# Polybar -# $HOME/.config/polybar/launch & - -# EWW widgets -eww daemon & -eww open-many bar-1 bar-2 & # the bar - -# Keyring -eval $(gnome-keyring-daemon --start) -export SSH_AUTH_SOCK - -# Emacs daemon -# emacs --daemon & diff --git a/xmonad/.xmonad/xmonad.hs b/xmonad/.xmonad/xmonad.hs deleted file mode 100644 index 0305859..0000000 --- a/xmonad/.xmonad/xmonad.hs +++ /dev/null @@ -1,279 +0,0 @@ --- __ ____ __ _ --- \ \/ / \/ | ___ _ __ __ _ __| | --- \ /| |\/| |/ _ \| '_ \ / _` |/ _` | --- / \| | | | (_) | | | | (_| | (_| | --- /_/\_\_| |_|\___/|_| |_|\__,_|\__,_| - -import Data.Monoid -import System.Exit -import XMonad - -import XMonad.Hooks.ManageDocks -import XMonad.Util.SpawnOnce - -import qualified Data.Map as M -import XMonad.Hooks.EwmhDesktops (ewmh) -import XMonad.Hooks.InsertPosition -import XMonad.Layout.Fullscreen (fullscreenSupport) --- import XMonad.Layout.IndependentScreens (withScreens) -import XMonad.Layout.ToggleLayouts (ToggleLayout(Toggle)) -import qualified XMonad.StackSet as W -import XMonad.Util.Run (spawnPipe) -import XMonad.Layout.NoBorders (noBorders, smartBorders) - --- The preferred terminal program, which is used in a binding below and by --- certain contrib modules. --- --- myTerminal = "alacritty -e tmux" -myTerminal = "alacritty" -myTmux = myTerminal ++ " -e tmux" - --- Whether focus follows the mouse pointer. -myFocusFollowsMouse :: Bool -myFocusFollowsMouse = True - --- Whether clicking on a window to focus also passes the click to the window -myClickJustFocuses :: Bool -myClickJustFocuses = True - --- Width of the window border in pixels. --- -myBorderWidth = 1 - --- modMask lets you specify which modkey you want to use. The default --- is mod1Mask ("left alt"). You may also consider using mod3Mask --- ("right alt"), which does not conflict with emacs keybindings. The --- "windows key" is usually mod4Mask. --- -myModMask = mod4Mask - --- The default number of workspaces (virtual screens) and their names. --- By default we use numeric strings, but any string may be used as a --- workspace name. The number of workspaces is determined by the length --- of this list. --- --- A tagging example: --- --- > workspaces = ["web", "irc", "code" ] ++ map show [4..9] --- --- myWorkspaces = map show [1 .. 9] -myWorkspaces = map show [1..9] - --- Border colors for unfocused and focused windows, respectively. --- -myNormalBorderColor = "#282828" - -myFocusedBorderColor = "#484848" - ------------------------------------------------------------------------- --- Key bindings. Add, modify or remove key bindings here. --- -myKeys conf@(XConfig {XMonad.modMask = modm}) = - M.fromList $ - -- launch a terminal - [ ((modm, xK_Return), spawn $ XMonad.terminal conf) - -- Launch a terminal with tmux - , ((modm, xK_Shift_R), spawn myTmux) - -- launch rofi app launcher - , ((modm, xK_d), spawn "rofi -show drun") - -- launch rofi ssh - , ((modm, xK_s), spawn "rofi -show ssh") - -- launch rofi shell - , ((modm, xK_p), spawn "rofi -show run") - -- pause cmus - , ((modm, xK_u), spawn "playerctl play-pause") - -- spawn firefox - , ((modm, xK_b), spawn "firefox") - -- screenshot - , ((modm, xK_Print), spawn "flameshot gui") - -- lockscreen - , ((modm .|. shiftMask, xK_l), spawn "betterlockscreen --lock") - -- close focused window - , ((modm .|. shiftMask, xK_q), kill) - -- Rotate through the available layout algorithms - , ((modm, xK_space), sendMessage NextLayout) - -- Reset the layouts on the current workspace to default - , ((modm .|. shiftMask, xK_space), setLayout $ XMonad.layoutHook conf) - -- Resize viewed windows to the correct size - , ((modm, xK_n), refresh) - -- Move focus to the next window - , ((modm, xK_Tab), windows W.focusDown) - -- Move focus to the next window - , ((modm, xK_j), windows W.focusDown) - -- Move focus to the previous window - , ((modm, xK_k), windows W.focusUp) - -- Move focus to the master window - , ((modm, xK_m), windows W.focusMaster) - -- Swap the focused window and the master window - , ((modm .|. shiftMask, xK_Return), windows W.swapMaster) - -- Swap the focused window with the next window - , ((modm .|. shiftMask, xK_j), windows W.swapDown) - -- Swap the focused window with the previous window - , ((modm .|. shiftMask, xK_k), windows W.swapUp) - -- Shrink the master area - , ((modm, xK_h), sendMessage Shrink) - -- Expand the master area - , ((modm, xK_l), sendMessage Expand) - -- Push window back into tiling - , ((modm, xK_t), withFocused $ windows . W.sink) - -- Increment the number of windows in the master area - , ((modm, xK_comma), sendMessage (IncMasterN 1)) - -- Deincrement the number of windows in the master area - , ((modm, xK_period), sendMessage (IncMasterN (-1))) - -- Toggle fullscreen - , ((modm .|. shiftMask, xK_f), toggleFull) - -- Toggle the status bar gap - -- Use this binding with avoidStruts from Hooks.ManageDocks. - -- See also the statusBar function from Hooks.DynamicLog. - -- - -- , ((modm , xK_b ), sendMessage ToggleStruts) - -- Quit xmonad - --, ((modm .|. shiftMask, xK_q), io exitSuccess) - -- Restart xmonad - , ( (modm .|. shiftMask, xK_x) - , spawn - "xmonad --recompile; xmonad --restart; notify-send \"XMonad\" \"Recompiled & restarted.\"") - ] ++ - -- - -- mod-[1..9], Switch to workspace N - -- mod-shift-[1..9], Move client to workspace N - -- - [ ((m .|. modm, k), windows $ f i) - | (i, k) <- zip (workspaces conf) [xK_1 .. xK_9] - , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)] - ] ++ - -- - -- mod-{w,e,r}, Switch to physical/Xinerama screens 1, 2, or 3 - -- mod-shift-{w,e,r}, Move client to screen 1, 2, or 3 - -- - [ ((m .|. modm, key), screenWorkspace sc >>= flip whenJust (windows . f)) - | (key, sc) <- zip [xK_w, xK_e, xK_r] [0 ..] - , (f, m) <- [(W.view, 0), (W.shift, shiftMask)] - ] - ------------------------------------------------------------------------- --- Mouse bindings: default actions bound to mouse events --- -myMouseBindings (XConfig {XMonad.modMask = modm}) = - M.fromList - -- mod-button1, Set the window to floating mode and move by dragging - [ ( (modm, button1) - , \w -> focus w >> mouseMoveWindow w >> windows W.shiftMaster) - -- mod-button2, Raise the window to the top of the stack - , ((modm, button2), \w -> focus w >> windows W.shiftMaster) - -- mod-button3, Set the window to floating mode and resize by dragging - , ( (modm, button3) - , \w -> focus w >> mouseResizeWindow w >> windows W.shiftMaster) - -- you may also bind events to the mouse scroll wheel (button4 and button5) - ] - ------------------------------------------------------------------------- --- Layouts: --- You can specify and transform your layouts by modifying these values. --- If you change layout bindings be sure to use 'mod-shift-space' after --- restarting (with 'mod-q') to reset your layout state to the new --- defaults, as xmonad preserves your old layout settings by default. --- --- The available layouts. Note that each layout is separated by |||, --- which denotes layout choice. --- -toggleFull = - withFocused $ \wid -> do - floats <- gets (W.floating . windowset) - if M.member wid floats - then withFocused $ windows . W.sink - else withFocused $ windows . flip W.float (W.RationalRect 0 0 1 1) - -myLayout = smartBorders . avoidStruts $ noBorders Full ||| tiled ||| Mirror tiled - where - -- default tiling algorithm partitions the screen into two panes - tiled = Tall nmaster delta ratio - -- The default number of windows in the master pane - nmaster = 1 - -- Default proportion of screen occupied by master pane - ratio = 29 / 50 - -- Percent of screen to increment by when resizing panes - delta = 3 / 100 - ------------------------------------------------------------------------- --- Window rules: --- Execute arbitrary actions and WindowSet manipulations when managing --- a new window. You can use this to, for example, always float a --- particular program, or have a client always appear on a particular --- workspace. --- --- To find the property name associated with a program, use --- > xprop | grep WM_CLASS --- and click on the client you're interested in. --- --- To match on the WM_NAME, you can use 'title' in the same way that --- 'className' and 'resource' are used below. --- -myManageHook = - composeAll - [ className =? "MPlayer" --> doFloat - , className =? "Gimp" --> doFloat - , resource =? "desktop_window" --> doIgnore - , resource =? "kdesktop" --> doIgnore - , insertPosition End Newer - ] - ------------------------------------------------------------------------- --- Event handling --- * EwmhDesktops users should change this to ewmhDesktopsEventHook --- --- Defines a custom handler function for X Events. The function should --- return (All True) if the default handler is to be run afterwards. To --- combine event hooks use mappend or mconcat from Data.Monoid. --- -myEventHook = mempty - ------------------------------------------------------------------------- --- Status bars and logging --- Perform an arbitrary action on each internal state change or X event. --- See the 'XMonad.Hooks.DynamicLog' extension for examples. --- -myLogHook = return () - ------------------------------------------------------------------------- --- Startup hook --- Perform an arbitrary action each time xmonad starts or is restarted --- with mod-q. Used by, e.g., XMonad.Layout.PerWorkspace to initialize --- per-workspace layout choices. --- --- By default, do nothing. -myStartupHook = spawnOnce "$HOME/.xmonad/bin/autostart.sh" - ------------------------------------------------------------------------- --- Now run xmonad with all the defaults we set up. --- Run xmonad with the settings you specify. No need to modify this. --- -main = xmonad $ fullscreenSupport $ docks $ ewmh defaults - --- A structure containing your configuration settings, overriding --- fields in the default config. Any you don't override, will --- use the defaults defined in xmonad/XMonad/Config.hs --- --- No need to modify this. --- -defaults = - def - -- simple stuff - { terminal = myTerminal - , focusFollowsMouse = myFocusFollowsMouse - , clickJustFocuses = myClickJustFocuses - , borderWidth = myBorderWidth - , modMask = myModMask - , workspaces = myWorkspaces - , normalBorderColor = myNormalBorderColor - , focusedBorderColor = myFocusedBorderColor - -- key bindings - , keys = myKeys - , mouseBindings = myMouseBindings - -- hooks, layouts - , layoutHook = myLayout - , manageHook = myManageHook - , handleEventHook = myEventHook - , logHook = myLogHook - , startupHook = myStartupHook - } From 924ad65d13245a0778e2f30b21489d60d4f2901a Mon Sep 17 00:00:00 2001 From: "E. Almqvist" Date: Sun, 19 Feb 2023 14:02:19 +0100 Subject: [PATCH 2/3] Emacs & leftwm stuff --- emacs/.config/emacs/config.el | 2 +- emacs/.config/emacs/init.el | 10 ++++++++-- emacs/.config/emacs/places | 5 +++++ leftwm/.config/leftwm/config.ron | 3 ++- 4 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 emacs/.config/emacs/places diff --git a/emacs/.config/emacs/config.el b/emacs/.config/emacs/config.el index e29b50a..0166a9c 100644 --- a/emacs/.config/emacs/config.el +++ b/emacs/.config/emacs/config.el @@ -9,7 +9,7 @@ (set-face-attribute 'default nil :height 140 :family "Fira Code") ;; Enable line numbers -(global-display-line-numbers-mode 1) +(global-display-line-numbers-mode -1) ;; Indentaion (setq diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el index 3942094..b739955 100644 --- a/emacs/.config/emacs/init.el +++ b/emacs/.config/emacs/init.el @@ -37,7 +37,7 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(custom-safe-themes - '("e1f4f0158cd5a01a9d96f1f7cdcca8d6724d7d33267623cc433fe1c196848554" "da75eceab6bea9298e04ce5b4b07349f8c02da305734f7c0c8c6af7b5eaa9738" "2dd4951e967990396142ec54d376cced3f135810b2b69920e77103e0bcedfba9" "e3daa8f18440301f3e54f2093fe15f4fe951986a8628e98dcd781efbec7a46f2" "7a424478cb77a96af2c0f50cfb4e2a88647b3ccca225f8c650ed45b7f50d9525" "02f57ef0a20b7f61adce51445b68b2a7e832648ce2e7efb19d217b6454c1b644" "a44e2d1636a0114c5e407a748841f6723ed442dc3a0ed086542dc71b92a87aee" "7e377879cbd60c66b88e51fad480b3ab18d60847f31c435f15f5df18bdb18184" default)) + '("aec7b55f2a13307a55517fdf08438863d694550565dee23181d2ebd973ebd6b8" "251ed7ecd97af314cd77b07359a09da12dcd97be35e3ab761d4a92d8d8cf9a71" "631c52620e2953e744f2b56d102eae503017047fb43d65ce028e88ef5846ea3b" "6945dadc749ac5cbd47012cad836f92aea9ebec9f504d32fe89a956260773ca4" "636b135e4b7c86ac41375da39ade929e2bd6439de8901f53f88fde7dd5ac3561" "467dc6fdebcf92f4d3e2a2016145ba15841987c71fbe675dcfe34ac47ffb9195" "e1f4f0158cd5a01a9d96f1f7cdcca8d6724d7d33267623cc433fe1c196848554" "da75eceab6bea9298e04ce5b4b07349f8c02da305734f7c0c8c6af7b5eaa9738" "2dd4951e967990396142ec54d376cced3f135810b2b69920e77103e0bcedfba9" "e3daa8f18440301f3e54f2093fe15f4fe951986a8628e98dcd781efbec7a46f2" "7a424478cb77a96af2c0f50cfb4e2a88647b3ccca225f8c650ed45b7f50d9525" "02f57ef0a20b7f61adce51445b68b2a7e832648ce2e7efb19d217b6454c1b644" "a44e2d1636a0114c5e407a748841f6723ed442dc3a0ed086542dc71b92a87aee" "7e377879cbd60c66b88e51fad480b3ab18d60847f31c435f15f5df18bdb18184" default)) '(elcord-display-buffer-details nil) '(elcord-display-elapsed t) '(elcord-editor-icon "emacs_material_icon") @@ -128,7 +128,7 @@ (evil-commentary-mode) ;; HL TODO FIXME DEBUG STUB NOTE BUG -(hl-todo-mode) +(global-hl-todo-mode 1) ;; Formatter (format-all) (global-set-key (kbd "M-g") 'format-all-buffer) @@ -154,3 +154,9 @@ ("\\.tsx\\'" . web-mode) ("\\.html\\'" . web-mode)) :commands web-mode) + +(global-hl-line-mode 1) +(save-place-mode 1) +(setq use-dialog-box nil) + +(global-auto-revert-mode 1) diff --git a/emacs/.config/emacs/places b/emacs/.config/emacs/places new file mode 100644 index 0000000..c15a5a0 --- /dev/null +++ b/emacs/.config/emacs/places @@ -0,0 +1,5 @@ +;;; -*- coding: utf-8; mode: lisp-data -*- +(("/home/elal/.dotfiles/emacs/.config/emacs/init.el" . 6165) + ("/home/elal/.dotfiles/emacs/.config/emacs/config.el" . 133) + ("/home/elal/Projects/school/cth/courses/mop/libmd407/md407/gfx.h" . 838) + ("/home/elal/.config/emacs/.cache/treemacs-persist" . 47)) diff --git a/leftwm/.config/leftwm/config.ron b/leftwm/.config/leftwm/config.ron index 7bec0df..356be92 100644 --- a/leftwm/.config/leftwm/config.ron +++ b/leftwm/.config/leftwm/config.ron @@ -72,7 +72,8 @@ (command: Execute, value: "rofi -show drun", modifier: ["modkey"], key: "d"), (command: Execute, value: "rofi -show ssh", modifier: ["modkey"], key: "s"), (command: Execute, value: "alacritty", modifier: ["modkey"], key: "Return"), - (command: Execute, value: "firefox", modifier: ["modkey"], key: "b"), + (command: Execute, value: "firefox", modifier: ["modkey"], key: "b"), // + (command: Execute, value: "playerctl play-pause", modifier: ["modkey"], key: "u"), (command: CloseWindow, value: "", modifier: ["modkey", "Shift"], key: "q"), (command: SoftReload, value: "", modifier: ["modkey", "Shift"], key: "x"), // (command: Execute, value: "loginctl kill-session $XDG_SESSION_ID", modifier: ["modkey", "Shift"], key: "x"), From bdc598b9f7fd5eec2b47972051504688c29ce325 Mon Sep 17 00:00:00 2001 From: "E. Almqvist" Date: Sun, 19 Feb 2023 15:28:57 +0100 Subject: [PATCH 3/3] Gitignore update --- emacs/.config/emacs/.gitignore | 3 +++ emacs/.config/emacs/places | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 emacs/.config/emacs/places diff --git a/emacs/.config/emacs/.gitignore b/emacs/.config/emacs/.gitignore index c45bae1..c2bfe7f 100644 --- a/emacs/.config/emacs/.gitignore +++ b/emacs/.config/emacs/.gitignore @@ -52,3 +52,6 @@ flycheck_*.el projectile-bookmarks.eld .lsp-session-v1 *.dat + +# Dumb +places diff --git a/emacs/.config/emacs/places b/emacs/.config/emacs/places deleted file mode 100644 index c15a5a0..0000000 --- a/emacs/.config/emacs/places +++ /dev/null @@ -1,5 +0,0 @@ -;;; -*- coding: utf-8; mode: lisp-data -*- -(("/home/elal/.dotfiles/emacs/.config/emacs/init.el" . 6165) - ("/home/elal/.dotfiles/emacs/.config/emacs/config.el" . 133) - ("/home/elal/Projects/school/cth/courses/mop/libmd407/md407/gfx.h" . 838) - ("/home/elal/.config/emacs/.cache/treemacs-persist" . 47))