From 3340335693b985f35a66b6302ace535639a991f1 Mon Sep 17 00:00:00 2001 From: paul-loedige Date: Sun, 23 Oct 2022 15:11:09 +0900 Subject: [PATCH 01/13] fixed error due to tree sitter no longer allowing maintained languages --- neovim/.config/nvim/init.vim | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/neovim/.config/nvim/init.vim b/neovim/.config/nvim/init.vim index 0344240..16b5646 100644 --- a/neovim/.config/nvim/init.vim +++ b/neovim/.config/nvim/init.vim @@ -193,7 +193,21 @@ highlight CursorLineNr ctermfg=7 lua < Date: Mon, 24 Oct 2022 01:11:22 +0900 Subject: [PATCH 02/13] updated coc config file --- neovim/.config/nvim/coc.vim | 54 +++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/neovim/.config/nvim/coc.vim b/neovim/.config/nvim/coc.vim index 74525bf..9bd540b 100644 --- a/neovim/.config/nvim/coc.vim +++ b/neovim/.config/nvim/coc.vim @@ -1,30 +1,36 @@ -" TextEdit might fail if hidden is not set. -set hidden +" May need for vim (not neovim) since coc.nvim calculate byte offset by count +" utf-8 byte sequence. +set encoding=utf-8 " Some servers have issues with backup files, see #649. set nobackup set nowritebackup -" Give more space for displaying messages. -set cmdheight=2 - " Having longer updatetime (default is 4000 ms = 4 s) leads to noticeable " delays and poor user experience. set updatetime=300 -" Don't pass messages to |ins-completion-menu|. -set shortmess+=c +" Always show the signcolumn, otherwise it would shift the text each time +" diagnostics appear/become resolved. +set signcolumn=yes " Use tab for trigger completion with characters ahead and navigate. +" NOTE: There's always complete item selected by default, you may want to enable +" no select by `"suggest.noselect": true` in your configuration file. " NOTE: Use command ':verbose imap ' to make sure tab is not mapped by " other plugin before putting this into your config. inoremap - \ pumvisible() ? "\" : - \ check_back_space() ? "\" : + \ coc#pum#visible() ? coc#pum#next(1) : + \ CheckBackspace() ? "\" : \ coc#refresh() -inoremap pumvisible() ? "\" : "\" +inoremap coc#pum#visible() ? coc#pum#prev(1) : "\" -function! s:check_back_space() abort +" Make to accept selected completion item or notify coc.nvim to format +" u breaks current undo, please make your own choice. +inoremap coc#pum#visible() ? coc#pum#confirm() + \: "\u\\=coc#on_enter()\" + +function! CheckBackspace() abort let col = col('.') - 1 return !col || getline('.')[col - 1] =~# '\s' endfunction @@ -36,11 +42,6 @@ else inoremap coc#refresh() endif -" Make auto-select the first completion item and notify coc.nvim to -" format on enter, could be remapped by other vim plugin -inoremap pumvisible() ? coc#_select_confirm() - \: "\u\\=coc#on_enter()\" - " Use `[g` and `]g` to navigate diagnostics " Use `:CocDiagnostics` to get all diagnostics of current buffer in location list. nmap [g (coc-diagnostic-prev) @@ -53,15 +54,13 @@ nmap gi (coc-implementation) nmap gr (coc-references) " Use K to show documentation in preview window. -nnoremap K :call show_documentation() +nnoremap K :call ShowDocumentation() -function! s:show_documentation() - if (index(['vim','help'], &filetype) >= 0) - execute 'h '.expand('') - elseif (coc#rpc#ready()) +function! ShowDocumentation() + if CocAction('hasProvider', 'hover') call CocActionAsync('doHover') else - execute '!' . &keywordprg . " " . expand('') + call feedkeys('K', 'in') endif endfunction @@ -93,6 +92,9 @@ nmap ac (coc-codeaction) " Apply AutoFix to problem on the current line. nmap qf (coc-fix-current) +" Run the Code Lens action on the current line. +nmap cl (coc-codelens-action) + " Map function and class text objects " NOTE: Requires 'textDocument.documentSymbol' support from the language server. xmap if (coc-funcobj-i) @@ -107,7 +109,7 @@ omap ac (coc-classobj-a) " Remap and for scroll float windows/popups. if has('nvim-0.4.0') || has('patch-8.2.0750') nnoremap coc#float#has_scroll() ? coc#float#scroll(1) : "\" - nnoremap coc#float#has_scroll() ? coc#float#scroll(0) : "\" + nnoremap coc#float#has_scroll() ? coc#float#scroll(0) : "\" inoremap coc#float#has_scroll() ? "\=coc#float#scroll(1)\" : "\" inoremap coc#float#has_scroll() ? "\=coc#float#scroll(0)\" : "\" vnoremap coc#float#has_scroll() ? coc#float#scroll(1) : "\" @@ -120,13 +122,13 @@ nmap (coc-range-select) xmap (coc-range-select) " Add `:Format` command to format current buffer. -command! -nargs=0 Format :call CocAction('format') +command! -nargs=0 Format :call CocActionAsync('format') " Add `:Fold` command to fold current buffer. command! -nargs=? Fold :call CocAction('fold', ) " Add `:OR` command for organize imports of the current buffer. -command! -nargs=0 OR :call CocAction('runCommand', 'editor.action.organizeImport') +command! -nargs=0 OR :call CocActionAsync('runCommand', 'editor.action.organizeImport') " Add (Neo)Vim's native statusline support. " NOTE: Please see `:h coc-status` for integrations with external plugins that @@ -149,4 +151,4 @@ nnoremap j :CocNext " Do default action for previous item. nnoremap k :CocPrev " Resume latest coc list. -nnoremap p :CocListResume +nnoremap p :CocListResume From 697f7d31aa70de1096dfe6480a17fd42c27acdc2 Mon Sep 17 00:00:00 2001 From: paul-loedige Date: Mon, 24 Oct 2022 01:11:50 +0900 Subject: [PATCH 03/13] updated zsh submodule --- zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting b/zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting index dffe304..122dc46 160000 --- a/zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting +++ b/zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting @@ -1 +1 @@ -Subproject commit dffe304567c86f06bf1be0fce200077504e79783 +Subproject commit 122dc464392302114556b53ec01a1390c54f739f From b5c929cbc8512e7a0e7ac29d97ba0303d6f8ef85 Mon Sep 17 00:00:00 2001 From: paul-loedige Date: Mon, 24 Oct 2022 01:12:22 +0900 Subject: [PATCH 04/13] removed commented code --- qtile/.config/qtile/Widgets.py | 1 - 1 file changed, 1 deletion(-) diff --git a/qtile/.config/qtile/Widgets.py b/qtile/.config/qtile/Widgets.py index 9782a75..187b4bc 100644 --- a/qtile/.config/qtile/Widgets.py +++ b/qtile/.config/qtile/Widgets.py @@ -41,7 +41,6 @@ def Left_widgets(size,fontsize,prompt=False): text='', foreground=light_foreground_color, fontsize=fontsize, - # margin=5, background=blue_color ), *powerline_arrow('r',blue_color,base_color,size), From 371281d552364c729a7d22ea0dad4101bcf7cea9 Mon Sep 17 00:00:00 2001 From: paul-loedige Date: Thu, 27 Oct 2022 13:55:03 +0900 Subject: [PATCH 05/13] added deepl as dropdown --- qtile/.config/qtile/Groups.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/qtile/.config/qtile/Groups.py b/qtile/.config/qtile/Groups.py index 7e89474..1fac445 100644 --- a/qtile/.config/qtile/Groups.py +++ b/qtile/.config/qtile/Groups.py @@ -12,7 +12,7 @@ group_names = [("","Home", 'h',{'layout': 'monadtall'}), ("","Documents", 'l',{'layout': 'monadtall'}), ("ﱘ","Music", 'u',{'layout': 'monadtall', 'matches' : [Match(wm_class="spotify")]}), ("","Video", 'v',{'layout': 'monadtall', 'matches' : [Match(wm_class="vlc")]}), - ("ﭮ","Discord", 'd',{'layout': 'monadtall', 'matches':[Match(wm_class="discord")]}), + ("ﭮ","VideoChat", 'z',{'layout': 'monadtall', 'matches':[Match(wm_class="discord")]}), ("","ClickUp", 'k',{'layout': 'monadtall', 'matches' : [Match(wm_class="clickup")]}), ("一","etc1", '1', {'layout': 'monadtall'}), ("二","etc2", '2', {'layout': 'monadtall'}), @@ -93,6 +93,15 @@ groups.append( on_focus_lost_hide=False, opacity=1 ), + DropDown( + 'Deepl', + 'surf deepl.com', + height = 0.5, + width = 0.8, + x = 0.1, + on_focus_lost_hide=False, + opacity=1 + ), DropDown( 'Telegram', 'telegram-desktop', @@ -138,4 +147,6 @@ keys.extend([ desc="open the dropdown for Telegram"), Key(['mod1','control'],'q',lazy.group['scratchpad'].dropdown_toggle('Qalculate!'), desc="open the dropdown for Qalculate!"), + Key(['mod1','control'],'d',lazy.group['scratchpad'].dropdown_toggle('Deepl'), + desc="open the dropdown for Deepl") ]) From 5534c48f50c54b0b8c549762b64ac94f43feea41 Mon Sep 17 00:00:00 2001 From: paul-loedige Date: Sat, 29 Oct 2022 01:18:38 +0900 Subject: [PATCH 06/13] added emacs config --- .gitmodules | 3 +++ emacs/.emacs.d | 1 + 2 files changed, 4 insertions(+) create mode 160000 emacs/.emacs.d diff --git a/.gitmodules b/.gitmodules index 1dea2a6..2a24da2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting"] path = zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting url = https://github.com/zsh-users/zsh-syntax-highlighting +[submodule "emacs/.emacs.d"] + path = emacs/.emacs.d + url = https://github.com/doomemacs/doomemacs diff --git a/emacs/.emacs.d b/emacs/.emacs.d new file mode 160000 index 0000000..ceb9856 --- /dev/null +++ b/emacs/.emacs.d @@ -0,0 +1 @@ +Subproject commit ceb985673ccd2be869bdde2ea4f41c84e9354f1e From 5a7f2d02ad8ab6ff484c0a85160a2a37603aff93 Mon Sep 17 00:00:00 2001 From: paul-loedige Date: Sat, 29 Oct 2022 14:44:57 +0900 Subject: [PATCH 07/13] completed doom emacs installation --- emacs/.emacs.d | 2 +- zsh/.zshrc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/emacs/.emacs.d b/emacs/.emacs.d index ceb9856..5b2ea8c 160000 --- a/emacs/.emacs.d +++ b/emacs/.emacs.d @@ -1 +1 @@ -Subproject commit ceb985673ccd2be869bdde2ea4f41c84e9354f1e +Subproject commit 5b2ea8c32f8a4358ed492beb50f2e257f38c9672 diff --git a/zsh/.zshrc b/zsh/.zshrc index 8e501eb..076353a 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -69,6 +69,7 @@ source $ZSH/oh-my-zsh.sh # additional path variables export PATH=$PATH:~/.local/bin +export PATH=$PATH:~/.emacs.d/bin ### ALIAS' ### #jokes From 96562d88efb4dedc3690e362bcc71f4337b616d7 Mon Sep 17 00:00:00 2001 From: paul-loedige Date: Sat, 29 Oct 2022 15:06:35 +0900 Subject: [PATCH 08/13] moved doom emacs config to this repo --- emacs/.doom.d/config.el | 76 +++++++++++++++ emacs/.doom.d/init.el | 194 ++++++++++++++++++++++++++++++++++++++ emacs/.doom.d/packages.el | 50 ++++++++++ 3 files changed, 320 insertions(+) create mode 100644 emacs/.doom.d/config.el create mode 100644 emacs/.doom.d/init.el create mode 100644 emacs/.doom.d/packages.el diff --git a/emacs/.doom.d/config.el b/emacs/.doom.d/config.el new file mode 100644 index 0000000..855186b --- /dev/null +++ b/emacs/.doom.d/config.el @@ -0,0 +1,76 @@ +;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- + +;; Place your private configuration here! Remember, you do not need to run 'doom +;; sync' after modifying this file! + + +;; Some functionality uses this to identify you, e.g. GPG configuration, email +;; clients, file templates and snippets. It is optional. +(setq user-full-name "John Doe" + user-mail-address "john@doe.com") + +;; Doom exposes five (optional) variables for controlling fonts in Doom: +;; +;; - `doom-font' -- the primary font to use +;; - `doom-variable-pitch-font' -- a non-monospace font (where applicable) +;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for +;; presentations or streaming. +;; - `doom-unicode-font' -- for unicode glyphs +;; - `doom-serif-font' -- for the `fixed-pitch-serif' face +;; +;; See 'C-h v doom-font' for documentation and more examples of what they +;; accept. For example: +;; +;;(setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'semi-light) +;; doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13)) +;; +;; If you or Emacs can't find your font, use 'M-x describe-font' to look them +;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to +;; refresh your font settings. If Emacs still can't find your font, it likely +;; wasn't installed correctly. Font issues are rarely Doom issues! + +;; There are two ways to load a theme. Both assume the theme is installed and +;; available. You can either set `doom-theme' or manually load a theme with the +;; `load-theme' function. This is the default: +(setq doom-theme 'doom-one) + +;; This determines the style of line numbers in effect. If set to `nil', line +;; numbers are disabled. For relative line numbers, set this to `relative'. +(setq display-line-numbers-type t) + +;; If you use `org' and don't want your org files in the default location below, +;; change `org-directory'. It must be set before org loads! +(setq org-directory "~/org/") + + +;; Whenever you reconfigure a package, make sure to wrap your config in an +;; `after!' block, otherwise Doom's defaults may override your settings. E.g. +;; +;; (after! PACKAGE +;; (setq x y)) +;; +;; The exceptions to this rule: +;; +;; - Setting file/directory variables (like `org-directory') +;; - Setting variables which explicitly tell you to set them before their +;; package is loaded (see 'C-h v VARIABLE' to look up their documentation). +;; - Setting doom variables (which start with 'doom-' or '+'). +;; +;; Here are some additional functions/macros that will help you configure Doom. +;; +;; - `load!' for loading external *.el files relative to this one +;; - `use-package!' for configuring packages +;; - `after!' for running code after a package has loaded +;; - `add-load-path!' for adding directories to the `load-path', relative to +;; this file. Emacs searches the `load-path' when you load packages with +;; `require' or `use-package'. +;; - `map!' for binding new keys +;; +;; To get information about any of these functions/macros, move the cursor over +;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k'). +;; This will open documentation for it, including demos of how they are used. +;; Alternatively, use `C-h o' to look up a symbol (functions, variables, faces, +;; etc). +;; +;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how +;; they are implemented. diff --git a/emacs/.doom.d/init.el b/emacs/.doom.d/init.el new file mode 100644 index 0000000..bff0c70 --- /dev/null +++ b/emacs/.doom.d/init.el @@ -0,0 +1,194 @@ +;;; init.el -*- lexical-binding: t; -*- + +;; This file controls what Doom modules are enabled and what order they load +;; in. Remember to run 'doom sync' after modifying it! + +;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's +;; documentation. There you'll find a link to Doom's Module Index where all +;; of our modules are listed, including what flags they support. + +;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or +;; 'C-c c k' for non-vim users) to view its documentation. This works on +;; flags as well (those symbols that start with a plus). +;; +;; Alternatively, press 'gd' (or 'C-c c d') on a module to browse its +;; directory (for easy access to its source code). + +(doom! :input + ;;bidi ; (tfel ot) thgir etirw uoy gnipleh + ;;chinese + ;;japanese + ;;layout ; auie,ctsrnm is the superior home row + + :completion + company ; the ultimate code completion backend + ;;helm ; the *other* search engine for love and life + ;;ido ; the other *other* search engine... + ;;ivy ; a search engine for love and life + vertico ; the search engine of the future + + :ui + ;;deft ; notational velocity for Emacs + doom ; what makes DOOM look the way it does + doom-dashboard ; a nifty splash screen for Emacs + ;;doom-quit ; DOOM quit-message prompts when you quit Emacs + ;;(emoji +unicode) ; 🙂 + hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW + ;;hydra + ;;indent-guides ; highlighted indent columns + ;;ligatures ; ligatures and symbols to make your code pretty again + ;;minimap ; show a map of the code on the side + modeline ; snazzy, Atom-inspired modeline, plus API + ;;nav-flash ; blink cursor line after big motions + ;;neotree ; a project drawer, like NERDTree for vim + ophints ; highlight the region an operation acts on + (popup +defaults) ; tame sudden yet inevitable temporary windows + ;;tabs ; a tab bar for Emacs + ;;treemacs ; a project drawer, like neotree but cooler + ;;unicode ; extended unicode support for various languages + (vc-gutter +pretty) ; vcs diff in the fringe + vi-tilde-fringe ; fringe tildes to mark beyond EOB + ;;window-select ; visually switch windows + workspaces ; tab emulation, persistence & separate workspaces + ;;zen ; distraction-free coding or writing + + :editor + (evil +everywhere); come to the dark side, we have cookies + file-templates ; auto-snippets for empty files + fold ; (nigh) universal code folding + ;;(format +onsave) ; automated prettiness + ;;god ; run Emacs commands without modifier keys + ;;lispy ; vim for lisp, for people who don't like vim + ;;multiple-cursors ; editing in many places at once + ;;objed ; text object editing for the innocent + ;;parinfer ; turn lisp into python, sort of + ;;rotate-text ; cycle region at point between text candidates + snippets ; my elves. They type so I don't have to + ;;word-wrap ; soft wrapping with language-aware indent + + :emacs + dired ; making dired pretty [functional] + electric ; smarter, keyword-based electric-indent + ;;ibuffer ; interactive buffer management + undo ; persistent, smarter undo for your inevitable mistakes + vc ; version-control and Emacs, sitting in a tree + + :term + ;;eshell ; the elisp shell that works everywhere + ;;shell ; simple shell REPL for Emacs + ;;term ; basic terminal emulator for Emacs + ;;vterm ; the best terminal emulation in Emacs + + :checkers + syntax ; tasing you for every semicolon you forget + ;;(spell +flyspell) ; tasing you for misspelling mispelling + ;;grammar ; tasing grammar mistake every you make + + :tools + ;;ansible + ;;biblio ; Writes a PhD for you (citation needed) + ;;debugger ; FIXME stepping through code, to help you add bugs + ;;direnv + ;;docker + ;;editorconfig ; let someone else argue about tabs vs spaces + ;;ein ; tame Jupyter notebooks with emacs + (eval +overlay) ; run code, run (also, repls) + ;;gist ; interacting with github gists + lookup ; navigate your code and its documentation + ;;lsp ; M-x vscode + magit ; a git porcelain for Emacs + ;;make ; run make tasks from Emacs + ;;pass ; password manager for nerds + ;;pdf ; pdf enhancements + ;;prodigy ; FIXME managing external services & code builders + ;;rgb ; creating color strings + ;;taskrunner ; taskrunner for all your projects + ;;terraform ; infrastructure as code + ;;tmux ; an API for interacting with tmux + ;;tree-sitter ; syntax and parsing, sitting in a tree... + ;;upload ; map local to remote projects via ssh/ftp + + :os + (:if IS-MAC macos) ; improve compatibility with macOS + ;;tty ; improve the terminal Emacs experience + + :lang + ;;agda ; types of types of types of types... + ;;beancount ; mind the GAAP + ;;(cc +lsp) ; C > C++ == 1 + ;;clojure ; java with a lisp + ;;common-lisp ; if you've seen one lisp, you've seen them all + ;;coq ; proofs-as-programs + ;;crystal ; ruby at the speed of c + ;;csharp ; unity, .NET, and mono shenanigans + ;;data ; config/data formats + ;;(dart +flutter) ; paint ui and not much else + ;;dhall + ;;elixir ; erlang done right + ;;elm ; care for a cup of TEA? + emacs-lisp ; drown in parentheses + ;;erlang ; an elegant language for a more civilized age + ;;ess ; emacs speaks statistics + ;;factor + ;;faust ; dsp, but you get to keep your soul + ;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER) + ;;fsharp ; ML stands for Microsoft's Language + ;;fstar ; (dependent) types and (monadic) effects and Z3 + ;;gdscript ; the language you waited for + ;;(go +lsp) ; the hipster dialect + ;;(graphql +lsp) ; Give queries a REST + ;;(haskell +lsp) ; a language that's lazier than I am + ;;hy ; readability of scheme w/ speed of python + ;;idris ; a language you can depend on + ;;json ; At least it ain't XML + ;;(java +lsp) ; the poster child for carpal tunnel syndrome + ;;javascript ; all(hope(abandon(ye(who(enter(here)))))) + ;;julia ; a better, faster MATLAB + ;;kotlin ; a better, slicker Java(Script) + ;;latex ; writing papers in Emacs has never been so fun + ;;lean ; for folks with too much to prove + ;;ledger ; be audit you can be + ;;lua ; one-based indices? one-based indices + markdown ; writing docs for people to ignore + ;;nim ; python + lisp at the speed of c + ;;nix ; I hereby declare "nix geht mehr!" + ;;ocaml ; an objective camel + org ; organize your plain life in plain text + ;;php ; perl's insecure younger brother + ;;plantuml ; diagrams for confusing people more + ;;purescript ; javascript, but functional + ;;python ; beautiful is better than ugly + ;;qt ; the 'cutest' gui framework ever + ;;racket ; a DSL for DSLs + ;;raku ; the artist formerly known as perl6 + ;;rest ; Emacs as a REST client + ;;rst ; ReST in peace + ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} + ;;(rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + ;;scala ; java, but good + ;;(scheme +guile) ; a fully conniving family of lisps + sh ; she sells {ba,z,fi}sh shells on the C xor + ;;sml + ;;solidity ; do you need a blockchain? No. + ;;swift ; who asked for emoji variables? + ;;terra ; Earth and Moon in alignment for performance. + ;;web ; the tubes + ;;yaml ; JSON, but readable + ;;zig ; C, but simpler + + :email + ;;(mu4e +org +gmail) + ;;notmuch + ;;(wanderlust +gmail) + + :app + ;;calendar + ;;emms + ;;everywhere ; *leave* Emacs!? You must be joking + ;;irc ; how neckbeards socialize + ;;(rss +org) ; emacs as an RSS reader + ;;twitter ; twitter client https://twitter.com/vnought + + :config + ;;literate + (default +bindings +smartparens)) diff --git a/emacs/.doom.d/packages.el b/emacs/.doom.d/packages.el new file mode 100644 index 0000000..839b83c --- /dev/null +++ b/emacs/.doom.d/packages.el @@ -0,0 +1,50 @@ +;; -*- no-byte-compile: t; -*- +;;; $DOOMDIR/packages.el + +;; To install a package with Doom you must declare them here and run 'doom sync' +;; on the command line, then restart Emacs for the changes to take effect -- or +;; use 'M-x doom/reload'. + + +;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: +;(package! some-package) + +;; To install a package directly from a remote git repo, you must specify a +;; `:recipe'. You'll find documentation on what `:recipe' accepts here: +;; https://github.com/radian-software/straight.el#the-recipe-format +;(package! another-package +; :recipe (:host github :repo "username/repo")) + +;; If the package you are trying to install does not contain a PACKAGENAME.el +;; file, or is located in a subdirectory of the repo, you'll need to specify +;; `:files' in the `:recipe': +;(package! this-package +; :recipe (:host github :repo "username/repo" +; :files ("some-file.el" "src/lisp/*.el"))) + +;; If you'd like to disable a package included with Doom, you can do so here +;; with the `:disable' property: +;(package! builtin-package :disable t) + +;; You can override the recipe of a built in package without having to specify +;; all the properties for `:recipe'. These will inherit the rest of its recipe +;; from Doom or MELPA/ELPA/Emacsmirror: +;(package! builtin-package :recipe (:nonrecursive t)) +;(package! builtin-package-2 :recipe (:repo "myfork/package")) + +;; Specify a `:branch' to install a package from a particular branch or tag. +;; This is required for some packages whose default branch isn't 'master' (which +;; our package manager can't deal with; see radian-software/straight.el#279) +;(package! builtin-package :recipe (:branch "develop")) + +;; Use `:pin' to specify a particular commit to install. +;(package! builtin-package :pin "1a2b3c4d5e") + + +;; Doom's packages are pinned to a specific commit and updated from release to +;; release. The `unpin!' macro allows you to unpin single packages... +;(unpin! pinned-package) +;; ...or multiple packages +;(unpin! pinned-package another-pinned-package) +;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) +;(unpin! t) From 7288e9d3cf8ad847549fb571d67b74fab0b0b303 Mon Sep 17 00:00:00 2001 From: paul-loedige Date: Mon, 14 Nov 2022 10:04:01 +0900 Subject: [PATCH 09/13] added Doom Emacs to quicklaunch --- qtile/.config/qtile/Keys.py | 1 + qtile/.config/qtile/autostart.sh | 3 ++- zsh/.zshrc | 3 --- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/qtile/.config/qtile/Keys.py b/qtile/.config/qtile/Keys.py index 18d04ac..92eb8b4 100644 --- a/qtile/.config/qtile/Keys.py +++ b/qtile/.config/qtile/Keys.py @@ -38,6 +38,7 @@ keys = [ Key([mod],"f", lazy.spawn("firefox"),desc="Launch firefox"), Key([mod],"e", lazy.spawn("pcmanfm"),desc="Launch pcmanfm"), Key([mod],"c", lazy.spawn("code"),desc="Launch visual studio code"), + Key([mod],"d", lazy.spawn("emacsclient -c -a 'emacs'"),desc="Launch Doom Emacs"), Key([mod],"v", lazy.spawn(term + " -e nvim"),desc="Launch NeoVim"), Key([mod, "shift"],"s", lazy.spawn('gscreenshot -s -o -f /tmp/screenshots'),desc="take a screenshot"), diff --git a/qtile/.config/qtile/autostart.sh b/qtile/.config/qtile/autostart.sh index fd801da..5d9ec23 100755 --- a/qtile/.config/qtile/autostart.sh +++ b/qtile/.config/qtile/autostart.sh @@ -18,4 +18,5 @@ nm-applet & blueman-applet & thunderbird & clickup & -fcitx -d& \ No newline at end of file +fcitx5 -d& +emacs --daemon & \ No newline at end of file diff --git a/zsh/.zshrc b/zsh/.zshrc index 076353a..17b917d 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -140,9 +140,6 @@ alias ftemplate='git fetch template' alias mtemplate='git merge template/master --allow-unrelated-histories' alias log='git log' -# docker -alias docker='sudo docker' # use normal docker command but keep sudo requirement - ### AUTOSTART ### #neofetch From 810f81be66bf35aeca8853c6b4ab442919eacf60 Mon Sep 17 00:00:00 2001 From: paul-loedige Date: Tue, 10 Jan 2023 09:43:51 +0900 Subject: [PATCH 10/13] fixed depreciated --- qtile/.config/qtile/Screens.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtile/.config/qtile/Screens.py b/qtile/.config/qtile/Screens.py index 5fd0107..c422869 100644 --- a/qtile/.config/qtile/Screens.py +++ b/qtile/.config/qtile/Screens.py @@ -19,7 +19,7 @@ cmd = ['xrandr'] p = subprocess.Popen(cmd, stdout=subprocess.PIPE) resolution_string, junk = p.communicate() p.stdout.close() -screen_resolutions = [np.array(screen_res.split('x')).astype(np.int) for screen_res in re.findall('[0-9]+x[0-9]+(?=[^\\\\n]*\*)',str(resolution_string))] +screen_resolutions = [np.array(screen_res.split('x')).astype(int) for screen_res in re.findall('[0-9]+x[0-9]+(?=[^\\\\n]*\*)',str(resolution_string))] number_of_screens = len(screen_resolutions) max_width = max(screen_resolutions, key=lambda res: res[0])[0] defined_main_window = False From e6df7505f6a6e6b0257ae6f69e827a9c245c80a0 Mon Sep 17 00:00:00 2001 From: paul-loedige Date: Fri, 3 Feb 2023 10:33:09 +0900 Subject: [PATCH 11/13] added german language spellcheck as default --- neovim/.config/nvim/ftplugin/tex.vim | 2 -- neovim/.config/nvim/init.vim | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/neovim/.config/nvim/ftplugin/tex.vim b/neovim/.config/nvim/ftplugin/tex.vim index 8ca12dd..1b4f901 100644 --- a/neovim/.config/nvim/ftplugin/tex.vim +++ b/neovim/.config/nvim/ftplugin/tex.vim @@ -1,5 +1,3 @@ -" set german as default -setlocal spelllang=de " folding setlocal foldmethod=expr setlocal foldexpr=vimtex#fold#level(v:lnum) diff --git a/neovim/.config/nvim/init.vim b/neovim/.config/nvim/init.vim index 16b5646..c2ee86c 100644 --- a/neovim/.config/nvim/init.vim +++ b/neovim/.config/nvim/init.vim @@ -54,6 +54,7 @@ let mapleader=" " " set mapleader to space let maplocalleader=" " " set localleader to space set timeoutlen=1000 " set timeout length set spell " activate spell-checking +setlocal spelllang=de,en_us " enable German and English spell checking set nocompatible " disable compatibility to old-time vi let g:indentLine_setConceal = 0 " disable the conceal 'feature' of indentLine plugin set showmatch " show matching brackets. From a318f7624d7fab8b43fd9bc6e183000a6de81c58 Mon Sep 17 00:00:00 2001 From: paul-loedige Date: Tue, 18 Apr 2023 22:46:18 +0200 Subject: [PATCH 12/13] fixed broken git repo --- .gitmodules | 6 - Anaconda/.condarc | 1 + emacs/.doom.d/init.el | 26 +- emacs/.emacs.d | 1 - firefox/TST-config.css | 27 ++ firefox/treestyletab.css | 101 +++++++ git/.gitconfig | 2 + pip-modules.txt.bak | 153 ++++++++++ pkglist.txt | 214 +------------- pkglist.txt.bak | 277 ++++++++++++++++++ qtile/.config/qtile/Groups.py | 5 +- qtile/.config/qtile/Keys.py | 9 +- qtile/.config/qtile/autostart.sh | 6 +- screen-layout/.screenlayout/layout.sh | 2 +- .../custom/plugins/zsh-autosuggestions | 1 - .../custom/plugins/zsh-syntax-highlighting | 1 - zsh/.zshrc | 13 +- 17 files changed, 604 insertions(+), 241 deletions(-) create mode 100644 Anaconda/.condarc delete mode 160000 emacs/.emacs.d create mode 100644 firefox/TST-config.css create mode 100644 firefox/treestyletab.css create mode 100644 pip-modules.txt.bak create mode 100644 pkglist.txt.bak delete mode 160000 zsh/.oh-my-zsh/custom/plugins/zsh-autosuggestions delete mode 160000 zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting diff --git a/.gitmodules b/.gitmodules index 2a24da2..7bf8e47 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,3 @@ -[submodule "zsh/.oh-my-zsh/custom/plugins/zsh-autosuggestions"] - path = zsh/.oh-my-zsh/custom/plugins/zsh-autosuggestions - url = https://github.com/zsh-users/zsh-autosuggestions -[submodule "zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting"] - path = zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting - url = https://github.com/zsh-users/zsh-syntax-highlighting [submodule "emacs/.emacs.d"] path = emacs/.emacs.d url = https://github.com/doomemacs/doomemacs diff --git a/Anaconda/.condarc b/Anaconda/.condarc new file mode 100644 index 0000000..64329fa --- /dev/null +++ b/Anaconda/.condarc @@ -0,0 +1 @@ +auto_activate_base: false \ No newline at end of file diff --git a/emacs/.doom.d/init.el b/emacs/.doom.d/init.el index bff0c70..29ab98e 100644 --- a/emacs/.doom.d/init.el +++ b/emacs/.doom.d/init.el @@ -39,8 +39,8 @@ ;;ligatures ; ligatures and symbols to make your code pretty again ;;minimap ; show a map of the code on the side modeline ; snazzy, Atom-inspired modeline, plus API - ;;nav-flash ; blink cursor line after big motions - ;;neotree ; a project drawer, like NERDTree for vim + nav-flash ; blink cursor line after big motions + neotree ; a project drawer, like NERDTree for vim ophints ; highlight the region an operation acts on (popup +defaults) ; tame sudden yet inevitable temporary windows ;;tabs ; a tab bar for Emacs @@ -74,15 +74,15 @@ vc ; version-control and Emacs, sitting in a tree :term - ;;eshell ; the elisp shell that works everywhere + eshell ; the elisp shell that works everywhere ;;shell ; simple shell REPL for Emacs ;;term ; basic terminal emulator for Emacs - ;;vterm ; the best terminal emulation in Emacs + vterm ; the best terminal emulation in Emacs :checkers syntax ; tasing you for every semicolon you forget - ;;(spell +flyspell) ; tasing you for misspelling mispelling - ;;grammar ; tasing grammar mistake every you make + (spell +flyspell) ; tasing you for misspelling mispelling + grammar ; tasing grammar mistake every you make :tools ;;ansible @@ -95,7 +95,7 @@ (eval +overlay) ; run code, run (also, repls) ;;gist ; interacting with github gists lookup ; navigate your code and its documentation - ;;lsp ; M-x vscode + lsp ; M-x vscode magit ; a git porcelain for Emacs ;;make ; run make tasks from Emacs ;;pass ; password manager for nerds @@ -115,7 +115,7 @@ :lang ;;agda ; types of types of types of types... ;;beancount ; mind the GAAP - ;;(cc +lsp) ; C > C++ == 1 + (cc +lsp) ; C > C++ == 1 ;;clojure ; java with a lisp ;;common-lisp ; if you've seen one lisp, you've seen them all ;;coq ; proofs-as-programs @@ -145,7 +145,7 @@ ;;javascript ; all(hope(abandon(ye(who(enter(here)))))) ;;julia ; a better, faster MATLAB ;;kotlin ; a better, slicker Java(Script) - ;;latex ; writing papers in Emacs has never been so fun + (latex +latexmk +lsp +fold) ; writing papers in Emacs has never been so fun ;;lean ; for folks with too much to prove ;;ledger ; be audit you can be ;;lua ; one-based indices? one-based indices @@ -157,7 +157,7 @@ ;;php ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more ;;purescript ; javascript, but functional - ;;python ; beautiful is better than ugly + python ; beautiful is better than ugly ;;qt ; the 'cutest' gui framework ever ;;racket ; a DSL for DSLs ;;raku ; the artist formerly known as perl6 @@ -172,12 +172,12 @@ ;;solidity ; do you need a blockchain? No. ;;swift ; who asked for emoji variables? ;;terra ; Earth and Moon in alignment for performance. - ;;web ; the tubes - ;;yaml ; JSON, but readable + web ; the tubes + yaml ; JSON, but readable ;;zig ; C, but simpler :email - ;;(mu4e +org +gmail) + (mu4e +org +gmail) ;;notmuch ;;(wanderlust +gmail) diff --git a/emacs/.emacs.d b/emacs/.emacs.d deleted file mode 160000 index 5b2ea8c..0000000 --- a/emacs/.emacs.d +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5b2ea8c32f8a4358ed492beb50f2e257f38c9672 diff --git a/firefox/TST-config.css b/firefox/TST-config.css new file mode 100644 index 0000000..c2d9f1d --- /dev/null +++ b/firefox/TST-config.css @@ -0,0 +1,27 @@ +/* Hide border on tab bar, force its state to 'scroll', adjust margin-left for width of scrollbar. */ +#tabbar { border: 0; overflow-y: scroll !important; scrollbar-width: auto; } + +/* Hide .twisty and adjust margins so favicons have 7px on left. */ +tab-item .twisty { + visibility: hidden; + margin-left: -12px; +} + +/* Push tab labels slightly to the right so they're completely hidden in collapsed state */ +tab-item .label { + margin-left: 7px; +} + +/* Hide close buttons on tabs. */ +tab-item .closebox { + visibility: collapse; +} + +tab-item:hover .closebox { + visibility: initial; +} + +/* Hide sound playing/muted button. */ +.sound-button::before { + display: none !important; +} diff --git a/firefox/treestyletab.css b/firefox/treestyletab.css new file mode 100644 index 0000000..e08bf88 --- /dev/null +++ b/firefox/treestyletab.css @@ -0,0 +1,101 @@ +/* Hide .twisty and adjust margins so favicons have 7px on left. */ +.tab .twisty { + visibility: hidden; + margin-left: -12px; +} + +/* Push tab labels slightly to the right so they're completely hidden in collapsed state */ +.tab .label { + margin-left: 7px; +} + +/* Hide close buttons on tabs. */ +.tab .closebox { + visibility: collapse; +} + +/* Hide sound playing/muted button. */ +.sound-button::before { + display: none !important; +} + +/* Hide 'new tab' button. */ +.newtab-button { + display: none; +} + +/* ################################################ */ +/* ##### COLOR THEME ############################## */ +/* ################################################ */ +@keyframes spin { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(360deg); + } +} +@keyframes pulse { + 0% { + width: 0px; + height: 0px; + opacity: 1; + } + 100% { + width: 350px; + height: 350px; + opacity: 0; + top: calc(50% - 175px); + left: calc(50% - 175px); + } +} +:root { + background-color: #383838; +} +#tabbar { + border-right: 1px solid #1d1d1d; + box-shadow: none !important; +} +.tab { + background-color: transparent; + border-color: #292929; + color: rgba(207,207,207,0.75); + box-shadow: none !important; +} +.tab:hover { + background-color: #404040 !important; + color: rgba(207,207,207,1) !important; +} +.tab.discarded { + background-color: #1d1d1d; + color: #383838 !important; +} +.tab.discarded:hover { + background-color: #292929 !important; +} + +.tab.active { + background-color: #8fa876; +} +.tab.active:hover { + background-color: #8fa876 !important; +} + + +/* Adjust style for tab that has sound playing. */ +.tab.sound-playing .favicon::after { + content: ''; + position: absolute; + top: 50%; + left: 50%; + border-radius: 50%; + background: #FFFFFF; + animation: pulse 2s ease-out 0s infinite; + z-index: -1; + opacity: 0; +} + +/* Adjust style for tab that is muted. */ +.tab.muted { + opacity: 0.5; +} \ No newline at end of file diff --git a/git/.gitconfig b/git/.gitconfig index f90e4d8..b670324 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -5,3 +5,5 @@ helper = store [http] sslVerify = true +[init] + defaultBranch = main diff --git a/pip-modules.txt.bak b/pip-modules.txt.bak new file mode 100644 index 0000000..e53f75f --- /dev/null +++ b/pip-modules.txt.bak @@ -0,0 +1,153 @@ +alabaster==0.7.12 +apipkg==1.5 +appdirs==1.4.4 +arandr==0.1.10 +argh==0.26.2 +astroid==2.6.2 +attrs==21.2.0 +Babel==2.9.1 +backcall==0.2.0 +borgbackup==1.1.17 +bsddb3==6.2.9 +btrfsutil==5.14.2 +CacheControl==0.12.6 +cairocffi==1.2.0 +certifi==2021.5.30 +cffi==1.14.6 +chardet==4.0.0 +charset-normalizer==2.0.3 +colorama==0.4.4 +contextlib2==21.6.0 +cryptography==35.0.0 +cupshelpers==1.0 +cycler==0.10.0 +debugpy==1.3.0 +decorator==5.0.9 +distlib==0.3.3 +distro==1.6.0 +dnspython==2.1.0 +docopt==0.6.2 +docutils==0.17.1 +entrypoints==0.3 +evdev==1.4.0 +GDAL==3.3.1 +gramps==5.1.4 +greenlet==1.1.2 +gscreenshot==2.16.1 +html5lib==1.1 +idna==3.2 +imagesize==1.2.0 +importlib-metadata==4.6.1 +iniconfig==1.1.1 +ipykernel==6.0.2 +ipython==7.25.0 +ipython-genutils==0.2.0 +isort==5.9.2 +jedi==0.18.0 +jeepney==0.7.1 +Jinja2==3.0.1 +jupyter-client==6.2.0 +jupyter-core==4.7.1 +keyring==23.0.1 +keyutils==0.6 +kiwisolver==1.3.2 +lazy-object-proxy==1.6.0 +lensfun==0.3.95 +lightdm-gtk-greeter-settings==1.2.2 +louis==3.19.0 +lutris==0.5.9.1 +lxml==4.6.3 +Markdown==3.3.4 +MarkupSafe==2.0.1 +matplotlib==3.4.2 +matplotlib-inline==0.1.2 +mccabe==0.6.1 +meld==3.20.4 +more-itertools==8.8.0 +msgpack==1.0.2 +neovim-remote==2.4.0 +nest-asyncio==1.5.1 +nordnm==0.8.1 +numpy==1.21.1 +ordered-set==4.0.2 +OWSLib==0.24.1 +packaging==21.0 +parso==0.8.2 +pathtools==0.1.2 +pep517==0.11.0 +pexpect==4.8.0 +pickleshare==0.7.5 +pikaur==1.8 +Pillow==8.3.1 +Pivy==0.6.6 +pluggy==0.13.1 +ply==3.11 +pockets==0.9.1 +powerline-shell==0.7.0 +progress==1.6 +prompt-toolkit==3.0.19 +psutil==5.8.0 +psycopg2==2.9.1 +ptyprocess==0.7.0 +pwquality==1.4.4 +py==1.10.0 +pyalpm==0.10.6 +pycairo==1.20.1 +pycparser==2.20 +pycups==2.0.1 +pycurl==7.44.1 +Pygments==2.9.0 +PyGObject==3.40.1 +pylint==2.9.3 +pympress==1.6.1 +pynvim==0.4.3 +pyOpenSSL==20.0.1 +pyparsing==2.4.7 +pyproj==3.1.0 +PyQt5==5.15.5 +PyQt5-sip==12.9.0 +pyserial==3.5 +PySide2==5.15.2 +pytest==6.2.5 +python-dateutil==2.8.2 +python-magic==0.4.24 +python-vlc==3.0.12118 +pytz==2021.1 +PyYAML==5.4.1 +pyzmq==22.1.0 +QScintilla==2.13.1 +qtile==0.18.0 +requests==2.26.0 +resolvelib==0.7.1 +retrying==1.3.3 +scipy==1.7.1 +SecretStorage==3.3.1 +Shapely==1.7.1 +shiboken2==5.15.2 +sip==6.1.1 +six==1.16.0 +snowballstemmer==2.1.0 +Sphinx==4.1.1 +sphinxcontrib-applehelp==1.0.2 +sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-htmlhelp==2.0.0 +sphinxcontrib-jsmath==1.0.1 +sphinxcontrib-napoleon==0.7 +sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-serializinghtml==1.1.5 +team==1.0 +toml==0.10.2 +tomli==1.0.4 +tornado==6.1 +traitlets==5.0.5 +trimesh==3.9.23 +udiskie==2.3.3 +urllib3==1.26.7 +watchdog==0.10.7 +wcwidth==0.2.5 +webencodings==0.5.1 +wrapt==1.12.1 +wxPython==4.1.1 +xcffib==0.11.1 +youtube-dl==2021.6.6 +zipp==3.6.0 diff --git a/pkglist.txt b/pkglist.txt index 9c6638c..6018291 100644 --- a/pkglist.txt +++ b/pkglist.txt @@ -1,287 +1,85 @@ -aic94xx-firmware alacritty alsa-tools alsa-utils -amd-ucode -android-studio -android-tools arandr -arduino -arduino-avr-core -arduino-cli -arduino-docs -arm-none-eabi-binutils -arm-none-eabi-gcc -arm-none-eabi-gdb -arm-none-eabi-newlib -autoconf -autocutsel -automake -barrier -base bdf-unifont biber -binutils -bison -bitwarden-rofi -borg -capitaine-cursors -cdrtools -cmatrix cronie cups -cura -davfs2 discord -dnsmasq -dosfstools downgrade -drawio-desktop dunst -efibootmgr -eog evince -exa -exfat-utils -fakeroot -ffmpegthumbnailer firefox -flatpak -flex -freecad -gcc gimp git -gitg -gnome-disk-utility -gnome-keyring -goocanvas -gramps -grub gruvbox-dark-icons-gtk gscreenshot gtk-theme-arc-gruvbox-git -gutenprint -gvfs -gvfs-smb htop inkscape -jack2 -jre-openjdk -jre8-openjdk -kdeconnect -kdenlive -kicad -kicad-library -kicad-library-3d -lib32-giflib -lib32-gnutls -lib32-gst-plugins-base-libs -lib32-gtk3 -lib32-libpulse -lib32-libva -lib32-libxcomposite -lib32-libxinerama -lib32-libxslt -lib32-mpg123 -lib32-nvidia-utils -lib32-ocl-icd -lib32-openal -lib32-v4l-utils -libgnome-keyring -libnotify libreoffice-still libreoffice-still-de -lightdm -lightdm-gtk-greeter -lightdm-gtk-greeter-settings -linux -linux-firmware -linux-lts -linux-zen -lshw -lutris -lxappearance -lxsession -m4 -make meld -minecraft-launcher -mlocate -moc -mtools ncdu neofetch neovim -nerd-fonts-complete +nerd-fonts-complete-starship network-manager-applet networkmanager nextcloud-client nitrogen nmap -nordnm -npm ntfs-3g numlockx -nvidia -obs-studio -openmotif -openocd -openvpn -os-prober -osm-gps-map -p3x-onenote -p7zip -pamixer papirus-icon-theme -paprefs -patch -pavucontrol pcmanfm-gtk3 pdftk picom-jonaburg-git pikaur -pkgconf -playerctl -playonlinux pulseaudio +pamixer pulseaudio-alsa pulseaudio-ctl python-pip python-psutil python-pympress python-pynvim -python-pytest python-subprocess2 qalculate-gtk -qgis -qt5-styleplugins qtile -rapidsvn redshift -redshiftgui-bin rofi -rofi-calc -rpi-imager shotwell signal-desktop -skypeforlinux-stable-bin +rpi-imager slack-desktop -smbclient -spacenavd spotify -sshpass -steam -stlink stow -subversion sudo surf -system-config-printer -teams-for-linux teamviewer telegram-desktop -texinfo -texlive-bibtexextra -texlive-core -texlive-fontsextra -texlive-formatsextra -texlive-games -texlive-humanities -texlive-latexextra -texlive-music -texlive-pictures -texlive-pstricks -texlive-publishers -texlive-science -texlive-tikz-uml +texlive-most thunderbird timeshift tor-browser -transmission-gtk -tree -ttf-dseg ttf-liberation ttf-ubuntu-font-family udiskie udisks2 unzip -vi -vifm virtualbox virtualbox-host-modules-arch -visual-studio-code-bin +code vlc vlc-pause-click-plugin -wd719x-firmware -wget whatsapp-for-linux -which -wine-gecko -wine-mono -wine-staging -winetricks +wget wireguard-tools -woeusb-gui xarchiver -xcb-util-cursor -xclip -xdotool -xorg-bdftopcf -xorg-docs -xorg-font-util -xorg-fonts-100dpi -xorg-fonts-75dpi -xorg-fonts-encodings -xorg-iceauth -xorg-mkfontscale -xorg-server -xorg-server-common -xorg-server-devel -xorg-server-xephyr -xorg-server-xnest -xorg-server-xvfb -xorg-sessreg -xorg-setxkbmap -xorg-smproxy -xorg-x11perf -xorg-xauth -xorg-xbacklight -xorg-xcalc -xorg-xclock -xorg-xcmsdb -xorg-xcursorgen -xorg-xdpyinfo -xorg-xdriinfo -xorg-xev -xorg-xeyes -xorg-xgamma -xorg-xhost -xorg-xinit -xorg-xinput -xorg-xkbcomp -xorg-xkbevd -xorg-xkbutils -xorg-xkill -xorg-xlsatoms -xorg-xlsclients -xorg-xmodmap -xorg-xpr -xorg-xprop -xorg-xrandr -xorg-xrdb -xorg-xrefresh -xorg-xset -xorg-xsetroot -xorg-xvinfo -xorg-xwayland -xorg-xwd -xorg-xwininfo -xorg-xwud xterm -youtube-dl zathura zathura-pdf-poppler zip zsh -zvbi diff --git a/pkglist.txt.bak b/pkglist.txt.bak new file mode 100644 index 0000000..4bcf121 --- /dev/null +++ b/pkglist.txt.bak @@ -0,0 +1,277 @@ +aic94xx-firmware +alacritty +alsa-tools +alsa-utils +amd-ucode +arandr +autoconf +autocutsel +automake +barrier +base +bdf-unifont +biber +binutils +bison +bitwarden-rofi +borg +capitaine-cursors +cdrtools +cmatrix +cronie +cups +cura +davfs2 +discord +dnsmasq +dosfstools +downgrade +drawio-desktop +dunst +efibootmgr +eog +evince +exa +exfat-utils +fakeroot +ffmpegthumbnailer +firefox +flatpak +flex +freecad +gcc +gimp +git +gitg +gnome-disk-utility +gnome-keyring +goocanvas +gramps +grub +gruvbox-dark-icons-gtk +gscreenshot +gtk-theme-arc-gruvbox-git +gutenprint +gvfs +gvfs-smb +htop +inkscape +jack2 +jre-openjdk +jre8-openjdk +kdeconnect +kdenlive +kicad +kicad-library +kicad-library-3d +lib32-giflib +lib32-gnutls +lib32-gst-plugins-base-libs +lib32-gtk3 +lib32-libpulse +lib32-libva +lib32-libxcomposite +lib32-libxinerama +lib32-libxslt +lib32-mpg123 +lib32-nvidia-utils +lib32-ocl-icd +lib32-openal +lib32-v4l-utils +libgnome-keyring +libnotify +libreoffice-still +libreoffice-still-de +lightdm +lightdm-gtk-greeter +lightdm-gtk-greeter-settings +linux +linux-firmware +linux-lts +linux-zen +lshw +lutris +lxappearance +lxsession +m4 +make +meld +minecraft-launcher +mlocate +moc +mtools +ncdu +neofetch +neovim +nerd-fonts-complete +network-manager-applet +networkmanager +nextcloud-client +nitrogen +nmap +nordnm +npm +ntfs-3g +numlockx +nvidia +obs-studio +openmotif +openocd +openvpn +os-prober +osm-gps-map +p3x-onenote +p7zip +pamixer +papirus-icon-theme +paprefs +patch +pavucontrol +pcmanfm-gtk3 +pdftk +picom-jonaburg-git +pikaur +pkgconf +playerctl +playonlinux +pulseaudio +pulseaudio-alsa +pulseaudio-ctl +python-pip +python-psutil +python-pympress +python-pynvim +python-pytest +python-subprocess2 +qalculate-gtk +qgis +qt5-styleplugins +qtile +rapidsvn +redshift +redshiftgui-bin +rofi +rofi-calc +rpi-imager +shotwell +signal-desktop +skypeforlinux-stable-bin +slack-desktop +smbclient +spacenavd +spotify +sshpass +steam +stlink +stow +subversion +sudo +surf +system-config-printer +teams-for-linux +teamviewer +telegram-desktop +texinfo +texlive-bibtexextra +texlive-core +texlive-fontsextra +texlive-formatsextra +texlive-games +texlive-humanities +texlive-latexextra +texlive-music +texlive-pictures +texlive-pstricks +texlive-publishers +texlive-science +texlive-tikz-uml +thunderbird +timeshift +tor-browser +transmission-gtk +tree +ttf-dseg +ttf-liberation +ttf-ubuntu-font-family +udiskie +udisks2 +unzip +vi +vifm +virtualbox +virtualbox-host-modules-arch +visual-studio-code-bin +vlc +vlc-pause-click-plugin +wd719x-firmware +wget +whatsapp-for-linux +which +wine-gecko +wine-mono +wine-staging +winetricks +wireguard-tools +woeusb-gui +xarchiver +xcb-util-cursor +xclip +xdotool +xorg-bdftopcf +xorg-docs +xorg-font-util +xorg-fonts-100dpi +xorg-fonts-75dpi +xorg-fonts-encodings +xorg-iceauth +xorg-mkfontscale +xorg-server +xorg-server-common +xorg-server-devel +xorg-server-xephyr +xorg-server-xnest +xorg-server-xvfb +xorg-sessreg +xorg-setxkbmap +xorg-smproxy +xorg-x11perf +xorg-xauth +xorg-xbacklight +xorg-xcalc +xorg-xclock +xorg-xcmsdb +xorg-xcursorgen +xorg-xdpyinfo +xorg-xdriinfo +xorg-xev +xorg-xeyes +xorg-xgamma +xorg-xhost +xorg-xinit +xorg-xinput +xorg-xkbcomp +xorg-xkbevd +xorg-xkbutils +xorg-xkill +xorg-xlsatoms +xorg-xlsclients +xorg-xmodmap +xorg-xpr +xorg-xprop +xorg-xrandr +xorg-xrdb +xorg-xrefresh +xorg-xset +xorg-xsetroot +xorg-xvinfo +xorg-xwayland +xorg-xwd +xorg-xwininfo +xorg-xwud +xterm +youtube-dl +zathura +zathura-pdf-poppler +zip +zsh +zvbi diff --git a/qtile/.config/qtile/Groups.py b/qtile/.config/qtile/Groups.py index 1fac445..8d414bf 100644 --- a/qtile/.config/qtile/Groups.py +++ b/qtile/.config/qtile/Groups.py @@ -1,7 +1,8 @@ -from typing import Match from libqtile.config import Group, ScratchPad, DropDown, Key, Match from libqtile.command import lazy +import re + from defines import mod,term from Keys import keys @@ -13,7 +14,7 @@ group_names = [("","Home", 'h',{'layout': 'monadtall'}), ("ﱘ","Music", 'u',{'layout': 'monadtall', 'matches' : [Match(wm_class="spotify")]}), ("","Video", 'v',{'layout': 'monadtall', 'matches' : [Match(wm_class="vlc")]}), ("ﭮ","VideoChat", 'z',{'layout': 'monadtall', 'matches':[Match(wm_class="discord")]}), - ("","ClickUp", 'k',{'layout': 'monadtall', 'matches' : [Match(wm_class="clickup")]}), + ("","Planta Pulse", 'p',{'layout': 'monadtall', 'matches' : [Match(wm_class="surf")]}), ("一","etc1", '1', {'layout': 'monadtall'}), ("二","etc2", '2', {'layout': 'monadtall'}), ("三","etc3", '3', {'layout': 'monadtall'}), diff --git a/qtile/.config/qtile/Keys.py b/qtile/.config/qtile/Keys.py index 92eb8b4..2409e4e 100644 --- a/qtile/.config/qtile/Keys.py +++ b/qtile/.config/qtile/Keys.py @@ -4,8 +4,10 @@ from libqtile.command import lazy from defines import mod, term keys = [ - #screen lock + #screen lock & hibernation Key([mod], "End" , lazy.spawn('dm-tool lock'),desc="locks session"), + Key([], "Cancel" , lazy.spawn('systemctl hibernate'),desc="enter hibernation"), + #moving focus aroung Key([mod], "h", lazy.layout.left(),desc="move focus left"), @@ -51,7 +53,7 @@ keys = [ Key([mod, "control"], "q", lazy.shutdown(), desc="Shutdown qtile"), #rofi - Key([mod],'Return',lazy.spawn("rofi -show drun -show-icons -modi drun,calc,ssh"),desc="launch rofi (drun)"), + Key([mod],'Return',lazy.spawn("rofi -show drun -show-icons -modi drun"),desc="launch rofi (drun)"), # audio hotkeys Key([], 'XF86AudioRaiseVolume', lazy.spawn('pulseaudio-ctl up 5'), desc="increase speaker volume"), @@ -73,6 +75,9 @@ keys = [ # backlight keys Key([], 'XF86MonBrightnessUp', lazy.spawn('xbacklight -inc 5')), Key([], 'XF86MonBrightnessDown', lazy.spawn('xbacklight -dec 5')), + + # color mode switch + Key([], 'XF86Favorites', lazy.spawn('xbacklight -set 100')), ] diff --git a/qtile/.config/qtile/autostart.sh b/qtile/.config/qtile/autostart.sh index 5d9ec23..0f553c3 100755 --- a/qtile/.config/qtile/autostart.sh +++ b/qtile/.config/qtile/autostart.sh @@ -4,13 +4,13 @@ xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Tapping Enabled" 1 xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Natural Scrolling Enabled" 1 setxkbmap de& nitrogen --restore & +/usr/lib/geoclue-2.0/demos/agent& bash .screenlayout/layout.sh & pulseaudio-ctl set 50 & dunst & nextcloud & timeshift & numlockx & -redshift-gtk -t 6500:3600 & udiskie -t & picom -b --experimental-backend & cbatticon & @@ -18,5 +18,7 @@ nm-applet & blueman-applet & thunderbird & clickup & +redshift-gtk -t 6500:3600 & fcitx5 -d& -emacs --daemon & \ No newline at end of file +emacs --daemon & +surf https://ka-raceing.plantapulse.de/boards & diff --git a/screen-layout/.screenlayout/layout.sh b/screen-layout/.screenlayout/layout.sh index 79a2eab..c6f67b5 100755 --- a/screen-layout/.screenlayout/layout.sh +++ b/screen-layout/.screenlayout/layout.sh @@ -1,2 +1,2 @@ #!/bin/sh -xrandr --output DVI-I-0 --primary --mode 1440x900 --pos 2080x0 --rotate normal --output DVI-I-1 --off --output HDMI-0 --mode 1920x1080 --pos 0x660 --rotate left --output DP-0 --mode 3440x1440 --pos 1080x900 --rotate normal --output DP-1 --off --output DP-2 --off --output DP-3 --off --output DP-4 --off --output DP-5 --off +xrandr --output eDP-1 --mode 1920x1080 --pos 0x1080 --rotate normal --output HDMI-1 --off --output DP-1 --mode 1920x1080 --pos 0x0 --rotate normal --output DP-2 --off diff --git a/zsh/.oh-my-zsh/custom/plugins/zsh-autosuggestions b/zsh/.oh-my-zsh/custom/plugins/zsh-autosuggestions deleted file mode 160000 index a411ef3..0000000 --- a/zsh/.oh-my-zsh/custom/plugins/zsh-autosuggestions +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a411ef3e0992d4839f0732ebeb9823024afaaaa8 diff --git a/zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting b/zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting deleted file mode 160000 index 122dc46..0000000 --- a/zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 122dc464392302114556b53ec01a1390c54f739f diff --git a/zsh/.zshrc b/zsh/.zshrc index 17b917d..34253d9 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -72,6 +72,9 @@ export PATH=$PATH:~/.local/bin export PATH=$PATH:~/.emacs.d/bin ### ALIAS' ### +# docker +alias docker='sudo docker' + #jokes alias dog='cat' alias rr='curl -s -L https://raw.githubusercontent.com/keroserene/rickrollrc/master/roll.sh | bash' #rickroll @@ -140,21 +143,23 @@ alias ftemplate='git fetch template' alias mtemplate='git merge template/master --allow-unrelated-histories' alias log='git log' + ### AUTOSTART ### #neofetch neofetch # >>> conda initialize >>> # !! Contents within this block are managed by 'conda init' !! -__conda_setup="$('/home/paul/anaconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" +__conda_setup="$('/usr/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" if [ $? -eq 0 ]; then eval "$__conda_setup" else - if [ -f "/home/paul/anaconda3/etc/profile.d/conda.sh" ]; then - . "/home/paul/anaconda3/etc/profile.d/conda.sh" + if [ -f "/usr/etc/profile.d/conda.sh" ]; then + . "/usr/etc/profile.d/conda.sh" else - export PATH="/home/paul/anaconda3/bin:$PATH" + export PATH="/usr/bin:$PATH" fi fi unset __conda_setup # <<< conda initialize <<< + From a1548725d639e9a5abe75c5a0d47e9ac5b607110 Mon Sep 17 00:00:00 2001 From: paul-loedige Date: Tue, 18 Apr 2023 22:47:31 +0200 Subject: [PATCH 13/13] readded broken submodules --- .gitmodules | 6 ++++++ zsh/.oh-my-zsh/custom/plugins/zsh-autosuggestions | 1 + zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting | 1 + 3 files changed, 8 insertions(+) create mode 160000 zsh/.oh-my-zsh/custom/plugins/zsh-autosuggestions create mode 160000 zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting diff --git a/.gitmodules b/.gitmodules index 7bf8e47..bb000ee 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,9 @@ [submodule "emacs/.emacs.d"] path = emacs/.emacs.d url = https://github.com/doomemacs/doomemacs +[submodule "zsh/.oh-my-zsh/custom/plugins/zsh-autosuggestions"] + path = zsh/.oh-my-zsh/custom/plugins/zsh-autosuggestions + url = https://github.com/zsh-users/zsh-autosuggestions.git +[submodule "zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting"] + path = zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting + url = https://github.com/zsh-users/zsh-syntax-highlighting.git diff --git a/zsh/.oh-my-zsh/custom/plugins/zsh-autosuggestions b/zsh/.oh-my-zsh/custom/plugins/zsh-autosuggestions new file mode 160000 index 0000000..a411ef3 --- /dev/null +++ b/zsh/.oh-my-zsh/custom/plugins/zsh-autosuggestions @@ -0,0 +1 @@ +Subproject commit a411ef3e0992d4839f0732ebeb9823024afaaaa8 diff --git a/zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting b/zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting new file mode 160000 index 0000000..754cefe --- /dev/null +++ b/zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting @@ -0,0 +1 @@ +Subproject commit 754cefe0181a7acd42fdcb357a67d0217291ac47