diff --git a/bat/themes/Catppuccin-mocha.tmTheme b/bat/themes/Catppuccin-mocha.tmTheme
new file mode 100644
index 0000000..d5e61a8
--- /dev/null
+++ b/bat/themes/Catppuccin-mocha.tmTheme
@@ -0,0 +1,960 @@
+
+
+
+
+ name
+ Catppuccin
+ settings
+
+
+ settings
+
+ foreground
+ #cdd6f4
+ background
+ #1e1e2e
+ caret
+ #bac2de
+ invisibles
+ #a6adc8
+ gutterForeground
+ #9399b2
+ gutterForegroundHighlight
+ #a6e3a1
+ lineHighlight
+ #1e1e2e
+ selection
+ #6c7086
+ selectionBorder
+ #1e1e2e
+ activeGuide
+ #fab387
+ findHighlightForeground
+ #181825
+ findHighlight
+ #f9e2af
+ bracketsForeground
+ #9399b2
+ bracketContentsForeground
+ #9399b2
+
+
+
+ name
+ Comment
+ scope
+ comment
+ settings
+
+ foreground
+ #6c7086
+ fontStyle
+ italic
+
+
+
+ name
+ String
+ scope
+ string
+ settings
+
+ foreground
+ #a6e3a1
+ fontStyle
+
+
+
+
+ name
+ String regex
+ scope
+ string.regexp
+ settings
+
+ foreground
+ #fab387
+ fontStyle
+
+
+
+
+ name
+ Number
+ scope
+ constant.numeric
+ settings
+
+ foreground
+ #fab387
+ fontStyle
+
+
+
+
+ name
+ Boolean
+ scope
+ constant.language.boolean
+ settings
+
+ foreground
+ #fab387
+ fontStyle
+ bold italic
+
+
+
+ name
+ Built-in constant
+ scope
+ constant.language
+ settings
+
+ foreground
+ #b4befe
+ fontStyle
+ italic
+
+
+
+ name
+ Built-in function
+ scope
+ support.function.builtin
+ settings
+
+ foreground
+ #fab387
+ fontStyle
+ italic
+
+
+
+ name
+ User-defined constant
+ scope
+ variable.other.constant
+ settings
+
+ foreground
+ #fab387
+ fontStyle
+
+
+
+
+ name
+ Variable
+ scope
+ variable
+ settings
+
+
+
+
+ name
+ Keyword
+ scope
+ keyword
+ settings
+
+ foreground
+ #f38ba8
+ fontStyle
+ italic
+
+
+
+ name
+ Conditional/loop
+ scope
+ keyword.control.loop, keyword.control.conditional, keyword.control.c++
+ settings
+
+ foreground
+ #cba6f7
+ fontStyle
+ bold
+
+
+
+ name
+ Return
+ scope
+ keyword.control.return, keyword.control.flow.return
+ settings
+
+ foreground
+ #f5c2e7
+ fontStyle
+ bold
+
+
+
+ name
+ Exception
+ scope
+ support.type.exception
+ settings
+
+ foreground
+ #fab387
+ fontStyle
+ italic
+
+
+
+ name
+ Operator
+ scope
+ keyword.operator, punctuation.accessor
+ settings
+
+ foreground
+ #89dceb
+ fontStyle
+ bold
+
+
+
+ name
+ Punctuation separator
+ scope
+ punctuation.separator
+ settings
+
+ foreground
+ #94e2d5
+ fontStyle
+
+
+
+
+ name
+ Punctuation terminator
+ scope
+ punctuation.terminator
+ settings
+
+ foreground
+ #94e2d5
+ fontStyle
+
+
+
+
+ name
+ Punctuation bracket
+ scope
+ punctuation.section
+ settings
+
+ foreground
+ #9399b2
+ fontStyle
+
+
+
+
+ name
+ Include
+ scope
+ keyword.control.import.include
+ settings
+
+ foreground
+ #94e2d5
+ fontStyle
+ italic
+
+
+
+ name
+ Storage
+ scope
+ storage
+ settings
+
+ foreground
+ #f38ba8
+ fontStyle
+
+
+
+
+ name
+ Storage type
+ scope
+ storage.type
+ settings
+
+ foreground
+ #f9e2af
+ fontStyle
+ italic
+
+
+
+ name
+ Storage modifier
+ scope
+ storage.modifier
+ settings
+
+ foreground
+ #f38ba8
+ fontStyle
+
+
+
+
+ name
+ Storage type namespace
+ scope
+ entity.name.namespace, meta.path
+ settings
+
+ foreground
+ #f5e0dc
+ fontStyle
+ italic
+
+
+
+ name
+ Storage type class
+ scope
+ storage.type.class
+ settings
+
+ foreground
+ #f5e0dc
+ fontStyle
+ italic
+
+
+
+ name
+ Label
+ scope
+ entity.name.label
+ settings
+
+ foreground
+ #89b4fa
+ fontStyle
+
+
+
+
+ name
+ Keyword class
+ scope
+ keyword.declaration.class
+ settings
+
+ foreground
+ #f38ba8
+ fontStyle
+ italic
+
+
+
+ name
+ Class name
+ scope
+ entity.name.class, meta.toc-list.full-identifier
+ settings
+
+ foreground
+ #89dceb
+ fontStyle
+
+
+
+
+ name
+ Inherited class
+ scope
+ entity.other.inherited-class
+ settings
+
+ foreground
+ #89dceb
+ fontStyle
+ italic
+
+
+
+ name
+ Function name
+ scope
+ entity.name.function, variable.function
+ settings
+
+ foreground
+ #89b4fa
+ fontStyle
+ italic
+
+
+
+ name
+ Function macro
+ scope
+ entity.name.function.preprocessor
+ settings
+
+ foreground
+ #f38ba8
+ fontStyle
+
+
+
+
+ name
+ Macro directive - ifdef
+ scope
+ keyword.control.import
+ settings
+
+ foreground
+ #f38ba8
+ fontStyle
+
+
+
+
+ name
+ Constructor
+ scope
+ entity.name.function.constructor, entity.name.function.destructor
+ settings
+
+ foreground
+ #b4befe
+ fontStyle
+
+
+
+
+ name
+ Function argument
+ scope
+ variable.parameter.function
+ settings
+
+ foreground
+ #f5e0dc
+ fontStyle
+ italic
+
+
+
+ name
+ Function declaration
+ scope
+ keyword.declaration.function
+ settings
+
+ foreground
+ #eba0ac
+ fontStyle
+ italic
+
+
+
+ name
+ Library function
+ scope
+ support.function
+ settings
+
+ foreground
+ #89dceb
+ fontStyle
+
+
+
+
+ name
+ Library constant
+ scope
+ support.constant
+ settings
+
+ foreground
+ #89b4fa
+ fontStyle
+
+
+
+
+ name
+ Library class/type
+ scope
+ support.type, support.class
+ settings
+
+ foreground
+ #89b4fa
+ fontStyle
+ italic
+
+
+
+ name
+ Library variable
+ scope
+ support.other.variable
+ settings
+
+ fontStyle
+
+
+
+
+ name
+ Variable function
+ scope
+ variable.function
+ settings
+
+ foreground
+ #89b4fa
+ fontStyle
+ italic
+
+
+
+ name
+ Variable parameter
+ scope
+ variable.parameter
+ settings
+
+ foreground
+ #f5e0dc
+ fontStyle
+ italic
+
+
+
+ name
+ Variable other
+ scope
+ variable.other
+ settings
+
+ foreground
+ #cdd6f4
+ fontStyle
+ italic
+
+
+
+ name
+ Variable field
+ scope
+ variable.other.member
+ settings
+
+ foreground
+ #f5e0dc
+ fontStyle
+
+
+
+
+ name
+ Variable language
+ scope
+ variable.language
+ settings
+
+ foreground
+ #94e2d5
+ fontStyle
+
+
+
+
+ name
+ Tag name
+ scope
+ entity.name.tag
+ settings
+
+ foreground
+ #fab387
+ fontStyle
+
+
+
+
+ name
+ Tag attribute
+ scope
+ entity.other.attribute-name
+ settings
+
+ foreground
+ #cba6f7
+ fontStyle
+ italic
+
+
+
+ name
+ Tag delimiter
+ scope
+ punctuation.definition.tag
+ settings
+
+ foreground
+ #eba0ac
+ fontStyle
+
+
+
+
+ name
+ Markdown URL
+ scope
+ markup.underline.link.markdown
+ settings
+
+ foreground
+ #f5e0dc
+ fontStyle
+ italic underline
+
+
+
+ name
+ Markdown reference
+ scope
+ meta.link.inline.description
+ settings
+
+ foreground
+ #b4befe
+ fontStyle
+ bold
+
+
+
+ name
+ Markdown literal
+ scope
+ comment.block.markdown, meta.code-fence, markup.raw.code-fence, markup.raw.inline
+ settings
+
+ foreground
+ #94e2d5
+ fontStyle
+ italic
+
+
+
+ name
+ Markdown title
+ scope
+ punctuation.definition.heading, entity.name.section
+ settings
+
+ foreground
+ #89b4fa
+ fontStyle
+ bold
+
+
+
+ name
+ Markdown emphasis
+ scope
+ markup.italic
+ settings
+
+ foreground
+ #eba0ac
+ fontStyle
+ italic
+
+
+
+ name
+ Markdown strong
+ scope
+ markup.bold
+ settings
+
+ foreground
+ #eba0ac
+ fontStyle
+ bold
+
+
+
+ name
+ Escape
+ scope
+ constant.character.escape
+ settings
+
+ foreground
+ #f5c2e7
+ fontStyle
+
+
+
+
+ name
+ Bash built-in function
+ scope
+ source.shell.bash meta.function.shell meta.compound.shell meta.function-call.identifier.shell
+ settings
+
+ foreground
+ #f5c2e7
+ fontStyle
+
+
+
+
+ name
+ Bash parameter
+ scope
+ variable.language.shell
+ settings
+
+ foreground
+ #f38ba8
+ fontStyle
+ italic
+
+
+
+ name
+ Lua field
+ scope
+ source.lua meta.function.lua meta.block.lua meta.mapping.value.lua meta.mapping.key.lua string.unquoted.key.lua
+ settings
+
+ foreground
+ #b4befe
+ fontStyle
+ italic
+
+
+
+ name
+ Lua constructor
+ scope
+ source.lua meta.function.lua meta.block.lua meta.mapping.key.lua string.unquoted.key.lua
+ settings
+
+ foreground
+ #f2cdcd
+ fontStyle
+
+
+
+
+ name
+ Java constant
+ scope
+ entity.name.constant.java
+ settings
+
+ foreground
+ #94e2d5
+ fontStyle
+
+
+
+
+ name
+ CSS property
+ scope
+ support.type.property-name.css
+ settings
+
+ foreground
+ #f2cdcd
+ fontStyle
+ italic
+
+
+
+ name
+ CSS constant
+ scope
+ support.constant.property-value.css
+ settings
+
+ foreground
+ #cdd6f4
+ fontStyle
+
+
+
+
+ name
+ CSS suffix
+ scope
+ constant.numeric.suffix.css, keyword.other.unit.css
+ settings
+
+ foreground
+ #94e2d5
+ fontStyle
+ italic
+
+
+
+ name
+ CSS variable property
+ scope
+ variable.other.custom-property.name.css, support.type.custom-property.name.css, punctuation.definition.custom-property.css
+ settings
+
+ foreground
+ #94e2d5
+ fontStyle
+
+
+
+
+ name
+ SCSS tag
+ scope
+ entity.name.tag.css
+ settings
+
+ foreground
+ #b4befe
+ fontStyle
+
+
+
+
+ name
+ SASS variable
+ scope
+ variable.other.sass
+ settings
+
+ foreground
+ #94e2d5
+ fontStyle
+
+
+
+
+ name
+ Invalid
+ scope
+ invalid
+ settings
+
+ foreground
+ #cdd6f4
+ background
+ #f38ba8
+ fontStyle
+
+
+
+
+ name
+ Invalid deprecated
+ scope
+ invalid.deprecated
+ settings
+
+ foreground
+ #cdd6f4
+ background
+ #cba6f7
+ fontStyle
+
+
+
+
+ name
+ Diff header
+ scope
+ meta.diff, meta.diff.header
+ settings
+
+ foreground
+ #6c7086
+ fontStyle
+
+
+
+
+ name
+ Diff deleted
+ scope
+ markup.deleted
+ settings
+
+ foreground
+ #f38ba8
+ fontStyle
+
+
+
+
+ name
+ Diff inserted
+ scope
+ markup.inserted
+ settings
+
+ foreground
+ #a6e3a1
+ fontStyle
+
+
+
+
+ name
+ Diff changed
+ scope
+ markup.changed
+ settings
+
+ foreground
+ #f9e2af
+ fontStyle
+
+
+
+
+ name
+ Message error
+ scope
+ message.error
+ settings
+
+ foreground
+ #f38ba8
+ fontStyle
+
+
+
+
+ uuid
+ 4d0379b5-ef82-467b-b8b8-365889420646
+ colorSpaceName
+ sRGB
+ semanticClass
+ theme.dark.Catppuccin
+ author
+ BrunDerSchwarzmagier
+
+
\ No newline at end of file
diff --git a/bat/themes/wombat-tmtheme/Wombat.tmTheme b/bat/themes/wombat-tmtheme/Wombat.tmTheme
deleted file mode 100644
index 26723fd..0000000
--- a/bat/themes/wombat-tmtheme/Wombat.tmTheme
+++ /dev/null
@@ -1,599 +0,0 @@
-
-
-
-
- author
- Lars H. Nielsen
- comment
- Adapted and enhanced by Sergei Shoshin
- name
- Wombat
- semanticClass
- theme.dark.wombat
- settings
-
-
- settings
-
- background
- #242424
- caret
- #EEEEEE
- foreground
- #F6F3E8
- invisibles
- #FFFFFF80
- lineHighlight
- #F6F3E80D
- selection
- #F6F3E833
-
-
-
- name
- Foldings
- scope
- deco.folding
- settings
-
- foreground
- #5A6A65
-
-
-
- name
- Comment
- scope
- comment
- settings
-
- fontStyle
- italic
- foreground
- #99968B
-
-
-
- name
- Constant
- scope
- constant
- settings
-
- foreground
- #E5786D
-
-
-
- name
- Entity
- scope
- entity
- settings
-
-
-
- name
- Keyword
- scope
- keyword
- settings
-
-
-
- name
- Storage
- scope
- storage
- settings
-
- foreground
- #8AC6F2
-
-
-
- name
- String
- scope
- string
- settings
-
- fontStyle
- italic
- foreground
- #95E454
-
-
-
- name
- Support
- scope
- support
- settings
-
- foreground
- #CAE682
-
-
-
- name
- Variable
- scope
- variable
- settings
-
- foreground
- #D4C4A9
-
-
-
- name
- Invalid – Deprecated
- scope
- invalid.deprecated
- settings
-
- fontStyle
- italic underline
- foreground
- #D2A8A1
-
-
-
- name
- Invalid – Illegal
- scope
- invalid.illegal
- settings
-
- background
- #562D56BF
- foreground
- #F6F3E8
-
-
-
- name
- -----------------------------------
- settings
-
-
-
- name
- ♦ Embedded Source
- scope
- meta.embedded.block - text.html.php, punctuation.whitespace.embedded - text.html.php
- settings
-
- background
- #B0B3BA14
-
-
-
- name
- ♦ Embedded Source (Bright)
- scope
- meta.embedded.line
- settings
-
- background
- #B1B3BA10
-
-
-
- name
- ♦ Entity inherited-class
- scope
- entity.other.inherited-class
- settings
-
- fontStyle
- italic
-
-
-
- name
- ♦ String embedded-source
- scope
- string meta.embedded
- settings
-
- foreground
- #DAEFA3
-
-
-
- name
- ♦ String constant
- scope
- string constant
- settings
-
- foreground
- #DDF2A4
-
-
-
- name
- ♦ String.regexp
- scope
- string.regexp
- settings
-
-
-
- name
- ♦ String.regexp.«special»
- scope
- string.regexp constant.character.escape, string.regexp source.ruby.embedded, string.regexp string.regexp.arbitrary-repitition
- settings
-
- foreground
- #CAE682
-
-
-
- name
- ♦ String variable
- scope
- string variable
- settings
-
-
-
- name
- ♦ Support.function
- scope
- support.function
- settings
-
-
-
- name
- ♦ Support.constant
- scope
- support.constant
- settings
-
-
-
- name
- ♦ Support.class
- scope
- support.class
- settings
-
- fontStyle
- bold
- foreground
- #E7F6DA
-
-
-
- name
- ♦ Keyword Important
- scope
- keyword.other.important
- settings
-
- foreground
- #E7F6DA
-
-
-
- name
- ♦ Keyword PHP Doc
- scope
- keyword.other.phpdoc
- settings
-
- foreground
- #B3B5AF
-
-
-
- name
- ♦ Keyword Unit
- scope
- keyword.other.unit
- settings
-
- foreground
- #E5786D
-
-
-
- name
- ♦ Keyword Control
- scope
- keyword.control, keyword.other.special-method
- settings
-
- foreground
- #8AC6F2
-
-
-
- name
- ♦ Keyword Operator Class
- scope
- keyword.operator.class
- settings
-
- foreground
- #E7F6DA
-
-
-
- name
- ♦ Built-in Constant
- scope
- constant.language
- settings
-
- fontStyle
- bold
- foreground
- #8AC6F2
-
-
-
- name
- ♦ Class Name
- scope
- meta.class
- settings
-
- foreground
- #E7F6DA
-
-
-
- name
- c C/C++ Preprocessor Line
- scope
- meta.preprocessor.c
- settings
-
- foreground
- #8996A8
-
-
-
- name
- c C/C++ Preprocessor Directive
- scope
- meta.preprocessor.c keyword
- settings
-
- foreground
- #AFC4DB
-
-
-
- name
- ✘ Doctype/XML Processing
- scope
- meta.tag.sgml, meta.tag.sgml.doctype, meta.tag.sgml.doctype entity, meta.tag.sgml.doctype keyword, meta.tag.sgml.doctype variable, meta.tag.sgml.doctype string, meta.tag.preprocessor.xml, meta.tag.preprocessor.xml entity, meta.tag.preprocessor.xml string
- settings
-
- fontStyle
- italic
- foreground
- #99968B
-
-
-
- name
- ✘ Tag Definition
- scope
- punctuation.definition.tag - meta.tag.preprocessor.xml - meta.tag.sgml
- settings
-
- foreground
- #CAE682
-
-
-
- name
- ✘ Attribute Name
- scope
- entity.other.attribute-name - meta.tag.preprocessor.xml
- settings
-
- foreground
- #CAE682
-
-
-
- name
- ✘ Meta.tag.«all»
- scope
- entity.name.tag - meta.tag.preprocessor.xml - meta.tag.sgml.doctype
- settings
-
- foreground
- #8AC6F2
-
-
-
- name
- ✘ Meta.tag.inline
- scope
- declaration.tag.inline, declaration.tag.inline entity, source entity.name.tag, source entity.other.attribute-name, meta.tag.inline, meta.tag.inline entity
- settings
-
-
-
- name
- § css:pseudo-class
- scope
- meta.selector.css entity.other.attribute-name.pseudo-class, meta.selector.css entity.other.attribute-name.pseudo-element
- settings
-
- fontStyle
- italic
-
-
-
- name
- § css#id
- scope
- meta.selector.css entity.other.attribute-name.id
- settings
-
-
-
- name
- § css.class
- scope
- meta.selector.css entity.other.attribute-name.class
- settings
-
-
-
- name
- § css property-name:
- scope
- support.type.property-name
- settings
-
- fontStyle
- bold
-
-
-
- name
- § css property-value;
- scope
- meta.property-group support.constant.property-value.css, meta.property-value support.constant.property-value.css
- settings
-
- foreground
- #CAE682
-
-
-
- name
- § css @at-rule
- scope
- meta.at-rule keyword.control.at-rule
- settings
-
- foreground
- #E7F6DA
-
-
-
- name
- § css additional-constants
- scope
- meta.property-value support.constant.named-color.css, meta.property-value constant
- settings
-
-
-
- name
- § css constructor.argument
- scope
- meta.constructor.argument.css
- settings
-
- foreground
- #8F9D6A
-
-
-
- name
- ⎇ diff.header
- scope
- meta.diff, meta.diff.header, meta.separator, meta.diff.range, meta.diff.index
- settings
-
- background
- #0E2231
- fontStyle
- italic
- foreground
- #F8F8F8
-
-
-
- name
- ⎇ diff.deleted
- scope
- markup.deleted
- settings
-
- background
- #420E09
- foreground
- #F8F8F8
-
-
-
- name
- ⎇ diff.changed
- scope
- markup.changed
- settings
-
- background
- #4A410D
- foreground
- #F8F8F8
-
-
-
- name
- ⎇ diff.inserted
- scope
- markup.inserted
- settings
-
- background
- #253B22
- foreground
- #F8F8F8
-
-
-
- name
- Markup: List
- scope
- markup.list
- settings
-
- foreground
- #F9EE98
-
-
-
- name
- Markup: Heading
- scope
- markup.heading
- settings
-
- fontStyle
- bold
- foreground
- #CF6A4C
-
-
-
- name
- Markup: Raw Block
- scope
- markup.raw.block
- settings
-
- background
- #B0B3BA14
-
-
-
- uuid
- DA056009-20CB-403C-8FCC-89D915D784BA
-
-
diff --git a/picom/picom.conf b/picom/picom.conf
index c840571..a059b04 100644
--- a/picom/picom.conf
+++ b/picom/picom.conf
@@ -2,11 +2,11 @@ shadow = true;
shadow-radius = 7;
shadow-offset-x = -7;
shadow-offset-y = -7;
-fading = true
+fading = true;
fade-in-step = 0.1;
fade-out-step = 0.1;
-inactive-opacity = 1
-frame-opacity = 1.0
+inactive-opacity = 1.0;
+frame-opacity = 1.0;
wintypes:
{
tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; full-shadow = false; };
diff --git a/shell/bashrc.d/01-common.sh b/shell/bashrc.d/01-common.sh
index c394f4a..d91ac19 100644
--- a/shell/bashrc.d/01-common.sh
+++ b/shell/bashrc.d/01-common.sh
@@ -17,12 +17,9 @@ export PATH="$HOME/.local/bin:$PATH:$HOME/skynet/bin:$HOME/node/node_modules/.bi
export EDITOR=vim
export PAGER=bat
export MANPAGER=batman
-export BAT_THEME='Wombat'
export DOTNET_ROOT=~/.dotnet
export ANDROID_EMULATOR_USE_SYSTEM_LIBS=1
export GPG_TTY=$(tty)
-export NNN_PLUG='d:dragdrop;i:imgview'
-export NNN_PREVIEWDIR='~/.cache/nnn/previews'
alias ls='exa --icons'
alias cat='bat'
diff --git a/shell/bashrc.d/05-env.sh b/shell/bashrc.d/05-env.sh
new file mode 100644
index 0000000..fe089b6
--- /dev/null
+++ b/shell/bashrc.d/05-env.sh
@@ -0,0 +1,9 @@
+# bat theme
+export BAT_THEME='Catppuccin-mocha'
+
+# nnn color config
+export NNN_PLUG='d:dragdrop;i:imgview'
+export NNN_PREVIEWDIR='~/.cache/nnn/previews'
+BLK="03" CHR="03" DIR="04" EXE="02" REG="07" HARDLINK="05" SYMLINK="05" MISSING="08" ORPHAN="01" FIFO="06" SOCK="03" UNKNOWN="01"
+export NNN_COLORS="#04020301;4231"
+export NNN_FCOLORS="$BLK$CHR$DIR$EXE$REG$HARDLINK$SYMLINK$MISSING$ORPHAN$FIFO$SOCK$UNKNOWN"