From 2213548f835c77f55aa51821187200bfb8cde2f2 Mon Sep 17 00:00:00 2001 From: Jarkko Toivanen Date: Sat, 24 Aug 2024 15:12:19 +0300 Subject: [PATCH] Stuff and things, yeahh --- .gitconfig | 1 + .inputrc | 1 + .spacemacs | 101 +++++++++++++++++++------------------- xfce4/terminal/terminalrc | 5 +- 4 files changed, 56 insertions(+), 52 deletions(-) diff --git a/.gitconfig b/.gitconfig index c034b58..2c9d478 100644 --- a/.gitconfig +++ b/.gitconfig @@ -4,6 +4,7 @@ signingkey = 0EEA7DE3BE089B6F [core] editor = nano + autocrlf = input [commit] gpgsign = true [init] diff --git a/.inputrc b/.inputrc index b0be867..e3009ef 100644 --- a/.inputrc +++ b/.inputrc @@ -4,3 +4,4 @@ set colored-stats on set mark-symlinked-directories on set colored-completion-prefix on set menu-complete-display-prefix on +set enable-keypad on diff --git a/.spacemacs b/.spacemacs index 1e07c0e..23cf5ef 100644 --- a/.spacemacs +++ b/.spacemacs @@ -36,8 +36,9 @@ This function should only modify configuration layer settings." yaml html php + ;; asm (rust :variables - rust-format-on-save t) + rust-format-on-save t) (c-c++ :variables c-c++-backend 'lsp-clangd) python ;; ---------------------------------------------------------------- @@ -47,8 +48,8 @@ This function should only modify configuration layer settings." ;; ---------------------------------------------------------------- ;; auto-completion (auto-completion :variables - auto-completion-return-key-behavior nil - auto-completion-tab-key-behavior 'complete) + auto-completion-return-key-behavior nil + auto-completion-tab-key-behavior 'complete) ;; better-defaults emacs-lisp git @@ -58,19 +59,19 @@ This function should only modify configuration layer settings." multiple-cursors ;; org (shell :variables - shell-default-height 30 - shell-default-position 'bottom) + shell-default-height 30 + shell-default-position 'bottom) ;; spell-checking syntax-checking (version-control :variables - version-control-diff-side 'left) + version-control-diff-side 'left) treemacs tabs ;;(unicode-fonts :variables ;; unicode-fonts-enable-ligatures t) (nixos :variables - nix-backend 'lsp) + nix-backend 'lsp) ) @@ -90,7 +91,7 @@ This function should only modify configuration layer settings." ;; A list of packages that will not be installed and loaded. dotspacemacs-excluded-packages '( - vi-tilde-fringe) + vi-tilde-fringe) ;; Defines the behaviour of Spacemacs when installing packages. ;; Possible values are `used-only', `used-but-keep-unused' and `all'. @@ -218,7 +219,7 @@ It should only modify the values of Spacemacs settings." ;; number is the project limit and the second the limit on the recent files ;; within a project. dotspacemacs-startup-lists '((recents . 5) - (projects . 7)) + (projects . 7)) ;; True if the home buffer should respond to resize events. (default t) dotspacemacs-startup-buffer-responsive t @@ -258,8 +259,8 @@ It should only modify the values of Spacemacs settings." ;; Press `SPC T n' to cycle to the next theme in the list (works great ;; with 2 themes variants, one dark and one light) dotspacemacs-themes '(monokai - spacemacs-dark - spacemacs-light) + spacemacs-dark + spacemacs-light) ;; Set the theme for the Spaceline. Supported themes are `spacemacs', ;; `all-the-icons', `custom', `doom', `vim-powerline' and `vanilla'. The @@ -279,21 +280,21 @@ It should only modify the values of Spacemacs settings." ;; Point size is recommended, because it's device independent. (default 10.0) dotspacemacs-default-font '( - ;; ("Glass TTY VT220" - ;; :size 15.0 - ;; :weight normal - ;; :width normal) + ("Glass TTY VT220" + :size 15.0 + :weight normal + :width normal) - ("Fira Code" - :size 12.0 - :weight normal - :width normal) + ("Fira Code" + :size 12.0 + :weight normal + :width normal) - ;; ("Source Code Pro" - ;; :size 10.0 - ;; :weight normal - ;; :width normal) - ) + ;; ("Source Code Pro" + ;; :size 10.0 + ;; :weight normal + ;; :width normal) + ) ;; The leader key (default "SPC") dotspacemacs-leader-key "SPC" @@ -577,7 +578,7 @@ default it calls `spacemacs/load-spacemacs-env' which loads the environment variables declared in `~/.spacemacs.env' or `~/.spacemacs.d/.spacemacs.env'. See the header of this file for more information." (spacemacs/load-spacemacs-env) -) + ) (defun dotspacemacs/user-init () "Initialization for user code: @@ -585,7 +586,7 @@ This function is called immediately after `dotspacemacs/init', before layer configuration. It is mostly for variables that should be set before packages are loaded. If you are unsure, try setting them in `dotspacemacs/user-config' first." -) + ) (defun dotspacemacs/user-load () @@ -593,7 +594,7 @@ If you are unsure, try setting them in `dotspacemacs/user-config' first." This function is called only while dumping Spacemacs configuration. You can `require' or `load' the libraries of your choice that will be included in the dump." -) + ) (defun dotspacemacs/user-config () @@ -602,7 +603,7 @@ This function is called at the very end of Spacemacs startup, after layer configuration. Put your configuration code here, except for variables that should be set before packages are loaded." -) + ) ;; Do not write anything past this comment. This is where Emacs will @@ -612,25 +613,25 @@ before packages are loaded." This is an auto-generated function, do not modify its content directly, use Emacs customize menu instead. This function is called at the very end of Spacemacs initialization." -(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. - '(package-selected-packages - '(import-js grizzl js-doc js2-refactor multiple-cursors livid-mode nodejs-repl npm-mode skewer-mode js2-mode tern yaml-mode add-node-modules-path company-web web-completion-data counsel-css emmet-mode helm-css-scss impatient-mode htmlize simple-httpd prettier-js pug-mode sass-mode haml-mode scss-mode slim-mode tagedit web-beautify web-mode ac-ispell auto-complete auto-yasnippet blacken centaur-tabs code-cells company-anaconda anaconda-mode cython-mode flycheck-pos-tip fuzzy helm-c-yasnippet helm-company helm-lsp helm-pydoc importmagic epc ctable concurrent deferred live-py-mode lsp-origami origami lsp-pyright lsp-python-ms lsp-ui nose pip-requirements pipenv load-env-vars pippel poetry py-isort pydoc pyenv-mode pythonic pylookup pytest pyvenv sphinx-doc yapfify yasnippet-snippets company-php ac-php-core xcscope company-phpactor drupal-mode geben php-auto-yasnippets yasnippet php-extras php-mode phpactor composer php-runtime phpcbf phpunit cargo company counsel-gtags counsel swiper ivy dap-mode lsp-docker lsp-treemacs bui yaml lsp-mode markdown-mode flycheck-rust ggtags helm-gtags racer pos-tip ron-mode rust-mode toml-mode ws-butler writeroom-mode winum which-key volatile-highlights vim-powerline vi-tilde-fringe uuidgen use-package undo-tree treemacs-projectile treemacs-persp treemacs-icons-dired toc-org term-cursor symon symbol-overlay string-inflection string-edit-at-point spacemacs-whitespace-cleanup spacemacs-purpose-popwin spaceline-all-the-icons space-doc restart-emacs request rainbow-delimiters quickrun popwin pcre2el password-generator paradox overseer org-superstar open-junk-file nameless multi-line macrostep lorem-ipsum link-hint inspector info+ indent-guide hybrid-mode hungry-delete holy-mode hl-todo highlight-parentheses highlight-numbers highlight-indentation hide-comnt help-fns+ helm-xref helm-themes helm-swoop helm-purpose helm-projectile helm-org helm-mode-manager helm-make helm-descbinds helm-ag google-translate golden-ratio font-lock+ flycheck-package flycheck-elsa flx-ido fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-textobj-line evil-surround evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state evil-lion evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-evilified-state evil-escape evil-collection evil-cleverparens evil-args evil-anzu eval-sexp-fu emr elisp-slime-nav elisp-def editorconfig dumb-jump drag-stuff dotenv-mode dired-quick-sort diminish devdocs define-word column-enforce-mode clean-aindent-mode centered-cursor-mode auto-highlight-symbol auto-compile aggressive-indent ace-link ace-jump-helm-line)) - '(standard-indent 8) - '(tab-width 8) - '(c-basic-offset 8) - '(indent-tabs-mode t) - '(indent-line-function 'insert-tab) - '(c-default-style '((java-mode . "java") (awk-mode . "awk") (other . "linux"))) - '(backward-delete-char-untabify-method nil) - ) -(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. - ) -) + (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. + '(package-selected-packages + '(import-js grizzl js-doc js2-refactor multiple-cursors livid-mode nodejs-repl npm-mode skewer-mode js2-mode tern yaml-mode add-node-modules-path company-web web-completion-data counsel-css emmet-mode helm-css-scss impatient-mode htmlize simple-httpd prettier-js pug-mode sass-mode haml-mode scss-mode slim-mode tagedit web-beautify web-mode ac-ispell auto-complete auto-yasnippet blacken centaur-tabs code-cells company-anaconda anaconda-mode cython-mode flycheck-pos-tip fuzzy helm-c-yasnippet helm-company helm-lsp helm-pydoc importmagic epc ctable concurrent deferred live-py-mode lsp-origami origami lsp-pyright lsp-python-ms lsp-ui nose pip-requirements pipenv load-env-vars pippel poetry py-isort pydoc pyenv-mode pythonic pylookup pytest pyvenv sphinx-doc yapfify yasnippet-snippets company-php ac-php-core xcscope company-phpactor drupal-mode geben php-auto-yasnippets yasnippet php-extras php-mode phpactor composer php-runtime phpcbf phpunit cargo company counsel-gtags counsel swiper ivy dap-mode lsp-docker lsp-treemacs bui yaml lsp-mode markdown-mode flycheck-rust ggtags helm-gtags racer pos-tip ron-mode rust-mode toml-mode ws-butler writeroom-mode winum which-key volatile-highlights vim-powerline vi-tilde-fringe uuidgen use-package undo-tree treemacs-projectile treemacs-persp treemacs-icons-dired toc-org term-cursor symon symbol-overlay string-inflection string-edit-at-point spacemacs-whitespace-cleanup spacemacs-purpose-popwin spaceline-all-the-icons space-doc restart-emacs request rainbow-delimiters quickrun popwin pcre2el password-generator paradox overseer org-superstar open-junk-file nameless multi-line macrostep lorem-ipsum link-hint inspector info+ indent-guide hybrid-mode hungry-delete holy-mode hl-todo highlight-parentheses highlight-numbers highlight-indentation hide-comnt help-fns+ helm-xref helm-themes helm-swoop helm-purpose helm-projectile helm-org helm-mode-manager helm-make helm-descbinds helm-ag google-translate golden-ratio font-lock+ flycheck-package flycheck-elsa flx-ido fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-textobj-line evil-surround evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state evil-lion evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-evilified-state evil-escape evil-collection evil-cleverparens evil-args evil-anzu eval-sexp-fu emr elisp-slime-nav elisp-def editorconfig dumb-jump drag-stuff dotenv-mode dired-quick-sort diminish devdocs define-word column-enforce-mode clean-aindent-mode centered-cursor-mode auto-highlight-symbol auto-compile aggressive-indent ace-link ace-jump-helm-line)) + '(standard-indent 8) + '(tab-width 8) + '(c-basic-offset 8) + '(indent-tabs-mode t) + '(indent-line-function 'insert-tab) + '(c-default-style '((java-mode . "java") (awk-mode . "awk") (other . "linux"))) + '(backward-delete-char-untabify-method nil) + ) + (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. + ) + ) diff --git a/xfce4/terminal/terminalrc b/xfce4/terminal/terminalrc index 701da10..4080510 100644 --- a/xfce4/terminal/terminalrc +++ b/xfce4/terminal/terminalrc @@ -1,9 +1,9 @@ [Configuration] -ColorForeground=#c0c0c0 +ColorForeground=#ffffc0c00000 ColorCursor=#c0c0c0c0c0c0 ColorSelection=#ffffffffffff ColorPalette=#000000000000;#808000000000;#000080800000;#808080800000;#000000008080;#808000008080;#000080808080;#c0c0c0c0c0c0;#808080808080;#ffff00000000;#0000ffff0000;#ffffffff0000;#0000ffffffff;#ffff0000ffff;#00000000ffff;#ffffffffffff -FontName=Less Perfect DOS VGA 12 +FontName=Glass TTY VT220 Bold 20 MiscAlwaysShowTabs=FALSE MiscBell=TRUE MiscBellUrgent=TRUE @@ -38,4 +38,5 @@ ShortcutsNoMenukey=TRUE ShortcutsNoMnemonics=TRUE ScrollingUnlimited=TRUE TitleInitial=MS-DOS Kehote +TabActivityColor=#ffff00000000