summaryrefslogtreecommitdiff
path: root/.config
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.config/alacritty/alacritty.toml28
-rw-r--r--.config/alacritty/catppuccin-mocha.toml76
-rw-r--r--.config/fontconfig/fonts.conf4
-rw-r--r--.config/hypr/hyprland.conf9
-rw-r--r--.config/hypr/hyprpaper.conf4
-rw-r--r--.config/mimeapps.list33
-rw-r--r--.config/nvim/lua/lsp.lua9
-rw-r--r--.config/nvim/lua/menu.lua28
-rw-r--r--.config/nvim/lua/vimopt.lua1
-rwxr-xr-x.config/sway/config6
-rw-r--r--.config/sway/config.d/keybinds8
-rw-r--r--.config/sway/config.d/theme6
-rw-r--r--.config/waybar/style.css2
13 files changed, 146 insertions, 68 deletions
diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml
new file mode 100644
index 0000000..9e3e925
--- /dev/null
+++ b/.config/alacritty/alacritty.toml
@@ -0,0 +1,28 @@
+import = ["/home/freya/.config/alacritty/catppuccin-mocha.toml"]
+
+[font]
+size = 11
+
+[font.bold]
+style = "Bold"
+
+[font.bold_italic]
+style = "Bold Italic"
+
+[font.italic]
+style = "Italic"
+
+[font.normal]
+family = "monospace"
+style = "Regular"
+
+[font.offset]
+x = 0
+y = 0
+
+[window]
+opacity = 0.85
+
+[window.padding]
+x = 10
+y = 10
diff --git a/.config/alacritty/catppuccin-mocha.toml b/.config/alacritty/catppuccin-mocha.toml
new file mode 100644
index 0000000..c75933b
--- /dev/null
+++ b/.config/alacritty/catppuccin-mocha.toml
@@ -0,0 +1,76 @@
+[colors.primary]
+background = "#1E1E2E"
+foreground = "#CDD6F4"
+dim_foreground = "#CDD6F4"
+bright_foreground = "#CDD6F4"
+
+[colors.cursor]
+text = "#1E1E2E"
+cursor = "#F5E0DC"
+
+[colors.vi_mode_cursor]
+text = "#1E1E2E"
+cursor = "#B4BEFE"
+
+[colors.search.matches]
+foreground = "#1E1E2E"
+background = "#A6ADC8"
+
+[colors.search.focused_match]
+foreground = "#1E1E2E"
+background = "#A6E3A1"
+
+[colors.footer_bar]
+foreground = "#1E1E2E"
+background = "#A6ADC8"
+
+[colors.hints.start]
+foreground = "#1E1E2E"
+background = "#F9E2AF"
+
+[colors.hints.end]
+foreground = "#1E1E2E"
+background = "#A6ADC8"
+
+[colors.selection]
+text = "#1E1E2E"
+background = "#F5E0DC"
+
+[colors.normal]
+black = "#45475A"
+red = "#F38BA8"
+green = "#A6E3A1"
+yellow = "#F9E2AF"
+blue = "#89B4FA"
+magenta = "#F5C2E7"
+cyan = "#94E2D5"
+white = "#BAC2DE"
+
+[colors.bright]
+black = "#585B70"
+red = "#F38BA8"
+green = "#A6E3A1"
+yellow = "#F9E2AF"
+blue = "#89B4FA"
+magenta = "#F5C2E7"
+cyan = "#94E2D5"
+white = "#A6ADC8"
+
+[colors.dim]
+black = "#45475A"
+red = "#F38BA8"
+green = "#A6E3A1"
+yellow = "#F9E2AF"
+blue = "#89B4FA"
+magenta = "#F5C2E7"
+cyan = "#94E2D5"
+white = "#BAC2DE"
+
+[[colors.indexed_colors]]
+index = 16
+color = "#FAB387"
+
+[[colors.indexed_colors]]
+index = 17
+color = "#F5E0DC"
+
diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf
index 4167bc3..2143c52 100644
--- a/.config/fontconfig/fonts.conf
+++ b/.config/fontconfig/fonts.conf
@@ -25,8 +25,8 @@
<alias>
<family>monospace</family>
<prefer>
- <family>Fira Mono</family>
- <family>Fira Mono Nerd Font</family>
+ <family>Fira Code</family>
+ <family>FiraCode Nerd Font Mono</family>
<family>Font Awesome 6 Pro Regular</family>
<family>Twemoji</family>
<family>DejaVu Sans Mono</family>
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 743fa37..c3542a7 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -1,18 +1,19 @@
-exec-once = dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP=Hyprland
+exec systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP GTK_THEME
+exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY GTK_THEME XDG_CURRENT_DESKTOP=Hyprland
$mod = SUPER
-$term = alacritty
+$term = kitty
$menu = wofi --allow-images --show drun --prompt "Search Program"
-$scale = 1.5
+$scale = 1.25
$radius = 5
$gaps = 10
$border = 3
-$browser = firefox
+$browser = librewolf
source = ~/.config/hypr/config.d/theme.conf
source = ~/.config/hypr/config.d/keybinds.conf
diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf
index 1bfca3c..9d20acb 100644
--- a/.config/hypr/hyprpaper.conf
+++ b/.config/hypr/hyprpaper.conf
@@ -1,2 +1,2 @@
-preload = ~/sync/wallpapers/nya0.png
-wallpaper = ,~/sync/wallpapers/nya0.png
+preload = ~/.config/desktop-common/wallpapers/blue.jpg
+wallpaper = ,~/.config/desktop-common/wallpapers/blue.jpg
diff --git a/.config/mimeapps.list b/.config/mimeapps.list
index 1e346ed..af70863 100644
--- a/.config/mimeapps.list
+++ b/.config/mimeapps.list
@@ -1,9 +1,9 @@
[Default Applications]
-text/html=firefox.desktop
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-x-scheme-handler/about=firefox.desktop
-x-scheme-handler/unknown=firefox.desktop
+text/html=librewolf.desktop
+x-scheme-handler/http=librewolf.desktop
+x-scheme-handler/https=librewolf.desktop
+x-scheme-handler/about=librewolf.desktop
+x-scheme-handler/unknown=librewolf.desktop
image/png=imv.desktop
image/jpeg=imv.desktop
image/webp=imv.desktop
@@ -29,26 +29,11 @@ text/x-moc=nvim.desktop
text/x-pascal=nvim.desktop
text/x-tcl=nvim.desktop
text/x-tex=nvim.desktop
-application/x-shellscript=nvim.desktop
text/x-c=nvim.desktop
text/x-c++=nvim.desktop
-application/gzip=org.gnome.Nautilus.desktop
-application/zip=org.gnome.Nautilus.desktop
-application/x-bzip2=org.gnome.Nautilus.desktop
-application/vnd.ms-opentype=org.gnome.Nautilus.desktop
-font/sfnt=org.gnome.Nautilus.desktop
-application/java-archive=org.gnome.Nautilus.desktop
-application/x-iso9660-image=org.gnome.Nautilus.desktop
-application/x-xz=org.gnome.Nautilus.desktop
application/x-zerosize=nvim.desktop
-x-scheme-handler/mailto=userapp-Thunderbird-Y667E2.desktop
-message/rfc822=userapp-Thunderbird-Y667E2.desktop
-x-scheme-handler/mid=userapp-Thunderbird-Y667E2.desktop
-x-scheme-handler/webcal=userapp-Thunderbird-9WQSA2.desktop
-text/calendar=userapp-Thunderbird-9WQSA2.desktop
-application/x-extension-ics=userapp-Thunderbird-9WQSA2.desktop
-x-scheme-handler/webcals=userapp-Thunderbird-9WQSA2.desktop
-x-scheme-handler/mspa=unofficial-homestuck-collection.desktop
+application/x-shellscript=nvim.desktop
+x-scheme-handler/msteams=teams.desktop
[Added Associations]
application/x-zerosize=nvim.desktop;
@@ -56,8 +41,8 @@ x-scheme-handler/mailto=userapp-Thunderbird-E9G491.desktop;userapp-Thunderbird-4
x-scheme-handler/mid=userapp-Thunderbird-E9G491.desktop;userapp-Thunderbird-4IZTA2.desktop;
x-scheme-handler/webcal=userapp-Thunderbird-9WQSA2.desktop;
x-scheme-handler/webcals=userapp-Thunderbird-9WQSA2.desktop;
-x-scheme-handler/mailto=userapp-Thunderbird-E9G491.desktop;userapp-Thunderbird-Y667E2.desktop;
+x-scheme-handler/mailto=userapp-Thunderbird-E9G491.desktop;userapp-Thunderbird-Y667E2.desktop;userapp-Thunderbird-2QYKF2.desktop;
message/rfc822=userapp-Thunderbird-E9G491.desktop;
-x-scheme-handler/mid=userapp-Thunderbird-E9G491.desktop;userapp-Thunderbird-Y667E2.desktop;
+x-scheme-handler/mid=userapp-Thunderbird-E9G491.desktop;userapp-Thunderbird-Y667E2.desktop;userapp-Thunderbird-2QYKF2.desktop;
x-scheme-handler/discord=discord.desktop;
x-scheme-handler/slack=slack.desktop;
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index c8c2512..56f1993 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/lsp.lua
@@ -69,11 +69,18 @@ require('lspconfig/prolog_lsp')
lsp.configure('prolog_lsp', {force_setup = true})
lsp.setup()
+require'lspconfig'.phpactor.setup{
+ on_attach = on_attach,
+ init_options = {
+ ["language_server_phpstan.enabled"] = false,
+ ["language_server_psalm.enabled"] = false,
+ }
+}
+
vim.diagnostic.config({
virtual_text = true
})
-
require("neodev").setup()
require("nvim-surround").setup()
require("toggleterm").setup()
diff --git a/.config/nvim/lua/menu.lua b/.config/nvim/lua/menu.lua
index ff8e1e3..e3e74bd 100644
--- a/.config/nvim/lua/menu.lua
+++ b/.config/nvim/lua/menu.lua
@@ -150,34 +150,6 @@ local cats = {
[[[bug] .*' / .*' ; .*`- +' `*' ]],
[[ `*-* `*-* `*-*']],
},
- {
- [[ .-o=o-.]],
- [[ , /=o=o=o=\ .--.]],
- [[ _|\|=o=O=o=O=| \]],
- [[ __.' a`\=o=o=o=(`\ /]],
- [[ '. a 4/`|.-""'`\ \ ;'`) .---.]],
- [[ \ .' / .--' |_.' / .-._)]],
- [[ `) _.' / /`-.__.' /]],
- [[ jgs `'-.____; /'-.___.-']],
- [[ `"""`]],
- },
- {
- [[ (`.]],
- [[ ) )]],
- [[ ( (]],
- [[ \ \]],
- [[ \ \]],
- [[ .-' `-.]],
- [[ / `.]],
- [[ ( ) `-._ , _]],
- [[ ) ,' (.\--'(]],
- [[ \ ( ) / \]],
- [[ \ \_( / ( <0 (0]],
- [[ \_)))\ ( `._ ::Y)__]],
- [[ ''' \ `-._.'`---^_)))]],
- [[ `-._ ))) ```]],
- [[ ``` hjw]],
- }
}
math.randomseed(os.time())
diff --git a/.config/nvim/lua/vimopt.lua b/.config/nvim/lua/vimopt.lua
index c415e31..1114a66 100644
--- a/.config/nvim/lua/vimopt.lua
+++ b/.config/nvim/lua/vimopt.lua
@@ -17,5 +17,6 @@ vim.filetype.add({
pattern = {
['.*%.pl'] = 'prolog',
['.*%.prolog'] = 'prolog',
+ ['.*%.php.m4'] = 'php',
}
})
diff --git a/.config/sway/config b/.config/sway/config
index a446972..6e6b86a 100755
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -6,7 +6,7 @@ exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY GTK_THEME XDG_
set $mod Mod4
# Set terminal
-set $term alacritty
+set $term kitty
# Set app launcher
set $menu wofi --allow-images --show=drun --prompt "Search Program"
@@ -27,10 +27,10 @@ set $blur_radius 10
set $blur_passes 3
# Set browser
-set $browser firefox
+set $browser librewolf
# Autostart apps
-exec $HOME/.config/sway/scripts.d/auto.sh
+exec $HOME/.config/desktop-common/scripts.d/auto.sh
# Local configs
include $HOME/.config/sway/config.d/*
diff --git a/.config/sway/config.d/keybinds b/.config/sway/config.d/keybinds
index 1bae11e..ba2609e 100644
--- a/.config/sway/config.d/keybinds
+++ b/.config/sway/config.d/keybinds
@@ -19,7 +19,7 @@ bindsym $mod+Shift+l exec $lock
bindsym Ctrl+Alt+Delete exec killall sway
# Power menu
-bindsym $mod+L exec killall wlogout || wlogout --css ~/.config/sway/logout.d/power/style.css -l ~/.config/sway/logout.d/power/layout
+bindsym $mod+L exec killall wlogout || wlogout --css ~/.config/desktop-common/logout.d/power/style.css -l ~/.config/desktop-common/logout.d/power/layout
# Drag floating windows by holding down $mod and left mouse button.
# Resize them with right mouse button + $mod.
@@ -54,5 +54,7 @@ bindsym Print exec grim - | wl-copy -t iamge/png && notify-send -t 3000 "Sway" "
bindsym Shift+Print exec slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy
# Michelsoft Binbows
-bindsym Ctrl+$mod+Shift+L exec firefox "https://linkedin.com"
-bindsym Ctrl+$mod+Shift+S exec alacritty -e sl
+bindsym Ctrl+$mod+Shift+L exec $browser "https://linkedin.com"
+bindsym Ctrl+$mod+Shift+S exec $term -e sl
+bindsym Ctrl+$mod+Shift+T exec electron25 "https://twitter.com"
+bindsym Ctrl+$mod+Shift+M exec electron25 "https://www.tumblr.com"
diff --git a/.config/sway/config.d/theme b/.config/sway/config.d/theme
index beb58d2..597b178 100644
--- a/.config/sway/config.d/theme
+++ b/.config/sway/config.d/theme
@@ -1,8 +1,14 @@
### Set borders
gaps inner $gaps
+<<<<<<< HEAD
for_window [class="^.*"] border pixel 2
default_border pixel 2
default_floating_border pixel 2
+=======
+for_window [class="^.*"] border pixel 0
+default_border pixel 0
+default_floating_border pixel 0
+>>>>>>> b688e13 (shinji)
### Colors
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index f084844..6deb5d7 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -14,7 +14,7 @@
*/
window#waybar {
- background-color: rgba(20, 23, 29, 0.85);
+ background-color: rgba(30, 30, 46, 0.85);
color: #c7c6c3;
}
generated by cgit v1.2.3-freya (git 2.51.0) at 2025-09-25 01:57:53 +0000