Merge

emacs/.config/emacs/init.el

@@ -57,6 +57,38 @@
 ;; Disable backup files etc.
 (setq make-backup-files nil)
 
+<<<<<<< HEAD
+=======
+;; Melpa
+(require 'package)
+(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
+(package-initialize)
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; 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))
+ '(elcord-display-buffer-details nil)
+ '(elcord-display-elapsed t)
+ '(elcord-editor-icon "emacs_material_icon")
+ '(elcord-idle-message "Thinking...")
+ '(elcord-idle-timer 300)
+ '(elcord-quiet t)
+ '(elcord-use-major-mode-as-main-icon nil)
+ '(evil-undo-system 'undo-redo)
+ '(package-selected-packages
+   '(ligature evil-smartparens smartparens web-mode sublimity typescript-mode glsl-mode format-all hl-todo elcord evil-tabs evil-commentary format-all auto-complete editorconfig haskell-mode counsel ivy go-mode rust-mode use-package treemacs-evil treemacs projectile doom-themes lsp-mode evil)))
+
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ )
+
+>>>>>>> master
 ;; LSP
 (require 'use-package)
 (use-package lsp-mode

eww/.config/eww/eww.yuck

@@ -85,7 +85,7 @@
           ;; Quit WM (goto login manager)
           (button    :class "icon quit"
                      :tooltip "Logout"
-                     :onclick "killall xmonad-x86_64-linux" "")
+                     :onclick "loginctl kill-session $XDG_SESSION_ID" "")
 
           ;; Reboot
           (button    :class "icon reboot"

leftwm/.config/leftwm/config.ron

@@ -0,0 +1,125 @@
+//  _        ___                                      ___ _
+// | |      / __)_                                   / __|_)
+// | | ____| |__| |_ _ _ _ ____      ____ ___  ____ | |__ _  ____    ____ ___  ____
+// | |/ _  )  __)  _) | | |    \    / ___) _ \|  _ \|  __) |/ _  |  / ___) _ \|  _ \
+// | ( (/ /| |  | |_| | | | | | |  ( (__| |_| | | | | |  | ( ( | |_| |  | |_| | | | |
+// |_|\____)_|   \___)____|_|_|_|   \____)___/|_| |_|_|  |_|\_|| (_)_|   \___/|_| |_|
+// A WindowManager for Adventurers                         (____/
+// For info about configuration please visit https://github.com/leftwm/leftwm/wiki
+
+#![enable(implicit_some)]
+(
+    modkey: "Mod4",
+    mousekey: "Mod4",
+    workspaces: [
+        (
+            output: "DP-4",
+            y: 0,
+            x: 0,
+            height: 1080,
+            width: 1920,
+        ),
+        (
+            output: "HDMI-0",
+            y: 0,
+            x: 1920,
+            height: 1080,
+            width: 1920,
+        )
+    ],
+    tags: [
+        "1",
+        "2",
+        "3",
+        "4",
+        "5",
+        "6",
+        "7",
+        "8",
+        "9",
+    ],
+    max_window_width: None,
+    layouts: [
+        MainAndVertStack,
+        // MainAndHorizontalStack,
+        // MainAndDeck,
+        // GridHorizontal,
+        // EvenHorizontal,
+        // EvenVertical,
+        Fibonacci,
+        // LeftMain,
+        // CenterMain,
+        // CenterMainBalanced,
+        // CenterMainFluid,
+        Monocle,
+        LeftWiderRightStack,
+    ],
+    layout_mode: Tag,
+    insert_behavior: Bottom,
+    scratchpad: [
+        (name: "Qalc", value: "alacritty -e qalc", x: 760, y: 415, height: 250, width: 400),
+    ],
+    window_rules: [],
+    disable_current_tag_swap: true,
+    disable_tile_drag: false,
+    disable_window_snap: true,
+    focus_behaviour: Sloppy,
+    focus_new_windows: true,
+    single_window_border: true,
+    sloppy_mouse_follows_focus: true,
+    auto_derive_workspaces: true,
+    keybind: [
+        (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: 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"),
+        (command: Execute, value: "betterlockscreen --lock", modifier: ["modkey"], key: "l"),
+        (command: MoveToLastWorkspace, value: "", modifier: ["modkey", "Shift"], key: "w"),
+        (command: SwapTags, value: "", modifier: ["modkey"], key: "w"),
+        (command: MoveWindowUp, value: "", modifier: ["modkey", "Shift"], key: "k"),
+        (command: MoveWindowDown, value: "", modifier: ["modkey", "Shift"], key: "j"),
+        (command: MoveWindowTop, value: "", modifier: ["modkey", "Shift"], key: "Return"),
+        (command: FocusWindowUp, value: "", modifier: ["modkey"], key: "k"),
+        (command: FocusWindowDown, value: "", modifier: ["modkey"], key: "j"),
+        (command: NextLayout, value: "", modifier: ["modkey", "Control"], key: "k"),
+        (command: PreviousLayout, value: "", modifier: ["modkey", "Control"], key: "j"),
+        (command: FocusWorkspaceNext, value: "", modifier: ["modkey"], key: "l"),
+        (command: FocusWorkspacePrevious, value: "", modifier: ["modkey"], key: "h"),
+        (command: MoveWindowUp, value: "", modifier: ["modkey", "Shift"], key: "Up"),
+        (command: MoveWindowDown, value: "", modifier: ["modkey", "Shift"], key: "Down"),
+        (command: FocusWindowUp, value: "", modifier: ["modkey"], key: "Up"),
+        (command: FocusWindowDown, value: "", modifier: ["modkey"], key: "Down"),
+        (command: NextLayout, value: "", modifier: ["modkey", "Control"], key: "Up"),
+        (command: PreviousLayout, value: "", modifier: ["modkey", "Control"], key: "Down"),
+        (command: FocusWorkspaceNext, value: "", modifier: ["modkey"], key: "Right"),
+        (command: FocusWorkspacePrevious, value: "", modifier: ["modkey"], key: "Left"),
+        (command: ToggleScratchPad, value: "Qalc", modifier: ["modkey"], key: "c"),
+        (command: ToggleFloating, modifier: ["modkey"], key: "f"),
+	(command: ToggleFullScreen, modifier: ["modkey", "Shift"], key: "f"),
+	(command: SetLayout, value: "Monocle", modifier: ["modkey"], key: "m"),
+	(command: SetLayout, value: "MainAndVertStack", modifier: ["modkey"], key: "t"),
+	(command: SetLayout, value: "LeftWiderRightStack", modifier: ["modkey", "Shift"], key: "t"),
+        (command: GotoTag, value: "1", modifier: ["modkey"], key: "1"),
+        (command: GotoTag, value: "2", modifier: ["modkey"], key: "2"),
+        (command: GotoTag, value: "3", modifier: ["modkey"], key: "3"),
+        (command: GotoTag, value: "4", modifier: ["modkey"], key: "4"),
+        (command: GotoTag, value: "5", modifier: ["modkey"], key: "5"),
+        (command: GotoTag, value: "6", modifier: ["modkey"], key: "6"),
+        (command: GotoTag, value: "7", modifier: ["modkey"], key: "7"),
+        (command: GotoTag, value: "8", modifier: ["modkey"], key: "8"),
+        (command: GotoTag, value: "9", modifier: ["modkey"], key: "9"),
+        (command: MoveToTag, value: "1", modifier: ["modkey", "Shift"], key: "1"),
+        (command: MoveToTag, value: "2", modifier: ["modkey", "Shift"], key: "2"),
+        (command: MoveToTag, value: "3", modifier: ["modkey", "Shift"], key: "3"),
+        (command: MoveToTag, value: "4", modifier: ["modkey", "Shift"], key: "4"),
+        (command: MoveToTag, value: "5", modifier: ["modkey", "Shift"], key: "5"),
+        (command: MoveToTag, value: "6", modifier: ["modkey", "Shift"], key: "6"),
+        (command: MoveToTag, value: "7", modifier: ["modkey", "Shift"], key: "7"),
+        (command: MoveToTag, value: "8", modifier: ["modkey", "Shift"], key: "8"),
+        (command: MoveToTag, value: "9", modifier: ["modkey", "Shift"], key: "9"),
+    ],
+    state_path: None,
+)

oh-my-zsh/.oh-my-zsh/aliases.sh

@@ -21,4 +21,4 @@ alias armgdb="arm-none-eabi-gdb"
 alias setbri="xrandr --output eDP-1 --brightness"
 alias lsbat="cat /sys/class/power_supply/BAT0/capacity"
 alias lsnet="nmcli | grep "^wlp" | sed 's/\ connected\ to\ //g' | cut -d ':' -f2"
-
+alias gdb-multiarch="arm-none-eabi-gdb"