Michael Pappe 2 months ago
parent
commit
13b19a7538
  1. 6
      .config/fontconfig/fonts.conf
  2. 14
      .config/gtk-3.0/settings.ini
  3. 7
      .config/htop/htoprc##default
  4. 11
      .config/xsettingsd/xsettingsd.conf
  5. 6
      .gnupg/gpg-agent.conf

6
.config/fontconfig/fonts.conf

@ -2,7 +2,6 @@
<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
<!-- created by lxqt-config-appearance (DO NOT EDIT!) -->
<fontconfig>
<<<<<<< HEAD
<match target="pattern">
<test name="family" qual="any">
<string>monospace</string>
@ -24,8 +23,9 @@
<string>serif</string>
</test>
<edit mode="assign" name="family" binding="same">
<string>MesloLGSDZ Nerd Font</string>
=======
<string>MesloLGSDZ Nerd Font</string>
</edit>
</match>
<include ignore_missing="yes">conf.d</include>
<match target="font">
<edit mode="assign" name="antialias">

14
.config/gtk-3.0/settings.ini

@ -1,23 +1,10 @@
[Settings]
gtk-application-prefer-dark-theme=true
<<<<<<< HEAD
gtk-button-images=true
gtk-cursor-theme-name=breeze_cursors
=======
gtk-button-images=false
gtk-cursor-theme-name=Fluent-dark-cursors
>>>>>>> 86a05b1a76dbc1c8eed2b745d9ca76bc2bc383c3
gtk-cursor-theme-size=24
gtk-decoration-layout=:minimize,maximize,close
gtk-enable-animations=true
<<<<<<< HEAD
gtk-font-name=Noto Sans, 10
gtk-icon-theme-name=breeze-dark
gtk-menu-images=true
gtk-modules=colorreload-gtk-module:window-decorations-gtk-module
gtk-primary-button-warps-slider=false
gtk-theme-name=Breeze
=======
gtk-enable-event-sounds=1
gtk-enable-input-feedback-sounds=1
gtk-font-name=SF Pro Display, 10
@ -28,5 +15,4 @@ gtk-primary-button-warps-slider=false
gtk-shell-shows-menubar=1
gtk-theme-name=Breeze
gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
>>>>>>> 86a05b1a76dbc1c8eed2b745d9ca76bc2bc383c3
gtk-toolbar-style=3

7
.config/htop/htoprc##default

@ -17,13 +17,6 @@ highlight_changes=0
highlight_changes_delay_secs=5
find_comm_in_cmdline=1
strip_exe_from_cmdline=1
<<<<<<< HEAD
show_merged_command=0
tree_view=1
=======
show_merged_command=1
tree_view=0
>>>>>>> 86a05b1a76dbc1c8eed2b745d9ca76bc2bc383c3
tree_view_always_by_pid=0
header_margin=1
detailed_cpu_time=1

11
.config/xsettingsd/xsettingsd.conf

@ -2,15 +2,6 @@ Net/ThemeName "Breeze"
Gtk/EnableAnimations 1
Gtk/DecorationLayout ":minimize,maximize,close"
Gtk/PrimaryButtonWarpsSlider 0
<<<<<<< HEAD
Gtk/CursorThemeName "breeze_cursors"
Net/IconThemeName "breeze-dark"
Gtk/ToolbarStyle 3
Gtk/MenuImages 1
Gtk/ButtonImages 1
Gtk/FontName "Noto Sans, 10"
Net/ThemeName "Breeze"
=======
Gtk/ToolbarStyle 3
Gtk/MenuImages 1
Gtk/ButtonImages 0
@ -18,5 +9,3 @@ Gtk/CursorThemeSize 24
Gtk/CursorThemeName "Fluent-dark-cursors"
Net/IconThemeName "Fluent-dark"
Gtk/FontName "SF Pro Display, 10"
>>>>>>> 86a05b1a76dbc1c8eed2b745d9ca76bc2bc383c3

6
.gnupg/gpg-agent.conf

@ -1,11 +1,5 @@
#pinentry-program /usr/bin/pinentry-curses
<<<<<<< HEAD
pinentry-program /usr/bin/pinentry-qt
=======
#pinentry-program /usr/bin/pinentry-qt
>>>>>>> 86a05b1a76dbc1c8eed2b745d9ca76bc2bc383c3
max-cache-ttl 60480000
default-cache-ttl 60480000

Loading…
Cancel
Save