Merge branch 'main' into single-monitor

This commit is contained in:
Andrew Scott 2022-01-20 22:23:23 -05:00
commit 0662d8e9bd
Signed by: a
GPG key ID: 3EB62D0BBB8DB381
7 changed files with 248 additions and 24 deletions

View file

@ -1,6 +1,6 @@
# dotfiles
### Configuration files for Arch Linux with bspwm and a dark gruvbox theme
### Configuration files for Arch Linux with bspwm and zenburn
```
git clone https://codeberg.org/acscott/dotfiles.git ~/.dotfiles
@ -22,6 +22,8 @@ in ~/dotfiles_backup. The script is simple enough that it should be
easily editable, but obviously feel free to copy or symlink the
files how you see fit.
The below screenshots are using a dark gruvbox theme, however I'm currently experimenting with zenburn. The gruvbox configs are still available, but they are not the default on all branches.
### laptop-hidpi configuration
![Desktop screenshot of the laptop-hidpi configuration](info/screenshots/screenshot.png)

View file

@ -6,4 +6,4 @@ enable_audio_bell no
#background_opacity 0.9
window_padding_width 20
#background #202020
include gruvbox.conf
include zenburn.conf

26
config/kitty/zenburn.conf Normal file
View file

@ -0,0 +1,26 @@
# Zenburn by jnurmine, https://github.com/jnurmine/Zenburn
# This work is licensed under the terms of the GNU GPL license.
# For a copy, see http://www.gnu.org/licenses/gpl.html.
background #3f3f3f
foreground #dcdccc
cursor #73635a
selection_background #21322f
color0 #4d4d4d
color8 #709080
color1 #705050
color9 #dca3a3
color2 #60b48a
color10 #c3bf9f
color3 #f0deae
color11 #dfcf9f
color4 #506f8f
color12 #94bff3
color5 #dc8cc3
color13 #ec93d3
color6 #8cd0d3
color14 #93e0e3
color7 #dcdccc
color15 #ffffff
selection_foreground #3f3f3f

View file

@ -0,0 +1,193 @@
/*-*- mode: css; -*-*/
/** ROFI Color theme */
configuration {
modi: "combi";
combi-modi: "window,drun,run,ssh";
me-select-entry: "MouseSecondary";
me-accept-entry: "MousePrimary";
scroll-method: 1;
display-ssh: "ssh";
display-run: "#! ";
display-drun: "";
display-window: "";
display-combi: "請選擇";
show-icons: true;
}
/**
* User: Qball
* Copyright: Dave Davenport
*/
* {
foreground: #dcdccc;
backlight: #ccffeedd;
background-color: transparent;
dark: #434443;
black: #3F3F3F;
black-2: #4f4f4f;
tblack-2: #3f3f3fcc;
red: #CC9393;
red-2: #9C6363;
green: #7F9F7F;
green-2: #5F7F5F;
yellow: #F0DFAF;
yellow-2: #D0BF8F;
blue: #8CD0D3;
blue-2: #6CA0A3;
magenta: #DC8CC3;
magenta-2: #CB7BB2;
cyan: #93E0E3;
tcyan: #93E0E3de;
cyan-2: #82CFD2;
white: #DCDCCC;
white-2: #FFFFEF;
highlight: underline bold #6CA0A3;
transparent: rgba(0,0,0,0);
font: "Hack 12";
}
window {
location: center;
anchor: center;
transparency: "screenshot";
padding: 10px;
border: 0px;
radius: 15px;
color: @magenta;
background-color: @transparent;
spacing: 0;
children: [vertb, mainbox];
orientation: horizontal;
font: "Hack 12";
}
mainbox {
spacing: 0;
children: [ inputbar, message, listview ];
}
message {
border-color: @foreground;
border: 0px 2px 2px 2px;
padding: 5;
background-color: @yellow;
font: "Hack 12";
color: @black;
}
inputbar {
color: @foreground;
padding: 11px;
background-color: @dark;
border: 2px 2px 2px 2px;
border-radius: 0px 0px 0px 0px;
border-color: @foreground;
font: "Hack 12";
}
entry,prompt,case-indicator {
text-font: inherit;
text-color:inherit;
}
listview {
padding: 8px;
border-radius: 0px 0px 0px 0px;
border-color: @foreground;
border: 0px 2px 2px 2px;
background-color: #1c1c1ccc;
dynamic: true;
lines: 20;
}
element {
padding: 3px;
vertical-align: 0.5;
background-color: @dark;
color: @dark;
font:inherit;
}
element selected normal {
color: @black;
background-color: @foreground;
}
element normal active {
foreground: @red-2;
color: @green-2;
background-color:@yellow-2;
}
element normal.urgent {
foreground: @red;
}
element normal normal {
background-color: @tblack;
}
element alternate normal {
background-color: @black;
}
element alternate.active {
foreground: @red;
}
element alternate.urgent {
foreground: @red;
}
element selected.active {
color: @black;
background-color: @foreground;
}
element selected.urgent {
background-color: @red-2;
foreground: @foreground;
}
vertb {
expand: false;
// children: [ Dummy0, sidebar, dummy1 ];
}
dummy0, dummy1 {
expand: true;
}
sidebar {
expand: false;
orientation: vertical;
spacing: 0px;
border: 0px 0px 0px 0px;
}
button {
font: "FontAwesome 26";
padding: 6px;
border: 2px 0px 2px 2px;
border-radius: 4px 0px 0px 4px;
background-color: @tblack-2;
border-color: @foreground;
color: @foreground;
horizontal-align: 0.5;
}
button selected normal {
color: @dark;
border: 2px 0px 2px 2px;
background-color: @backlight;
border-color: @foreground;
}
element-icon {
padding: 2px 0px;
size: 32px;
}

View file

@ -86,26 +86,24 @@
;; Theme
(setq custom-safe-themes t)
;; (use-package doom-themes
;; :config
;; (setq doom-themes-enable-bold t
;; doom-themes-enable-italic t)
;; (load-theme 'doom-gruvbox)
;; (doom-themes-visual-bell-config)
;; (setq doom-themes-treemacs-theme "doom-colors")
;; (doom-themes-treemacs-config)
;; (doom-themes-org-config))
;(use-package darktooth-theme
; :config
; (load-theme `darktooth t))
;; (use-package gruvbox-theme
;; :init
;; (load-theme 'gruvbox-dark-hard t))
(use-package base16-theme
:ensure t
(use-package zenburn-theme
:config
(load-theme 'gruvbox-dark-soft t))
(load-theme `zenburn t))
;; Help distinguish between work buffers from others like sidebars and terminal
;; (use-package ample-theme
;; :config
;; (load-theme `ample-flat t))
;; (use-package base16-theme
;; :ensure t
;; :config
;; (load-theme 'gruvbox-dark-soft t))
;; Help distinguish between work from others like sidebars and terminal
(use-package solaire-mode
:diminish
:init
@ -115,14 +113,19 @@
(use-package all-the-icons)
;; Modeline
;; (use-package simple-modeline
;; :hook (after-init . simple-modeline-mode))
(use-package minions
:hook (doom-modeline-mode . minions-mode))
:hook (doom-modeline-mode . minions-mode)
(simple-modeline-mode . minions-mode))
(use-package doom-modeline
:init (doom-modeline-mode)
:custom-face
(mode-line ((t (:height 0.8))))
(mode-line-inactive ((t (:height 0.75))))
(mode-line ((t (:height 0.75))))
(mode-line-inactive ((t (:height 0.7))))
:custom
(doom-modeline-height 30)
(doom-modeline-bar-width 4)
@ -221,7 +224,7 @@
(zig-mode . lsp)
(lsp-mode . lsp-enable-which-key-integration))
:config
(setq lsp-prefer-flymake nil)) ;; prefer lsp-ui (flycheck) to flymake
(setq lsp-prefer-flymake nil)) ;prefer lsp-ui (flycheck) to flymake
; :bind
; (:map lsp-mode-map
; ("TAB" . completion-at-point)))

View file

@ -51,4 +51,4 @@ st
acpi_call
acpi_call-lts # only if LTS kernel installed, see 'acpi_call-dkms' for other variants
acpilight # or 'light' is sometimes needed for older thinkpads
rtw89-dkms-git # wifi for thinkpad t14 gen2 amd
rtw89-dkms-git # wifi for thinkpad t14 gen2 amd, not needed for kernel 5.16 or later