From 821f16167c256be76dfee90b9caff9abc1531799 Mon Sep 17 00:00:00 2001
From: Petro Mozil <mozil.petryk@gmail.com>
Date: Wed, 8 May 2024 20:08:56 +0300
Subject: [PATCH] Fix sway screen sharing

Signed-off-by: Petro Mozil <mozil.petryk@gmail.com>
---
 data/bashrc                   | 16 ++++++++++------
 data/nvim/configs/conform.lua |  2 +-
 data/nvim/plugins/init.lua    | 14 +++++++-------
 data/vimrc                    |  6 +++---
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/data/bashrc b/data/bashrc
index b21c0b4..154a877 100644
--- a/data/bashrc
+++ b/data/bashrc
@@ -2,15 +2,16 @@
 # ~/.bashrc
 #
 
+# If not running interactively, don't do anything
+[[ $- != *i* ]] && return
+
+shopt -s autocd
+
 function smart_cd() {
     if [[ $# -eq 1 ]]; then mkdir -p $1; fi
     cd $1
 }
 
-# If not running interactively, don't do anything
-[[ $- != *i* ]] && return
-
-shopt -s autocd
 
 # Aliases
 alias doas="doas --"
@@ -35,16 +36,19 @@ YELLOW="\[\033[1;33m\]"
 PS1="[\u@\h $YELLOW\W$NORMAL]$ $RESET"
 
 # Exports
+export ALL_JOBS="-j $(($(nproc) + 1))"
 export LIBSEAT_BASKEND=logind
 export GTK_THEME="gruveye"
 export LANG=en_US.UTF-8
 export PATH=$PATH:$HOME/.local/bin/:$HOME/.local/bin/scripts/:$HOME/.cargo/bin/
 export CARGO_NET_GIT_FETCH_WITH_CLI="true"
 export EDITOR=vim
-export MOZ_ENABLE_WAYLAND=1
 export GDK_BACKEND=wayland
 export XDG_RUNTIME_DIR=/run/user/$(id -u)
-export XDG_CURRENT_DESKTOP=Unity
+
+export XDG_SESSION_TYPE=wayland
+export XDG_CURRENT_DESKTOP="${XDG_CURRENT_DESKTOP:-sway}"
+export MOZ_ENABLE_WAYLAND=1
 
 mkdir -p $XDG_RUNTIME_DIR
 chmod 0700 $XDG_RUNTIME_DIR
diff --git a/data/nvim/configs/conform.lua b/data/nvim/configs/conform.lua
index 8a8f261..e4ac835 100644
--- a/data/nvim/configs/conform.lua
+++ b/data/nvim/configs/conform.lua
@@ -1,5 +1,5 @@
 require("conform").formatters["clang-format"] = {
-    -- command = "clang-gormat",
+    command = "clang-gormat",
     prepend_args = { "-style=file:" .. os.getenv("HOME") .. "/.config/clang-format/conf" },
 }
 
diff --git a/data/nvim/plugins/init.lua b/data/nvim/plugins/init.lua
index f3c94b8..d1b991f 100644
--- a/data/nvim/plugins/init.lua
+++ b/data/nvim/plugins/init.lua
@@ -1,11 +1,11 @@
 return {
-    {
-        "stevearc/conform.nvim",
-        event = { "BufReadPre", "BufNewFile" },
-        config = function()
-            require "configs.conform"
-        end,
-    },
+    -- {
+    --     "stevearc/conform.nvim",
+    --     event = { "BufReadPre", "BufNewFile" },
+    --     config = function()
+    --         require "configs.conform"
+    --     end,
+    -- },
 
     -- These are some examples, uncomment them if you want to see them work!
     -- {
diff --git a/data/vimrc b/data/vimrc
index a01173a..55c4818 100644
--- a/data/vimrc
+++ b/data/vimrc
@@ -81,7 +81,7 @@ set cinoptions=(0
 " Allow tabs in Makefiles.
 autocmd FileType make,automake set noexpandtab shiftwidth=8 softtabstop=8
 " Trailing whitespace and tabs are forbidden, so highlight them.
-" highlight ForbiddenWhitespace ctermbg=red guibg=red
-" match ForbiddenWhitespace /\s\+$\|\t/
+highlight ForbiddenWhitespace ctermbg=red guibg=red
+match ForbiddenWhitespace /\s\+$\|\t/
 " Do not highlight spaces at the end of line while typing on that line.
-" autocmd InsertEnter * match ForbiddenWhitespace /\t\|\s\+\%#\@<!$/
+autocmd InsertEnter * match ForbiddenWhitespace /\t\|\s\+\%#\@<!$/