Skip to content

Commit

Permalink
Merge MR 'feat(git): add diffnav as pager' into 'main'
Browse files Browse the repository at this point in the history 
See merge request el-capitano/dotfiles!226
  • Loading branch information
@tmeijn
tmeijn committed Oct 16, 2024
2 parents c2bfbdc + af55b82 commit b6b0705
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 12 deletions.
57 changes: 48 additions & 9 deletions chezmoi/dconf.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ favorites=['🎤', '🛡', '🔓', '🏗', '⚒️', '🕵️', '🗃️', '👥
recent-characters=['🤮', '🏎️', '🚩', '👴🏻', '🐸', '✌', '✍🏾', '🗝️', '🔑', '🗃️', '🔓', '💡', '🔒']

[org/gnome/Extensions]
window-height=1360
window-height=1346
window-maximized=false
window-width=1254

Expand Down Expand Up @@ -97,7 +97,7 @@ size=(870, 690)

[org/gnome/control-center]
last-panel='network'
window-state=(1254, 674, false)
window-state=(1254, 1346, false)

[org/gnome/deja-dup]
backend='local'
Expand Down Expand Up @@ -179,7 +179,7 @@ show-battery-percentage=true
text-scaling-factor=0.89999999999999991

[org/gnome/desktop/notifications]
application-children=['update-manager', 'org-gnome-software', 'google-chrome', 'gnome-shell-extension-prefs', 'slack-slack', 'org-gnome-gedit', 'gnome-power-panel', 'gnome-network-panel', 'apport-gtk', 'redis-desktop-manager-rdm', 'chrome-jjphmlaoffndcnecccgemfdaaoighkel-default', 'org-gnome-nautilus', 'chrome-macmgoeeggnlnmpiojbcniblabkdjphe-default', 'phpstorm-phpstorm', 'code-code', 'gnome-control-center', 'skype-skypeforlinux', 'org-gnome-chromegnomeshell', 'kazam', 'org-gnome-terminal', 'gitkraken-gitkraken', 'org-gnome-eog', 'gnome-printers-panel', 'org-gnome-extensions-desktop', 'nm-connection-editor', 'org-gnome-shell-extensions', 'org-gnome-screenshot', 'flameshot', 'org-gnome-dejadup', 'teams', 'snap-store-ubuntu-software', 'vlc', 'gnome-datetime-panel', 'chrome-fbddfdjileihpefdciilbgplolpcpmgd-default', 'org-gnome-fileroller', 'keybase', 'org-flameshot-flameshot', 'io-snapcraft-sessionagent', 'firefox-firefox', 'teams-for-linux-teams-for-linux', 'nomachine-status', 'terminator', 'slack', 'veracrypt', 'firefox', 'gnome-system-monitor', 'gitdock', 'ca-desrt-dconf-editor', 'org-gnome-baobab', 'io-podman-desktop-podmandesktop', 'xdg-desktop-portal-gnome', 'teams-for-linux', 'org-gnome-texteditor', 'org-wezfurlong-wezterm', 'org-gnome-settings', 'io-github-seadve-kooha', 'org-gnome-calendar', 'org-gnome-shell-portalhelper', 'com-visualstudio-code', 'yelp', 'org-gnome-extensions', 'org-gnome-totem', 'org-gnome-meld', 'app-getclipboard-clipboard', 'kitty', 'code', 'org-gnome-characters', 'dev-vencord-vesktop']
application-children=['update-manager', 'org-gnome-software', 'google-chrome', 'gnome-shell-extension-prefs', 'slack-slack', 'org-gnome-gedit', 'gnome-power-panel', 'gnome-network-panel', 'apport-gtk', 'redis-desktop-manager-rdm', 'chrome-jjphmlaoffndcnecccgemfdaaoighkel-default', 'org-gnome-nautilus', 'chrome-macmgoeeggnlnmpiojbcniblabkdjphe-default', 'phpstorm-phpstorm', 'code-code', 'gnome-control-center', 'skype-skypeforlinux', 'org-gnome-chromegnomeshell', 'kazam', 'org-gnome-terminal', 'gitkraken-gitkraken', 'org-gnome-eog', 'gnome-printers-panel', 'org-gnome-extensions-desktop', 'nm-connection-editor', 'org-gnome-shell-extensions', 'org-gnome-screenshot', 'flameshot', 'org-gnome-dejadup', 'teams', 'snap-store-ubuntu-software', 'vlc', 'gnome-datetime-panel', 'chrome-fbddfdjileihpefdciilbgplolpcpmgd-default', 'org-gnome-fileroller', 'keybase', 'org-flameshot-flameshot', 'io-snapcraft-sessionagent', 'firefox-firefox', 'teams-for-linux-teams-for-linux', 'nomachine-status', 'terminator', 'slack', 'veracrypt', 'firefox', 'gnome-system-monitor', 'gitdock', 'ca-desrt-dconf-editor', 'org-gnome-baobab', 'io-podman-desktop-podmandesktop', 'xdg-desktop-portal-gnome', 'teams-for-linux', 'org-gnome-texteditor', 'org-wezfurlong-wezterm', 'org-gnome-settings', 'io-github-seadve-kooha', 'org-gnome-calendar', 'org-gnome-shell-portalhelper', 'com-visualstudio-code', 'yelp', 'org-gnome-extensions', 'org-gnome-totem', 'org-gnome-meld', 'app-getclipboard-clipboard', 'kitty', 'code', 'org-gnome-characters', 'snapd-desktop-integration-snapd-desktop-integration']
show-banners=true
show-in-lock-screen=false

Expand Down Expand Up @@ -324,6 +324,9 @@ application-id='org.gnome.Screenshot.desktop'
[org/gnome/desktop/notifications/application/org-gnome-settings]
application-id='org.gnome.Settings.desktop'

[org/gnome/desktop/notifications/application/org-gnome-shell-extensions-gsconnect]
application-id='org.gnome.Shell.Extensions.GSConnect.desktop'

[org/gnome/desktop/notifications/application/org-gnome-shell-extensions]
application-id='org.gnome.Shell.Extensions.desktop'

Expand Down Expand Up @@ -363,6 +366,9 @@ application-id='slack.desktop'
[org/gnome/desktop/notifications/application/snap-store-ubuntu-software]
application-id='snap-store_ubuntu-software.desktop'

[org/gnome/desktop/notifications/application/snapd-desktop-integration-snapd-desktop-integration]
application-id='snapd-desktop-integration_snapd-desktop-integration.desktop'

[org/gnome/desktop/notifications/application/teams-for-linux-teams-for-linux]
application-id='teams-for-linux_teams-for-linux.desktop'

Expand Down Expand Up @@ -680,7 +686,7 @@ last-folder-path='/home/tmeijn/Downloads'
last-folder-path='/home/tmeijn/OneDrive/personal'

[org/gnome/portal/filechooser/snap.firefox]
last-folder-path='/home/tmeijn/Pictures/Wallpapers'
last-folder-path='/home/tmeijn/Videos/Screencasts'

[org/gnome/portal/filechooser/teams-for-linux]
last-folder-path='/home/tmeijn/Videos/Kooha'
Expand Down Expand Up @@ -713,8 +719,8 @@ app-picker-layout=[{'org.gnome.Calculator.desktop': <{'position': <0>}>, 'simple
command-history=['r']
disable-extension-version-validation=false
disable-user-extensions=false
disabled-extensions=['[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', 'freon@UshakovVasilii_Github.yahoo.com', '[email protected]', 'rounded-window-corners@fxgn']
enabled-extensions=['[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', 'space-bar@luchrioh', '[email protected]', '[email protected]', '[email protected]', 'just-perfection-desktop@just-perfection', '[email protected]', '[email protected]', '[email protected]', 'native-window-placement@gnome-shell-extensions.gcampax.github.com', 'blur-my-shell@aunetx', '[email protected]', 'openbar@neuromorph', '[email protected]', '[email protected]']
disabled-extensions=['[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', 'freon@UshakovVasilii_Github.yahoo.com', 'rounded-window-corners@fxgn', '[email protected]']
enabled-extensions=['[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', 'space-bar@luchrioh', '[email protected]', '[email protected]', '[email protected]', 'just-perfection-desktop@just-perfection', '[email protected]', '[email protected]', '[email protected]', '[email protected]', 'native-window-placement@gnome-shell-extensions.gcampax.github.com', 'blur-my-shell@aunetx', '[email protected]', 'openbar@neuromorph', '[email protected]', '[email protected]']
favorite-apps=['firefox_firefox.desktop']
had-bluetooth-devices-setup=true
last-selected-power-profile='power-saver'
Expand Down Expand Up @@ -855,6 +861,39 @@ check-x11wayland=true
[org/gnome/shell/extensions/freon]
hot-sensors=['__average__']

[org/gnome/shell/extensions/gsconnect]
devices=['05afa07f_a3e2_477b_8b36_e593dc5373d3']
id='f513695d-3d2d-4357-980a-16ba5ff93e8f'
name='localhost.localdomain'

[org/gnome/shell/extensions/gsconnect/device/05afa07f_a3e2_477b_8b36_e593dc5373d3]
certificate-pem='-----BEGIN CERTIFICATE-----\nMIIBkzCCATmgAwIBAgIBATAKBggqhkjOPQQDBDBTMS0wKwYDVQQDDCQwNWFmYTA3\nZl9hM2UyXzQ3N2JfOGIzNl9lNTkzZGM1MzczZDMxFDASBgNVBAsMC0tERSBDb25u\nZWN0MQwwCgYDVQQKDANLREUwHhcNMjMxMDEzMjIwMDAwWhcNMzQxMDEzMjIwMDAw\nWjBTMS0wKwYDVQQDDCQwNWFmYTA3Zl9hM2UyXzQ3N2JfOGIzNl9lNTkzZGM1Mzcz\nZDMxFDASBgNVBAsMC0tERSBDb25uZWN0MQwwCgYDVQQKDANLREUwWTATBgcqhkjO\nPQIBBggqhkjOPQMBBwNCAASe8bb+um9dVPiGoY/zSAd4yckr+B1Uwr6HrzUxJ/ze\njQ12EQF1IP7Vzl8oYBofHU6DyQDfkZ6STpPRNJW1xKuBMAoGCCqGSM49BAMEA0gA\nMEUCIC3U1MMUNoWJIgLaUp3BNX1tQW0Jd76TrV4oI6i/stYGAiEAyef+wl3c7Z57\nPVuYDs8nsdkLXILLlbLUtxLyP7OMeYU=\n-----END CERTIFICATE-----\n'
disabled-plugins=@as []
incoming-capabilities=['kdeconnect.battery', 'kdeconnect.bigscreen.stt', 'kdeconnect.clipboard', 'kdeconnect.clipboard.connect', 'kdeconnect.contacts.request_all_uids_timestamps', 'kdeconnect.contacts.request_vcards_by_uid', 'kdeconnect.findmyphone.request', 'kdeconnect.mousepad.keyboardstate', 'kdeconnect.mousepad.request', 'kdeconnect.mpris', 'kdeconnect.mpris.request', 'kdeconnect.notification', 'kdeconnect.notification.action', 'kdeconnect.notification.reply', 'kdeconnect.notification.request', 'kdeconnect.ping', 'kdeconnect.runcommand', 'kdeconnect.sftp.request', 'kdeconnect.share.request', 'kdeconnect.share.request.update', 'kdeconnect.sms.request', 'kdeconnect.sms.request_attachment', 'kdeconnect.sms.request_conversation', 'kdeconnect.sms.request_conversations', 'kdeconnect.systemvolume', 'kdeconnect.telephony.request', 'kdeconnect.telephony.request_mute']
last-connection='lan://192.168.178.46:1716'
name='Redmi Note 10 Pro'
outgoing-capabilities=['kdeconnect.battery', 'kdeconnect.bigscreen.stt', 'kdeconnect.clipboard', 'kdeconnect.clipboard.connect', 'kdeconnect.connectivity_report', 'kdeconnect.contacts.response_uids_timestamps', 'kdeconnect.contacts.response_vcards', 'kdeconnect.findmyphone.request', 'kdeconnect.mousepad.echo', 'kdeconnect.mousepad.keyboardstate', 'kdeconnect.mousepad.request', 'kdeconnect.mpris', 'kdeconnect.mpris.request', 'kdeconnect.notification', 'kdeconnect.notification.request', 'kdeconnect.ping', 'kdeconnect.presenter', 'kdeconnect.runcommand.request', 'kdeconnect.sftp', 'kdeconnect.share.request', 'kdeconnect.sms.attachment_file', 'kdeconnect.sms.messages', 'kdeconnect.systemvolume.request', 'kdeconnect.telephony']
paired=true
supported-plugins=['battery', 'clipboard', 'connectivity_report', 'contacts', 'findmyphone', 'mousepad', 'mpris', 'notification', 'ping', 'presenter', 'runcommand', 'sftp', 'share', 'sms', 'systemvolume', 'telephony']
type='phone'

[org/gnome/shell/extensions/gsconnect/device/05afa07f_a3e2_477b_8b36_e593dc5373d3/plugin/battery]
custom-battery-notification-value=uint32 80
full-battery-notification=true

[org/gnome/shell/extensions/gsconnect/device/05afa07f_a3e2_477b_8b36_e593dc5373d3/plugin/clipboard]
receive-content=true

[org/gnome/shell/extensions/gsconnect/device/05afa07f_a3e2_477b_8b36_e593dc5373d3/plugin/notification]
applications='{"Printers":{"iconName":"org.gnome.Settings-printers-symbolic","enabled":true},"Events and Tasks Reminders":{"iconName":"org.gnome.Evolution-alarm-notify","enabled":true},"Zenity":{"iconName":"application-x-executable","enabled":true},"Snapd User Session Agent":{"iconName":"/usr/share/snapd/snapcraft-logo-bird.svg","enabled":true},"Disks":{"iconName":"org.gnome.DiskUtility","enabled":true},"Timeshift":{"iconName":"timeshift","enabled":true},"Date & Time":{"iconName":"org.gnome.Settings-time-symbolic","enabled":true},"Software":{"iconName":"org.gnome.Software","enabled":true},"NetworkManager Applet":{"iconName":"nm-device-wireless","enabled":true},"Rhythmbox":{"iconName":"org.gnome.Rhythmbox3","enabled":true},"Disk Usage Analyzer":{"iconName":"org.gnome.baobab","enabled":true},"Power":{"iconName":"org.gnome.Settings-power-symbolic","enabled":true},"Color":{"iconName":"org.gnome.Settings-color-symbolic","enabled":true},"Backups":{"iconName":"org.gnome.DejaDup","enabled":true},"Files":{"iconName":"org.gnome.Nautilus","enabled":true},"Clocks":{"iconName":"org.gnome.clocks","enabled":true},"File Roller":{"iconName":"org.gnome.FileRoller","enabled":true},"Kooha":{"iconName":"io.github.seadve.Kooha","enabled":true},"Firefox":{"iconName":"","enabled":true}}'

[org/gnome/shell/extensions/gsconnect/device/05afa07f_a3e2_477b_8b36_e593dc5373d3/plugin/share]
receive-directory='/home/tmeijn/Downloads'

[org/gnome/shell/extensions/gsconnect/preferences]
window-maximized=false
window-size=(1254, 627)

[org/gnome/shell/extensions/just-perfection]
accessibility-menu=true
activities-button=true
Expand Down Expand Up @@ -1031,7 +1070,7 @@ mouse-split-percent=false
application-styles='.space-bar {\n -natural-hpadding: 12px;\n}\n\n.space-bar-workspace-label.active {\n margin: 0 4px;\n background-color: rgba(255,255,255,0.3);\n color: rgba(255,255,255,1);\n border-color: rgba(0,0,0,0);\n font-weight: 700;\n border-radius: 4px;\n border-width: 0px;\n padding: 3px 8px;\n}\n\n.space-bar-workspace-label.inactive {\n margin: 0 4px;\n background-color: rgba(0,0,0,0);\n color: rgba(255,255,255,1);\n border-color: rgba(0,0,0,0);\n font-weight: 700;\n border-radius: 4px;\n border-width: 0px;\n padding: 3px 8px;\n}\n\n.space-bar-workspace-label.inactive.empty {\n margin: 0 4px;\n background-color: rgba(0,0,0,0);\n color: rgba(255,255,255,0.5);\n border-color: rgba(0,0,0,0);\n font-weight: 700;\n border-radius: 4px;\n border-width: 0px;\n padding: 3px 8px;\n}'

[org/gnome/shell/extensions/space-bar/state]
version=30
version=31

[org/gnome/shell/extensions/tiling-assistant]
active-window-hint-color='rgb(211,70,21)'
Expand Down Expand Up @@ -1075,8 +1114,8 @@ save-format='application/pdf'
selected-device='escl:http://192.168.178.19:8080'

[org/gnome/software]
check-timestamp=int64 1728630092
flatpak-purge-timestamp=int64 1728633358
check-timestamp=int64 1728976393
flatpak-purge-timestamp=int64 1728986764
install-timestamp=int64 1680257960
packagekit-historical-updates-timestamp=uint64 1680257960
update-notification-timestamp=int64 1705750277
Expand Down
2 changes: 1 addition & 1 deletion chezmoi/dot_config/aquaproj-aqua/aqua.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ packages:
- name: o2sh/[email protected]
description: Git repository summary on your terminal
link: https://github.com/o2sh/onefetch
- name: dimo414/[email protected].2
- name: dimo414/[email protected].1
description: a subprocess caching utility, available as a command line binary and a Rust library
link: https://github.com/dimo414/bkt
- name: martinvonz/[email protected]
Expand Down
2 changes: 2 additions & 0 deletions chezmoi/dot_config/git/config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,5 @@

[git-town]
main-branch = main
[pager]
diff = diffnav
2 changes: 1 addition & 1 deletion ...cal/private_share/private_gnome-shell/extensions/space-bar@luchrioh/private_metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
],
"url": "https://github.com/christopher-l/space-bar",
"uuid": "space-bar@luchrioh",
"version": 30
"version": 31
}
2 changes: 1 addition & 1 deletion ...local/private_share/private_gnome-shell/extensions/space-bar@luchrioh/ui/WorkspacesBar.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ export class WorkspacesBar {
reactive: true,
canFocus: true,
trackHover: true,
styleClass: 'workspace-box',
styleClass: `workspace-box workspace-box-${workspace.index + 1}`,
});
wsBox._delegate = new WorkspaceBoxDragHandler(workspace);
const label = this._createLabel(workspace);
Expand Down

0 comments on commit b6b0705

Please sign in to comment.