Merge pull request 'Update .zshrc' (#1) from tphilippot-patch-1 into feat/noctalia

Reviewed-on: #1

.config/bat/config

@@ -1 +1 @@
---theme="Catppuccin Macchiato"
+--theme=noctalia

.config/hypr/custom/keybinds.lua

@@ -1 +1 @@
--- User-specific keybindings. Loaded after hyprland/keybinds.lua.
+-- User-specific keybinds. Loaded after hyprland/keybinds.lua.

.config/hypr/custom/monitors.lua

@@ -2,3 +2,5 @@
 
 hl.monitor({ output = "eDP-1", mode = "2256x1504@60", position = "auto", scale = 1.33, bitdepth = 10, vrr = 1 })
 hl.monitor({ output = "DP-3", mode = "3440x1440@99", position = "auto", scale = 1, bitdepth = 10, vrr = 1 })
+hl.monitor({ output = "DP-4", mode = "4096x2160@120", position = "auto", scale = 1.33, bitdepth = 10, vrr = 1 })
+

.config/hypr/custom/windowrules.lua

@@ -1 +1,2 @@
--- User-specific window rules. Loaded after hyprland/windowrules.lua.
+-- User-specific windowrules. Loaded after hyprland/windowrules.lua.
+require("custom/windowrules/godot")

.config/hypr/custom/windowrules/godot.lua

@@ -0,0 +1,51 @@
+-- Godot application windowrules --
+
+hl.window_rule({
+	name = "Resize Godot confirmation dialogs",
+	match = {
+		class = "org.godotengine.Editor",
+		float = true,
+	},
+	size = { "monitor_w * 0.15", "monitor_h * 0.1" },
+	center = true,
+})
+
+hl.window_rule({
+    name = "Resize New node dialog",
+    match = {
+        class = "org.godotengine.Editor",
+        title = "Créer un nouveau Node",
+    },
+    size = { 1000, 750 },
+})
+
+hl.window_rule({
+    name = "Resize Region edit dialog",
+    match = {
+        class = "org.godotengine.Editor",
+        title = "Éditeur de régions",
+    },
+    size = { 1500, 1000 },
+})
+
+hl.window_rule({
+    name = "Resize Region edit dialog",
+    match = {
+        class = "org.godotengine.Editor",
+        title = "Sélectionner une scène",
+    },
+    size = { 550, 450 },
+})
+
+
+
+hl.window_rule({
+	name = "Floating DEBUG window",
+	match = {
+		class = "org.godotengine.Editor",
+		title = ".*DEBUG.*",
+	},
+	size = { 1280, 720 },
+	float = true,
+	center = true,
+})

.config/hypr/custom/workspacerules.lua

@@ -0,0 +1,4 @@
+hl.workspace_rule({ workspace = "1", monitor = "eDP-1", persistent = true, default_name = "web" })
+--hl.workspace_rule({ workspace = "2", monitor = "eDP-1", persistent = true, default_name = "code" })
+-- hl.workspace_rule({ workspace = "3", monitor = "eDP-1", persistent = true, default_name = "chat" })
+-- hl.workspace_rule({ workspace = "4", monitor = "eDP-1", persistent = true, default_name = "game" })

.config/hypr/hyprland.lua

@@ -24,7 +24,7 @@ require("custom/environments")
 require("custom/inputs")
 require("custom/keybinds")
 require("custom/windowrules")
+require("custom/workspacerules")
 
--- Noctalia generates a hyprlang colours file; load it last so it overrides above.
+-- For Noctalia Color templates
--- dofile() because it is a .conf, not a Lua module.
+require("noctalia").apply_theme()
--- dofile(os.getenv("HOME") .. "/.config/hypr/noctalia/noctalia-colors.conf")

.config/hypr/hyprland/autostart.lua

@@ -2,5 +2,5 @@
 -- Shared defaults — do not edit. Add user-specific autostart in custom/autostart.lua.
 
 hl.on("hyprland.start", function()
-  hl.exec_cmd("qs -c noctalia-shell")
+  hl.exec_cmd("noctalia")
 end)

.config/hypr/hyprland/keybinds.lua

@@ -4,31 +4,45 @@
 local mainMod = "SUPER"
 local terminal = "kitty"
 local fileMgr = "nautilus"
-local ipc      = "qs -c noctalia-shell ipc call"
+local ipc = "noctalia msg"
 
 hl.bind("CTRL + ALT + T", hl.dsp.exec_cmd(terminal))
-hl.bind(mainMod .. " + SPACE", hl.dsp.exec_cmd(ipc .. " launcher toggle"))
 hl.bind(mainMod .. " + C", hl.dsp.window.close())
 hl.bind(mainMod .. " + M", hl.dsp.exit())
 hl.bind(mainMod .. " + E", hl.dsp.exec_cmd(fileMgr))
 hl.bind(mainMod .. " + V", hl.dsp.window.float({ action = "toggle" }))
-hl.bind(mainMod .. " + F",     hl.dsp.window.fullscreen({ state = "toggle" }))
+hl.bind(mainMod .. " + F", hl.dsp.window.fullscreen({ mode = "maximized", state = "toggle" }))
+hl.bind(mainMod .. " + CTRL + F", hl.dsp.window.fullscreen({ mode = "fullscreen", state = "toggle" }))
 hl.bind(mainMod .. " + P", hl.dsp.window.pseudo())
 hl.bind(mainMod .. " + U", hl.dsp.layout("togglesplit"))
 hl.bind(mainMod .. " + H", hl.dsp.layout("swapsplit"))
 
 -- Focus: arrow keys + IJKL
 for _, m in ipairs({
-  { "left",  "l" }, { "right", "r" }, { "up", "u" }, { "down", "d" },
+	{ "left", "l" },
-  { "J",     "l" }, { "L",     "r" }, { "I",  "u" }, { "K",    "d" },
+	{ "right", "r" },
+	{ "up", "u" },
+	{ "down", "d" },
+	{ "J", "l" },
+	{ "L", "r" },
+	{ "I", "u" },
+	{ "K", "d" },
 }) do
 	hl.bind(mainMod .. " + " .. m[1], hl.dsp.focus({ direction = m[2] }))
 end
 
 -- Workspaces 1..10: digit + AZERTY keysym, plus SHIFT to move active window
 local azerty = {
-  "ampersand", "eacute", "quotedbl", "apostrophe", "parenleft",
+	"ampersand",
-  "minus",     "egrave", "underscore", "ccedilla",  "agrave",
+	"eacute",
+	"quotedbl",
+	"apostrophe",
+	"parenleft",
+	"minus",
+	"egrave",
+	"underscore",
+	"ccedilla",
+	"agrave",
 }
 for i = 1, 10 do
 	local digit = (i == 10) and "0" or tostring(i)
@@ -68,13 +82,18 @@ for _, b in ipairs({
 end
 
 -- Screenshot
-hl.bind("Print",        hl.dsp.exec_cmd("hyprshot -m region"), { locked = true })
+-- hl.bind("Print", hl.dsp.exec_cmd("hyprshot -m region"), { locked = true })
-hl.bind("CTRL + Print", hl.dsp.exec_cmd("hyprshot -m output -m active"), { locked = true })
+-- hl.bind("CTRL + Print", hl.dsp.exec_cmd("hyprshot -m output -m active"), { locked = true })
 
 hl.bind("XF86Calculator", hl.dsp.exec_cmd("gnome-calculator"))
 
 -- Noctalia IPC
-hl.bind(mainMod .. " + T",         hl.dsp.exec_cmd(ipc .. " darkMode toggle"))
+hl.bind(mainMod .. " + SPACE", hl.dsp.exec_cmd(ipc .. " panel-toggle launcher"))
-hl.bind(mainMod .. " + W",         hl.dsp.exec_cmd(ipc .. " wallpaper toggle"))
+hl.bind(mainMod .. " + S", hl.dsp.exec_cmd(ipc .. " panel-toggle control-center"))
-hl.bind(mainMod .. " + SHIFT + L", hl.dsp.exec_cmd(ipc .. " lockScreen lock"))
+hl.bind(mainMod .. " + T", hl.dsp.exec_cmd(ipc .. " theme-mode-toggle"))
-hl.bind("switch:Lid Switch", hl.dsp.exec_cmd(ipc .. " lockScreen lock"), { locked = true })
+hl.bind(mainMod .. " + W", hl.dsp.exec_cmd(ipc .. " panel-toggle noctalia/wallhaven:browser"))
+hl.bind(mainMod .. " + SHIFT + L", hl.dsp.exec_cmd(ipc .. " session lock"))
+hl.bind("switch:Lid Switch", hl.dsp.exec_cmd(ipc .. " session lock"), { locked = true })
+hl.bind(mainMod .. " + R", hl.dsp.exec_cmd(ipc .. " plugin noctalia/screen_recorder:service all toggle"))
+hl.bind("Print", hl.dsp.exec_cmd(ipc .. " screenshot-region"), { locked = true })
+hl.bind("CTRL + Print", hl.dsp.exec_cmd(ipc .. " screenshot-fullscreen pick"))

.config/hypr/hyprland/windowrules.lua

@@ -10,7 +10,7 @@ hl.window_rule({
 hl.window_rule({
 	name = "kitty-term",
 	match = { class = "kitty" },
-  size = "(monitor_w*0.50) (monitor_h*0.47)",
+	size = "995 600",
 	float = true,
 	center = true,
 })
@@ -18,8 +18,8 @@ hl.window_rule({
 hl.window_rule({
 	name = "floating-messages",
 	match = { class = "(signal|org.telegram.desktop)" },
-  size = "(monitor_w*0.27) (monitor_h*0.7)",
+	size = "425 790",
-  move = "(monitor_w*0.70) (monitor_h*0.15)",
+	move = "(monitor_w*0.72) (monitor_h*0.15)",
 	float = true,
 	pin = true,
 })

.config/kitty/current-theme.conf

@@ -1,30 +0,0 @@
-color0 #51576d
-color1 #e78284
-color2 #a6d189
-color3 #e5c890
-color4 #8caaee
-color5 #f4b8e4
-color6 #81c8be
-color7 #a5adce
-color8 #626880
-color9 #e67172
-color10 #8ec772
-color11 #d9ba73
-color12 #7b9ef0
-color13 #f2a4db
-color14 #5abfb5
-color15 #b5bfe2
-background #303446
-selection_foreground #c6d0f5
-cursor #f2d5cf
-cursor_text_color #303446
-foreground #c6d0f5
-selection_background #626880
-active_border_color #1e66f5
-inactive_border_color #ea76cb
-
-active_tab_foreground   #eff1f5
-active_tab_background   #1e66f5
-inactive_tab_foreground #6c6f85
-inactive_tab_background #ccd0da
-cursor_trail_color      #6c6f85

.config/kitty/kitty.conf

@@ -1,5 +1,3 @@
-include ~/.config/kitty/themes/noctalia.conf
-
 font_family FiraCode Nerd Font
 bold_font        auto
 italic_font      auto
@@ -9,6 +7,7 @@ font_size 12.0
 window_padding_width 4
 
 enable_audio_bell = no
+remember_window_size no
 cursor_trail 10
 
 tab_bar_min_tabs  1
@@ -20,9 +19,4 @@ tab_powerline_style slanted
 # wayland_titlebar_color system
 # macos_titlebar_color system
 
-
+include themes/noctalia.conf
-
-# BEGIN_KITTY_THEME
-# Noctalia
-include current-theme.conf
-# END_KITTY_THEME

.config/superfile/config.toml

@@ -1,92 +0,0 @@
-# More details are at https://superfile.netlify.app/configure/superfile-config/
-#
-# change your theme
-theme = 'catppuccin-macchiato'
-# 
-# The editor files will be opened with. (Leave blank to use the EDITOR environment variable).
-editor = ""
-# 
-# The editor directories will be opened with. (Leave blank to use the default editors).
-dir_editor = ""
-#
-# Auto check for update
-auto_check_update = true
-# 
-# Cd on quit (For more details, please check out https://superfile.netlify.app/configure/superfile-config/#cd_on_quit)
-cd_on_quit = false
-#
-# Whether to open file preview automatically every time superfile is opened.
-default_open_file_preview = true
-#
-# Whether to show image preview
-show_image_preview = true
-# 
-#
-# Whether to hide additional footer info for file panel.
-show_panel_footer_info = true
-#
-# The path of the first file panel when superfile is opened.
-default_directory = "."
-#
-# Display file sizes using powers of 1000 (kB, MB, GB) instead of powers of 1024 (KiB, MiB, GiB).
-file_size_use_si = false
-#
-# Default sort type (0: Name, 1: Size, 2: Date Modified, 3: Type).
-default_sort_type = 0
-#
-# Default sort order (false: Ascending, true: Descending).
-sort_order_reversed = false
-#
-# Case sensitive sort by name (upper "B" comes before lower "a" if true).
-case_sensitive_sort = false
-#
-# Whether to exit the shell on successful command execution.
-shell_close_on_success = false
-#
-# Whether to enable debug mode.
-debug = false
-#
-# Whether to ignore warnings about missing fields in the config file.
-ignore_missing_fields = false
-#
-# ================   Style =================
-#
-# Whether to use the builtin syntax highlighting with chroma or use bat. Values: "" for builtin chroma, "bat" for bat
-code_previewer = ''
-# 
-# If you don't have or don't want Nerdfont installed you can turn this off
-nerdfont = true
-#
-# Set transparent background or not (this only work when your terminal background is transparent)
-transparent_background = false
-# 
-# File preview width allow '0' (this mean same as file panel),'x' x must be from 2 to 10 (This means that the width of the file preview will be one xth of the total width.)
-file_preview_width = 0
-#
-# The length of the sidebar. If you don't want to display the sidebar, you can input 0 directly. If you want to display the value, please place it in the range of 3-20.
-sidebar_width = 20
-#
-# Border style
-# Make sure to add strings exactly one character wide. Use ' ' for borderless 
-border_top = '─'
-border_bottom = '─'
-border_left = '│'
-border_right = '│'
-border_top_left = '╭'
-border_top_right = '╮'
-border_bottom_left = '╰'
-border_bottom_right = '╯'
-border_middle_left = '├'
-border_middle_right = '┤'
-# 
-# ========== PLUGINS ========== #
-# Plugins means that you need to install some external dependencies to use them.
-# 
-# Show more detailed metadata, please install exiftool before enabling this plugin!
-metadata = false
-#
-# Enable MD5 checksum generation for files
-enable_md5_checksum = false
-#
-# Zoxide support for the fast navigation
-zoxide_support = true

.config/superfile/hotkeys.toml

@@ -1,59 +0,0 @@
-# =================================================================================================
-# Global hotkeys (cannot conflict with other hotkeys)
-confirm = ['enter', 'right', 'l']
-quit = ['q', 'esc']
-
-# movement
-list_up = ['up', 'k']
-list_down = ['down', 'j']
-page_up = ['pgup','']
-page_down = ['pgdown','']
-# file panel control
-create_new_file_panel = ['n', '']
-close_file_panel = ['w', '']
-next_file_panel = ['tab', 'L']
-previous_file_panel = ['shift+left', 'H']
-toggle_file_preview_panel = ['f', '']
-open_sort_options_menu = ['o', '']
-toggle_reverse_sort = ['R', '']
-# change focus
-focus_on_process_bar = ['p', '']
-focus_on_sidebar = ['s', '']
-focus_on_metadata = ['m', '']
-# create file/directory and rename
-file_panel_item_create = ['ctrl+n', '']
-file_panel_item_rename = ['ctrl+r', '']
-# file operations
-copy_items = ['ctrl+c', '']
-cut_items = ['ctrl+x', '']
-paste_items = ['ctrl+v', 'ctrl+w', '']
-delete_items = ['ctrl+d', 'delete', '']
-# compress and extract
-extract_file = ['ctrl+e', '']
-compress_file = ['ctrl+a', '']
-# editor
-open_file_with_editor = ['e', '']
-open_current_directory_with_editor = ['E', '']
-# other
-pinned_directory = ['P', '']
-toggle_dot_file = ['.', '']
-change_panel_mode = ['v', '']
-open_help_menu = ['?', '']
-open_command_line = [':', '']
-open_spf_prompt = ['>', '']
-copy_path = ['ctrl+p', '']
-copy_present_working_directory = ['c', '']
-toggle_footer = ['F', '']
-# =================================================================================================
-# Typing hotkeys (can conflict with all hotkeys)
-confirm_typing = ['enter', '']
-cancel_typing = ['ctrl+c', 'esc']
-# =================================================================================================
-# Normal mode hotkeys (can conflict with other modes, cannot conflict with global hotkeys)
-parent_directory = ['h', 'left', 'backspace']
-search_bar = ['/', '']
-# =================================================================================================
-# Select mode hotkeys (can conflict with other modes, cannot conflict with global hotkeys)
-file_panel_select_mode_items_select_down = ['shift+down', 'J']
-file_panel_select_mode_items_select_up = ['shift+up', 'K']
-file_panel_select_all_items = ['A', '']

.config/zed/settings.json

@@ -1,33 +0,0 @@
-// Zed settings
-//
-// For information on how to configure Zed, see the Zed
-// documentation: https://zed.dev/docs/configuring-zed
-//
-// To see all of Zed's default settings without changing your
-// custom settings, run `zed: open default settings` from the
-// command palette (cmd-shift-p / ctrl-shift-p)
-{
-  "git": {
-    "inline_blame": {
-      "show_commit_summary": false,
-      "padding": 20,
-      "enabled": false
-    }
-  },
-  "edit_predictions": {
-    "allow_data_collection": "no"
-  },
-  "icon_theme": "Catppuccin Mocha",
-  "project_panel": {
-    "dock": "left"
-  },
-  "pane_split_direction_vertical": "right",
-  "base_keymap": "JetBrains",
-  "ui_font_size": 16,
-  "buffer_font_size": 15,
-  "theme": {
-    "mode": "system",
-    "light": "Noctalia Light",
-    "dark": "Noctalia Dark",
-  },
-}

.zshrc

@@ -11,7 +11,6 @@ export FZF_DEFAULT_OPTS=" \
 --color=selected-bg:#494D64 \
 --color=border:#6E738D,label:#CAD3F5"
 
-
 # Set name of the theme to load --- if set to "random", it will
 # load a random theme each time Oh My Zsh is loaded, in which case,
 # to know which specific one was loaded, run: echo $RANDOM_THEME
@@ -105,7 +104,7 @@ source ~/.config/zsh/config
 export EDITOR="nvim"
 
 # GPG Key - uncommunt if needed
-#export GPG_TTY=$(tty)
+export GPG_TTY=$(tty)
 
 # Compilation flags
 # export ARCHFLAGS="-arch $(uname -m)"
@@ -124,4 +123,4 @@ export EDITOR="nvim"
 source ~/.config/zsh/aliases
 
 eval "$(zoxide init --cmd cd zsh)"
-eval "$(/home/thomas/.local/bin/mise activate zsh --shims)"
+eval "$(~/.local/bin/mise activate zsh --shims)"

README.md

@@ -54,7 +54,7 @@ user the <kbd>SUPER</kbd> + <kbd>T</kbd> shortcut to switch between light and da
 
 ### Issues
 
-bat might not apply the catppuccin theme at launch, because you need to rebuild it's cache.
+bat might not apply the catppuccin theme at launch, because you need to rebuild it's cache
 
 ```
 bat cache --build