aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/discord/index.org8
-rw-r--r--config/emacs/index.org14
-rw-r--r--config/emacs/languages.org17
-rw-r--r--config/emacs/package-setup.org34
-rw-r--r--config/emacs/tools.org20
-rw-r--r--config/emacs/user-interface.org9
-rw-r--r--config/fastfetch/index.org8
-rw-r--r--config/foot/foot.org66
-rw-r--r--config/foot/index.org9
-rw-r--r--config/fuzzel/fuzzel.org35
-rw-r--r--config/index.org14
-rw-r--r--config/mpd/index.org9
-rw-r--r--config/ncmpcpp/index.org9
-rw-r--r--config/nvim/index.org9
-rw-r--r--config/nvim/lua/appearance.org6
-rw-r--r--config/nvim/lua/index.org11
-rw-r--r--config/nvim/lua/plugins.org1
-rw-r--r--config/sway/config.org2
-rw-r--r--config/sway/index.org11
-rw-r--r--config/waybar/index.org9
20 files changed, 122 insertions, 179 deletions
diff --git a/config/discord/index.org b/config/discord/index.org
deleted file mode 100644
index 4b828a4..0000000
--- a/config/discord/index.org
+++ /dev/null
@@ -1,8 +0,0 @@
-#+title: Dotfiles =/.config/discord=
-Here is my discord configuration.
-
-* Directories
-- [[../index.org][../]]
-
-* Files
-- [[./settings.org][settings.json]]
diff --git a/config/emacs/index.org b/config/emacs/index.org
deleted file mode 100644
index 6665f16..0000000
--- a/config/emacs/index.org
+++ /dev/null
@@ -1,14 +0,0 @@
-#+title: Dotfiles =/.config/emacs=
-This is my Emacs configuration. I recommend starting in [[./init.org][init.el]] as that is the entry-point for the program.
-
-* Directories
-- [[../index.org][../]]
-
-* Files
-- [[./feed.org][feed.org]]
-- [[./force-custom-file.org][force-custom-file.el]]
-- [[./init.org][init.el]]
-- [[./languages.org][languages.el]]
-- [[./package-setup.org][package-setup.el]]
-- [[./tools.org][tools.el]]
-- [[./user-interface.org][user-interface.el]]
diff --git a/config/emacs/languages.org b/config/emacs/languages.org
index 765659b..a0a19e4 100644
--- a/config/emacs/languages.org
+++ b/config/emacs/languages.org
@@ -71,6 +71,23 @@ Install Lua support and run =eglot= on Lua files.
(add-hook 'lua-mode-hook 'jj/eglot-setup))
#+end_src
+Better Lisp editing with =lispy=.
+#+begin_src emacs-lisp :tangle ~/.config/emacs/languages.el :mkdirp yes
+ (use-package lispy
+ :hook (emacs-lisp-mode . lispy-mode))
+ (use-package lispyville
+ :after lispy
+ :hook (lispy-mode . lispyville-mode))
+#+end_src
+
+Better parentheses handling in lisp with =parinfer-rust-mode=.
+#+begin_src emacs-lisp :tangle ~/.config/emacs/tools.el :mkdirp yes
+ (use-package parinfer-rust-mode
+ :hook (emacs-lisp-mode . parinfer-rust-mode)
+ :init
+ (setq parinfer-rust-auto-download t))
+#+end_src
+
* Markdown
Install Markdown support and run =eglot= on Markdown files.
#+begin_src emacs-lisp :tangle ~/.config/emacs/languages.el :mkdirp yes
diff --git a/config/emacs/package-setup.org b/config/emacs/package-setup.org
index 00d87dc..6ed238c 100644
--- a/config/emacs/package-setup.org
+++ b/config/emacs/package-setup.org
@@ -1,23 +1,25 @@
#+title: Emacs Package Setup
-
-Set up =melpa=, =org=, and =elpa= as package archives.
+Install =straight= for better package management.
#+begin_src emacs-lisp :tangle ~/.config/emacs/package-setup.el :mkdirp yes
- (require 'package)
-
- (setq package-archives '(("melpa" . "https://melpa.org/packages/")
- ("org" . "https://orgmode.org/elpa/")
- ("elpa" . "https://elpa.gnu.org/packages/")))
-
- (package-initialize)
- (unless package-archive-contents
- (package-refresh-contents))
+ (defvar bootstrap-version)
+ (let ((bootstrap-file
+ (expand-file-name
+ "straight/repos/straight.el/bootstrap.el"
+ (or (bound-and-true-p straight-base-dir)
+ user-emacs-directory)))
+ (bootstrap-version 7))
+ (unless (file-exists-p bootstrap-file)
+ (with-current-buffer
+ (url-retrieve-synchronously
+ "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el"
+ 'silent 'inhibit-cookies)
+ (goto-char (point-max))
+ (eval-print-last-sexp)))
+ (load bootstrap-file nil 'nomessage))
#+end_src
Install =use-package= for declarative package installation. Make =use-package= default to =ensure t= so that packages are enabled if they are declared.
#+begin_src emacs-lisp :tangle ~/.config/emacs/package-setup.el :mkdirp yes
- (unless (package-installed-p 'use-package)
- (package-install 'use-package))
-
- (require 'use-package)
- (setq use-package-always-ensure t)
+ (straight-use-package 'use-package)
+ (setq straight-use-package-by-default t)
#+end_src
diff --git a/config/emacs/tools.org b/config/emacs/tools.org
index fd31c90..b9a5008 100644
--- a/config/emacs/tools.org
+++ b/config/emacs/tools.org
@@ -23,24 +23,6 @@ Use =evil-collection= to include =vi= keybindings in extra modes.
(evil-collection-init))
#+end_src
-* Lisp Editing
-Better Lisp editing with =lispy= and =lispyville=.
-#+begin_src emacs-lisp :tangle ~/.config/emacs/tools.el :mkdirp yes
- (use-package lispy
- :hook emacs-lisp-mode)
- (use-package lispyville
- :after lispy
- :hook lispy-mode)
-#+end_src
-
-Better parentheses handling in lisp with =parinfer-rust-mode=.
-#+begin_src emacs-lisp :tangle ~/.config/emacs/tools.el :mkdirp yes
- (use-package parinfer-rust-mode
- :hook emacs-lisp-mode
- :init
- (setq parinfer-rust-auto-download t))
-#+end_src
-
* Undo
Better undo with =undo-fu=.
#+begin_src emacs-lisp :tangle ~/.config/emacs/tools.el :mkdirp yes
@@ -91,7 +73,7 @@ Save place in PDFs with =saveplace-pdf-view=.
* Org-Mode
Ensure that =org= is set up before any of this.
#+begin_src emacs-lisp :tangle ~/.config/emacs/tools.el :mkdirp yes
- (require 'org)
+ (use-package org)
#+end_src
Set my =org-mode= directory.
#+begin_src emacs-lisp :tangle ~/.config/emacs/tools.el :mkdirp yes
diff --git a/config/emacs/user-interface.org b/config/emacs/user-interface.org
index c0dc399..5a88df5 100644
--- a/config/emacs/user-interface.org
+++ b/config/emacs/user-interface.org
@@ -9,11 +9,16 @@ Set the default font to the Source Code Pro nerd font variant. I use size 14 fon
Use the Doom Nord light theme.
#+begin_src emacs-lisp :tangle ~/.config/emacs/user-interface.el :mkdirp yes
(use-package doom-themes
+ :straight (doom-themes :type git :host github :repo "doomemacs/themes"
+ :fork (:host github
+ :repo "JacobJanzen/emacs-doom-themes"))
:config
(setq doom-themes-enable-bold t
doom-themes-enable-italic t)
- (load-theme 'doom-nord-light t)
+ (load-theme 'doom-disco t)
(doom-themes-org-config))
+
+(add-to-list 'default-frame-alist '(alpha-background . 90))
#+end_src
Use =doom-modeline= for a nicer modeline.
@@ -99,7 +104,7 @@ Don't create backup files.
Use nerd font icons in =dired=.
#+begin_src emacs-lisp :tangle ~/.config/emacs/user-interface.el :mkdirp yes
(use-package nerd-icons-dired
- :hook dired-mode)
+ :hook (dired-mode . nerd-icons-dired-mode))
#+end_src
Use colours in =dired= with =diredfl=.
diff --git a/config/fastfetch/index.org b/config/fastfetch/index.org
deleted file mode 100644
index 67de5e3..0000000
--- a/config/fastfetch/index.org
+++ /dev/null
@@ -1,8 +0,0 @@
-#+title: Dotfiles =/.config/fastfetch=
-This is my Fastfetch configuration.
-
-* Directories
-- [[../index.org][../]]
-
-* Files
-- [[./config.org][config.jsonc]]
diff --git a/config/foot/foot.org b/config/foot/foot.org
index f0bbfd3..01d7489 100644
--- a/config/foot/foot.org
+++ b/config/foot/foot.org
@@ -1,52 +1,66 @@
#+title: Foot Settings
* Basic Settings
Use Source Code Pro with Nerd Font in size 10.
-#+begin_src conf :tangle ~/.config/foot.ini :mkdirp yes
+#+begin_src conf :tangle ~/.config/foot/foot.ini :mkdirp yes
font=SauceCodePro Nerd Font:size=10
#+end_src
Add 6 pixel padding around the terminal.
-#+begin_src conf :tangle ~/.config/foot.ini :mkdirp yes
+#+begin_src conf :tangle ~/.config/foot/foot.ini :mkdirp yes
pad=6x6
#+end_src
* URL
Use Firefox to open URLs.
-#+begin_src conf :tangle ~/.config/foot.ini :mkdirp yes
+#+begin_src conf :tangle ~/.config/foot/foot.ini :mkdirp yes
[url]
launch=firefox ${url}
#+end_src
* Mouse
Hide the mouse when typing.
-#+begin_src conf :tangle ~/.config/foot.ini :mkdirp yes
+#+begin_src conf :tangle ~/.config/foot/foot.ini :mkdirp yes
[mouse]
hide-when-typing=yes
#+end_src
* Colours
-The colours are defined here. I use a slightly transparent background.
-#+begin_src conf :tangle ~/.config/foot.ini :mkdirp yes
+The colours are defined here.
+#+begin_src conf :tangle ~/.config/foot/foot.ini :mkdirp yes
[colors]
+#+end_src
+
+I use a slightly transparent background.
+#+begin_src conf :tangle ~/.config/foot/foot.ini :mkdirp yes
alpha=0.9
- background=fcfcfc
- foreground=5c6166
-
- regular0=010101
- regular1=e7666a
- regular2=80ab24
- regular3=eba54d
- regular4=4196df
- regular5=9870c3
- regular6=51b891
- regular7=c1c1c1
-
- bright0=343434
- bright1=ee9295
- bright2=9fd32f
- bright3=f0bc7b
- bright4=6daee6
- bright5=b294d2
- bright6=75c7a8
- bright7=dbdbdb
+#+end_src
+
+Set my foreground and background colours.
+#+begin_src conf :tangle ~/.config/foot/foot.ini :mkdirp yes
+ background=ece0c9
+ foreground=191916
+#+end_src
+
+Set my regular 8 colours.
+#+begin_src conf :tangle ~/.config/foot/foot.ini :mkdirp yes
+ regular0=191916
+ regular1=ac4438
+ regular2=354d52
+ regular3=ba9151
+ regular4=465b91
+ regular5=5b5489
+ regular6=4e6062
+ regular7=c9ad7a
+#+end_src
+
+Set my bright 8 colours.
+#+begin_src conf :tangle ~/.config/foot/foot.ini :mkdirp yes
+ bright0=293c3c
+ bright1=d8611c
+ bright2=4b7b53
+ bright3=d8974b
+ bright4=2f3d91
+ bright5=735e82
+ bright6=6b8f92
+ bright7=ece0c9
#+end_src
diff --git a/config/foot/index.org b/config/foot/index.org
deleted file mode 100644
index f076d68..0000000
--- a/config/foot/index.org
+++ /dev/null
@@ -1,9 +0,0 @@
-#+title: Dotfiles =/.config/foot=
-
-This is my Foot configuration.
-
-* Directories
-- [[../index.org][../]]
-
-* Files
-- [[./foot.org][foot.ini]]
diff --git a/config/fuzzel/fuzzel.org b/config/fuzzel/fuzzel.org
new file mode 100644
index 0000000..be2d91a
--- /dev/null
+++ b/config/fuzzel/fuzzel.org
@@ -0,0 +1,35 @@
+#+title: Fuzzel Configuration
+
+Place Fuzzel above fullscreen windows.
+#+begin_src conf :tangle ~/.config/fuzzel/fuzzel.ini :mkdirp yes
+ layer=overlay
+#+end_src
+
+Define fields to search in.
+#+begin_src conf :tangle ~/.config/fuzzel/fuzzel.ini :mkdirp yes
+ fields=name,generic,comment,categories,filename,keywords
+#+end_src
+
+Launch terminal programs in =foot=.
+#+begin_src conf :tangle ~/.config/fuzzel/fuzzel.ini :mkdirp yes
+ terminal=foot -e
+#+end_src
+
+Use Source Code Pro like the rest of my configuration.
+#+begin_src conf :tangle ~/.config/fuzzel/fuzzel.ini :mkdirp yes
+ font=SauceCodePro Nerd Font:size=15
+#+end_src
+
+Set the colours.
+#+begin_src conf :tangle ~/.config/fuzzel/fuzzel.ini :mkdirp yes
+ [colors]
+ background=ece0c9e6
+ selection=cfbc8ce6
+ border=ffffff00
+#+end_src
+
+Use a square border.
+#+begin_src conf :tangle ~/.config/fuzzel/fuzzel.ini :mkdirp yes
+ [border]
+ radius=0
+#+end_src
diff --git a/config/index.org b/config/index.org
deleted file mode 100644
index 5f4a23b..0000000
--- a/config/index.org
+++ /dev/null
@@ -1,14 +0,0 @@
-#+title: Dotfiles =/.config=
-Here is where most configuration files are stored.
-
-* Directories
-- [[../index.org][../]]
-- [[./discord/index.org][discord/]]
-- [[./emacs/index.org][emacs/]]
-- [[./fastfetch/index.org][fastfetch/]]
-- [[./foot/index.org][foot/]]
-- [[./mpd/index.org][mpd/]]
-- [[./ncmpcpp/index.org][ncmpcpp/]]
-- [[./nvim/index.org][nvim/]]
-- [[./sway/index.org][sway/]]
-- [[./waybar/index.org][waybar/]]
diff --git a/config/mpd/index.org b/config/mpd/index.org
deleted file mode 100644
index 282ec07..0000000
--- a/config/mpd/index.org
+++ /dev/null
@@ -1,9 +0,0 @@
-#+title: Dotfiles =/.config/mpd=
-
-This is my music player daemon configuration.
-
-* Directories
-- [[../index.org][../]]
-
-* Files
-- [[./mpd.org][mpd.conf]]
diff --git a/config/ncmpcpp/index.org b/config/ncmpcpp/index.org
deleted file mode 100644
index 317593c..0000000
--- a/config/ncmpcpp/index.org
+++ /dev/null
@@ -1,9 +0,0 @@
-#+title: Dotfiles =/.config/ncmpcpp=
-This is my =ncmpcpp= configuration.
-
-* Directories
-- [[../index.org][../]]
-
-* Files
-- [[./bindings.org][bindings]]
-- [[./config.org][config]]
diff --git a/config/nvim/index.org b/config/nvim/index.org
deleted file mode 100644
index 38d0daa..0000000
--- a/config/nvim/index.org
+++ /dev/null
@@ -1,9 +0,0 @@
-#+title: Dotfiles =/.config/nvim=
-This is my Neovim configuration. The entry point for the program is [[./init.org][init.lua]].
-
-* Directories
-- [[../index.org][../]]
-- [[./lua/index.org][lua/]]
-
-* Files
-- [[./init.org][init.lua]]
diff --git a/config/nvim/lua/appearance.org b/config/nvim/lua/appearance.org
index 946d420..274f438 100644
--- a/config/nvim/lua/appearance.org
+++ b/config/nvim/lua/appearance.org
@@ -4,12 +4,12 @@ Use line numbers.
vim.opt.number = true
#+end_src
-Set colour scheme to the Ayu light theme.
+Turn on syntax highlighting.
#+begin_src lua :tangle ~/.config/nvim/lua/appearance.lua :mkdirp yes
vim.cmd([[
set termguicolors
- let ayucolor="light"
syntax on
- colorscheme ayu
+ colorscheme default
+ set background=light
]])
#+end_src
diff --git a/config/nvim/lua/index.org b/config/nvim/lua/index.org
deleted file mode 100644
index 4af8e20..0000000
--- a/config/nvim/lua/index.org
+++ /dev/null
@@ -1,11 +0,0 @@
-#+title: Dotfiles =/.config/nvim/lua=
-
-This is where the modular components of my Neovim configuration are stored.
-
-* Directories
-- [[../index.org][../]]
-
-* Files
-- [[./appearance.org][appearance.lua]]
-- [[./behaviour.org][behaviour.lua]]
-- [[./plugins.org][plugins.lua]]
diff --git a/config/nvim/lua/plugins.org b/config/nvim/lua/plugins.org
index 2093a53..f3027f9 100644
--- a/config/nvim/lua/plugins.org
+++ b/config/nvim/lua/plugins.org
@@ -21,7 +21,6 @@ I use =lightline= for a nice status bar. The Ayu theme matches my overall colour
#+begin_src lua :tangle ~/.config/nvim/lua/plugins.lua :mkdirp yes
require('lazy').setup({
'itchyny/lightline.vim',
- 'ayu-theme/ayu-vim',
'Raimondi/delimitMate',
'bronson/vim-trailing-whitespace',
})
diff --git a/config/sway/config.org b/config/sway/config.org
index effe735..bf29a61 100644
--- a/config/sway/config.org
+++ b/config/sway/config.org
@@ -20,7 +20,7 @@ Use =foot= as default terminal.
Use =wofi= as app launcher.
#+begin_src conf :tangle ~/.config/sway/config :mkdirp yes
- set $menu wofi --show drun --allow-images
+ set $menu fuzzel
#+end_src
* Startup Application
diff --git a/config/sway/index.org b/config/sway/index.org
deleted file mode 100644
index 4a19442..0000000
--- a/config/sway/index.org
+++ /dev/null
@@ -1,11 +0,0 @@
-#+title: Dotfiles =/.config/sway=
-
-This is my Sway configuration.
-
-* Directories
-- [[../index.org][../]]
-
-* Files
-- [[./config.org][config]]
-- [[./poweraction.org][poweraction]]
-- [[./powerprompt.org][powerprompt]]
diff --git a/config/waybar/index.org b/config/waybar/index.org
deleted file mode 100644
index b147916..0000000
--- a/config/waybar/index.org
+++ /dev/null
@@ -1,9 +0,0 @@
-#+title: Dotfiles =/.config/waybar=
-This is where my Waybar configuration is located.
-
-* Directories
-- [[../index.org][../]]
-
-* Files
-- [[./config.org][config]]
-- [[./style.org][style.css]]