Skip to content

Commit

Permalink
chore: fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
folke committed Jun 16, 2024
1 parent 28205d6 commit 6828873
Show file tree
Hide file tree
Showing 20 changed files with 229 additions and 79 deletions.
10 changes: 5 additions & 5 deletions ansible/roles/dot/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@
state: directory
mode: u=rwx,o=,g=

- name: .Xresources
file:
src: ~/.config/.Xresources
dest: ~/.Xresources
state: link
# - name: .Xresources
# file:
# src: ~/.config/.Xresources
# dest: ~/.Xresources
# state: link

- name: gpg-agent.conf
copy:
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/web/templates/app.j2
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Version=1.0
Terminal=false
Type=Application
Name={{item.name}}
Exec=/bin/microsoft-edge-dev --app="{{item.url}}"
Exec=/bin/microsoft-edge-beta --app="{{item.url}}"
Icon={% if item.icon is defined %}{{item.icon}}{% else %}{{item.name | lower | regex_replace(' ', '-')}}{% endif %}
2 changes: 1 addition & 1 deletion config/ags/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ const options = mkOptions(OPTIONS, {
iconSize: opt(62),
max: opt(6),
favorites: opt([
["microsoft-edge-dev", "wezterm", "org.gnome.Nautilus", "org.gnome.Calendar", "spotify"],
["microsoft-edge-beta", "wezterm", "org.gnome.Nautilus", "org.gnome.Calendar", "spotify"],
]),
},
},
Expand Down
26 changes: 26 additions & 0 deletions config/alacritty/alacritty.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
decorations = "None"
import = ["/home/folke/projects/tokyonight.nvim/extras/alacritty/tokyonight_storm.yml"]
live_config_reload = true

[colors]
draw_bold_text_with_bright_colors = true

[font]
size = 11.0

[font.bold]
family = "Fira Code Bold Nerd Font Complete"

[font.bold_italic]
family = "Victor Mono Bold Italic Nerd Font Complete"

[font.italic]
family = "Victor Mono Medium Italic Nerd Font Complete"
style = "Italic"

[font.normal]
family = "FiraCode Nerd Font"

[window.padding]
x = 10
y = 10
112 changes: 112 additions & 0 deletions config/fastfetch/config.jsonc
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
{
"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
"logo": {
"type": "small",
"width": 60,
"printRemaining": false,
"padding": {
"top": 1,
"left": 2,
"right": 2,
"bottom": 0,
},
},
"display": {
"separator": "",
"keyWidth": 15,
},
"modules": [
{
"key": " ",
"type": "custom",
},
{
"key": "╭───────────╮",
"type": "custom",
},
{
// draw borders first to make colors of left and right border consistant
"key": "│ │\u001b[11D{#31} \u001b[{#37}user",
"type": "title",
"format": "{1}",
"outputColor": "31;1",
},
{
"key": "│ │\u001b[11D{#32}󰇅 \u001b[{#37}hname",
"type": "title",
"format": "{2}",
"outputColor": "32;1",
},
{
"key": "│ │\u001b[11D{#33}󰅐 \u001b[{#37}uptime",
"type": "uptime",
"outputColor": "33;1",
},
{
"key": "│ │\u001b[11D{#34}󰟾 \u001b[{#37}distro",
"type": "os",
"outputColor": "34;1",
},
{
"key": "│ │\u001b[11D{#35} \u001b[{#37}kernel",
"type": "kernel",
"outputColor": "35;1",
},
{
"key": "│ │\u001b[11D{#36}󰏗 \u001b[{#37}pkgs",
"type": "packages",
"outputColor": "36;1",
},
{
"key": "│ │\u001b[11D{#36}󰇄 \u001b[{#37}desktop",
"type": "de",
"outputColor": "36;1",
},
{
"key": "│ │\u001b[11D{#31} \u001b[{#37}term",
"type": "terminal",
"outputColor": "31;1",
},
{
"key": "│ │\u001b[11D{#32} \u001b[{#37}shell",
"type": "shell",
"outputColor": "32;1",
},
{
"key": "│ │\u001b[11D{#33}󰍛 \u001b[{#37}cpu",
"type": "cpu",
"showPeCoreCount": true,
"outputColor": "33;1",
},
{
"key": "│ │\u001b[11D{#34}󰉉 \u001b[{#37}disk",
"type": "disk",
"folders": "/",
"outputColor": "34;1",
},
{
"key": "│ │\u001b[11D{#35} \u001b[{#37}memory",
"type": "memory",
"outputColor": "35;1",
},
{
"key": "│ │\u001b[11D{#36}󰩟 \u001b[{#37}network",
"type": "localip",
"format": "{1} ({4})",
"outputColor": "36;1",
},
{
"key": "├───────────┤",
"type": "custom",
},
{
"key": "│ │\u001b[11D{#39} colors",
"type": "colors",
"symbol": "circle",
},
{
"key": "╰───────────╯",
"type": "custom",
},
],
}
16 changes: 16 additions & 0 deletions config/fish/conf.d/onefetch.fish
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# the following functions are here instead of in the functions directory
# because they utilize event handlers which autoloading does not support

# auto run onefetch if inside git repo
# --on-variable is a fish builtin that changes whenever the directory changes
# so this function will run whenever the directory changes
function auto_onefetch --on-variable PWD
# check if .git/ exists and is a git repo and if onefetch is installed
if test -d .git && git rev-parse --git-dir >/dev/null 2>&1
# onefetch
hub log -10 --reverse \
--pretty=format:'* %Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' \
--abbrev-commit --decorate --date=short --color \
| devmoji --log --color
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set fzf_diff_highlighter delta --paging=never --width=20
fzf_configure_bindings \
--directory=\ct \
--git_log=\cg \
--git_status= \
--git_status=\cs \
--history= \
--processes=\cp \
--variables=\c\ev
--variables=
File renamed without changes.
1 change: 0 additions & 1 deletion config/fish/config.fish
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ set -gx SUDO_EDITOR $EDITOR

# Fish
set fish_emoji_width 2
alias fish_greeting color-test
alias ssh "TERM=xterm-256color command ssh"
alias mosh "TERM=xterm-256color command mosh"

Expand Down
6 changes: 6 additions & 0 deletions config/fish/functions/fish_greeting.fish
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
function fish_greeting
if not status is-interactive
exit
end
fastfetch --kitty ~/.config/wall.png
end
12 changes: 8 additions & 4 deletions config/hypr/hyprland.conf
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ exec-once = ags
exec-once = easyeffects --gapplication-service
exec-once = hypridle
exec-once = hyprpaper
exec-once = microsoft-edge-dev
exec-once = microsoft-edge-beta
exec-once = safeeyes -e
exec-once = wl-clip-persist --clipboard regular
exec-once = wl-paste --watch cliphist store
Expand All @@ -68,9 +68,13 @@ windowrule = fullscreen, title:wlogout
windowrulev2 = float,class:quake
windowrulev2 = center,class:quake
windowrulev2 = dimaround,class:quake
windowrulev2 = size 1600 1000,class:quake
windowrulev2 = size 1400 875,class:quake
windowrulev2 = idleinhibit fullscreen,class:microsoft-edge
windowrulev2 = idleinhibit fullscreen,class:Brave-browser
windowrulev2 = float, class:^(ueberzug.*)$
windowrulev2 = noanim, class:^(ueberzug.*)$
windowrulev2 = noborder, class:^(ueberzug.*)$
windowrulev2 = noshadow, class:^(ueberzug.*)$
# Fix Edge preview windows
windowrulev2 = float,class:^$,title:^$
windowrulev2 = noinitialfocus,class:^$,title:^$
Expand All @@ -80,9 +84,9 @@ windowrulev2 = noinitialfocus,class:^$,title:^$
$meh = CONTROL SHIFT ALT
bind = $meh, D, exec, discord
bind = $meh, E, exec, element-desktop
bind = $meh, I, exec, microsoft-edge-dev
bind = $meh, I, exec, microsoft-edge-beta
bind = SUPER ALT, return, exec, wezterm
bind = SUPER, B, exec, microsoft-edge-dev
bind = SUPER, B, exec, microsoft-edge-beta
bind = SUPER, E, exec, element-desktop
bind = $meh, L, exec, swaylock -f
bind = $meh, N, exec, makoctl dismiss -a
Expand Down
12 changes: 6 additions & 6 deletions config/microsoft-edge-dev-flags.conf
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
--enable-features=VaapiVideoDecoder,Vulkan,TouchpadOverscrollHistoryNavigation
--enable-gpu
--enable-gpu-rasterization
--enable-oop-rasterization
--ignore-gpu-blocklist
# --enable-features=VaapiVideoDecoder,Vulkan,TouchpadOverscrollHistoryNavigation
# --enable-gpu
# --enable-gpu-rasterization
# --enable-oop-rasterization
# --ignore-gpu-blocklist
--ozone-platform-hint=auto
--gtk-version=4
--use-vulkan
# --use-vulkan
9 changes: 0 additions & 9 deletions config/wezterm/.neoconf.json

This file was deleted.

16 changes: 11 additions & 5 deletions config/wezterm/keys.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
local wezterm = require("wezterm")
local wezterm = require("wezterm") --[[@as Wezterm]]

local act = wezterm.action
local M = {}
Expand Down Expand Up @@ -35,14 +35,20 @@ function M.setup(config)
{ mods = M.mod, key = "h", action = act({ ActivateTabRelative = -1 }) },
{ mods = M.mod, key = "R", action = wezterm.action.RotatePanes("Clockwise") },
-- show the pane selection mode, but have it swap the active and selected panes
{ mods = M.mod, key = "S", action = wezterm.action.PaneSelect({ mode = "SwapWithActive" }) },
{ mods = M.mod, key = "S", action = wezterm.action.PaneSelect({}) },
-- Clipboard
{ mods = M.mod, key = "C", action = act.CopyTo("Clipboard") },
{ mods = M.mod, key = "c", action = act.CopyTo("Clipboard") },
{ mods = M.mod, key = "Space", action = act.QuickSelect },
{ mods = M.mod, key = "X", action = act.ActivateCopyMode },
{ mods = M.mod, key = "f", action = act.Search("CurrentSelectionOrEmptyString") },
{ mods = M.mod, key = "V", action = act.PasteFrom("Clipboard") },
{ mods = M.mod, key = "M", action = act.TogglePaneZoomState },
{ mods = M.mod, key = "v", action = act.PasteFrom("Clipboard") },
{
mods = M.mod,
key = "u",
action = act.CharSelect({ copy_on_select = true, copy_to = "ClipboardAndPrimarySelection" }),
},
-- { mods = M.mod, key = "v", action = act.ShowDebugOverlay },
{ mods = M.mod, key = "m", action = act.TogglePaneZoomState },
{ mods = M.mod, key = "p", action = act.ActivateCommandPalette },
{ mods = M.mod, key = "d", action = act.ShowDebugOverlay },
M.split_nav("resize", "CTRL", "LeftArrow", "Right"),
Expand Down
2 changes: 1 addition & 1 deletion config/wezterm/tabs.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
local wezterm = require("wezterm")
local wezterm = require("wezterm") --[[@as Wezterm]]

local M = {}
M.arrow_solid = ""
Expand Down
17 changes: 10 additions & 7 deletions config/wezterm/wezterm.lua
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
---@type Wezterm
local wezterm = require("wezterm")
local wezterm = require("wezterm") --[[@as Wezterm]]
local config = wezterm.config_builder()

wezterm.log_info("reloading")

require("tabs").setup(config)
require("mouse").setup(config)
require("links").setup(config)
require("keys").setup(config)

config.front_end = "WebGpu"
config.front_end = "OpenGL" -- current work-around for https://github.com/wez/wezterm/issues/4825
-- config.front_end = "WebGpu"
-- config.front_end = "OpenGL" -- current work-around for https://github.com/wez/wezterm/issues/4825
config.enable_wayland = true
config.webgpu_power_preference = "HighPerformance"
-- config.animation_fps = 1
Expand Down Expand Up @@ -44,7 +42,7 @@ if wezterm.target_triple:find("windows") then
end)
else
config.term = "wezterm"
config.window_decorations = "RESIZE"
config.window_decorations = "NONE"
end

-- Fonts
Expand Down Expand Up @@ -77,4 +75,9 @@ config.window_padding = { left = 0, right = 0, top = 0, bottom = 0 }
-- cell_width = 0.9,
config.scrollback_lines = 10000

return config --[[@as Wezterm]]
-- Command Palette
config.command_palette_font_size = 13
config.command_palette_bg_color = "#394b70"
config.command_palette_fg_color = "#828bb8"

return config
Loading

0 comments on commit 6828873

Please sign in to comment.