liam/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update and merge conflicts

Browse Source
This commit is contained in:
Liam Malone
2024-10-13 15:20:26 +02:00
parent 5701b5fd20
commit 13cf1e25aa
9 changed files with 158 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/old_configs/emacs/config.org
+13 -7
View File
@@ -26,6 +26,8 @@
- [[#markdown-mode][MARKDOWN MODE]]
- [[#org-download][ORG DOWNLOAD]]
- [[#pulse][PULSE]]
- [[#pdf-tools][PDF TOOLS]]
- [[#projectile][PROJECTILE]]
- [[#rainbow-mode][RAINBOW MODE]]
- [[#reload-emacs][RELOAD EMACS]]
- [[#shells-and-terminals][SHELLS AND TERMINALS]]
@@ -497,20 +499,18 @@ Enable zoom in/out with C-=/- and also for C-scrl-up/down
* ORG DOWNLOAD
#+begin_src emacs-lisp
;; inspired by https://zzamboni.org/post/how-to-insert-screenshots-in-org-documents-on-macos/
(use-package org-download
:after org
:defer nil
:custom
(org-download-method 'directory)
(org-download-image-dir "~/emacs/")
(org-download-image-dir "~/emacs/images/")
(org-download-heading-lvl 0)
(org-download-timestamp "org_%Y%m%d-%H%M%S_")
;; (org-image-actual-width 400)
(org-download-screenshot-method "wl-paste -t image/png > '%s'")
(org-image-actual-width 400)
(org-download-screenshot-method "WAYLAND_DISPLAY=wayland-1 wl-paste -t image/png > '%s'.png")
:bind
("C-M-y" . org-download-screenshot)
("C-M-y" . org-download-screenshot file)
:config
(require 'org-download))
#+end_src
@@ -539,7 +539,13 @@ Pulse highlight a line on certain actions
# (advice-add command :after #'pulse-line)))
# #+end_src
# * PROJECTILE
* PDF TOOLS
#+begin_src emacs-lisp
(use-package pdf-tools)
#+end_src
* PROJECTILE
[[https://github.com/bbatsov/projectile][Projectile]] is a project interaction library for Emacs.
#+begin_src emacs-lisp
modules/old_configs/nvim/lua/liamm/remap.lua
+36 -15
View File
@@ -24,23 +24,44 @@ vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", {silent = true})
-- put nvim to background
vim.keymap.set("n", "<leader>bg", "<C-z>")
-- BUILD SCRIPT INVOKATIONS
-- invoke build scripts
-- `build.sh`
vim.keymap.set("n", "<leader>bo", ":!./build.sh ") -- Interactive for adding flags/options
vim.keymap.set("n", "<leader>bb", ":!./build.sh <CR>")
vim.keymap.set("n", "<leader>br", ":!./build.sh run<CR>")
vim.keymap.set("n", "<leader>bR", ":!./build.sh release<CR>")
vim.keymap.set("n", "<leader>bRr", ":!./build.sh release run<CR>")
-- `build.sh` script binds
-- non-interactive binds
vim.keymap.set("n", "<leader>bb" , "<cmd>./build.sh <CR>")
vim.keymap.set("n", "<leader>br" , "<cmd>./build.sh run <CR>")
vim.keymap.set("n", "<leader>bRb" , "<cmd>./build.sh release <CR>")
vim.keymap.set("n", "<leader>bRr" , "<cmd>./build.sh release run <CR>")
vim.keymap.set("n", "<leader>bRr" , "<cmd>./build.sh release run <CR>")
-- zig build
vim.keymap.set("n", "<leader>zbo", ":!zig build -D") -- Interactive for adding flags/options
vim.keymap.set("n", "<leader>zbb", ":!zig build <CR>")
vim.keymap.set("n", "<leader>zbr", ":!zig build run<CR>")
vim.keymap.set("n", "<leader>zbR", ":!zig build -Doptimize=ReleaseSafe <CR>")
vim.keymap.set("n", "<leader>zbRr", ":!zig build -Doptimize=ReleaseSafe run<CR>")
vim.keymap.set("n", "<leader>zbt", ":!zig build -Dtarget=") -- Interactive to add target/other flags
vim.keymap.set("n", "<leader>zbtR", ":!zig build -Doptimize=ReleaseSafe -Dtarget=") -- Interactive to add target/other flags
-- interactive binds
vim.keymap.set("n", "<leader>bo" , "<cmd>./build.sh ") -- allow for adding extra flags/options
vim.keymap.set("n", "<leader>bor" , "<cmd>./build.sh run") -- allow for adding extra flags/options
vim.keymap.set("n", "<leader>bRo" , "<cmd>./build.sh release ")
vim.keymap.set("n", "<leader>bRor", "<cmd>./build.sh release run ")
-- `build.zig` script binds
-- non-interactive binds
vim.keymap.set("n", "<leader>zbb" , "<cmd>zig build <CR>")
vim.keymap.set("n", "<leader>zbr" , "<cmd>zig build run <CR>")
vim.keymap.set("n", "<leader>zbt" , "<cmd>zig build test <CR>")
vim.keymap.set("n", "<leader>zbR" , "<cmd>zig build -Doptimize=ReleaseSafe <CR>")
vim.keymap.set("n", "<leader>zbRs" , "<cmd>zig build -Doptimize=ReleaseSmall <CR>")
vim.keymap.set("n", "<leader>zbRf" , "<cmd>zig build -Doptimize=ReleaseFast <CR>")
vim.keymap.set("n", "<leader>zbRr" , "<cmd>zig build run -Doptimize=ReleaseSafe <CR>")
vim.keymap.set("n", "<leader>zbRsr", "<cmd>zig build run -Doptimize=ReleaseSmall <CR>")
vim.keymap.set("n", "<leader>zbRfr", "<cmd>zig build run -Doptimize=ReleaseFast <CR>")
-- interactive binds
vim.keymap.set("n", "<leader>zbob" , "<cmd>zig build ")
vim.keymap.set("n", "<leader>zbor" , "<cmd>zig build run ")
vim.keymap.set("n", "<leader>zbot" , "<cmd>zig build test ")
vim.keymap.set("n", "<leader>zboR" , "<cmd>zig build -Doptimize=ReleaseSafe ")
vim.keymap.set("n", "<leader>zboRs" , "<cmd>zig build -Doptimize=ReleaseSmall ")
vim.keymap.set("n", "<leader>zboRf" , "<cmd>zig build -Doptimize=ReleaseFast ")
vim.keymap.set("n", "<leader>zboRr" , "<cmd>zig build run -Doptimize=ReleaseSafe ")
vim.keymap.set("n", "<leader>zboRsr", "<cmd>zig build run -Doptimize=ReleaseSmall ")
vim.keymap.set("n", "<leader>zboRfr", "<cmd>zig build run -Doptimize=ReleaseFast ")
-- emacs-inspired binds
modules/old_configs/waybar/config.jsonc
+2 -2
View File
@@ -51,14 +51,14 @@
"clock": {
"interval": 1,
"format": "<big> </big>\n{:%d/%m\n<big> 󰥔 </big>\n %R}",
"format": "<big> </big>\n{:%d/%m\n<big> 󰥔 </big>\n%R}",
"tooltip": true,
"tooltip-format": "<big>{:%Y %B}</big> <tt><small>{calendar}</small></tt>"
},
"disk": {
"interval": 30,
"path": "/home",
"format": "<big> </big>\n {path}\n {percentage_used}%",
"format": "<big> </big>\n {path}\n {percentage_used}%",
"alt-format": " {path}:{used}\/{total}",
"tooltip-format": " {path}:{used}\/{total}",
},