Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
Tue Dec  3 09:45:29 PM +04 2024

Tue Dec 10 06:25:51 PM +04 2024

Tue Dec 10 07:27:59 PM +04 2024

refactored luasnip

refactored gsettings

removed do not disturb mode

fixed a typo

refactored noice and changed cmdline to neovim's default bottom one.

disabled noice, refactored file names.

Fri Dec 13 06:52:15 PM +04 2024

refactored to LazyVim 14 and enabled noice.nvim

Sat Dec 14 01:06:07 PM +04 2024

Sat Dec 14 01:06:24 PM +04 2024

Sat Dec 14 01:08:12 PM +04 2024

Sat Dec 14 01:11:23 PM +04 2024

final refactor for today.

fixed a typo NOTE

removed un-needed dependency and refactored autocmds.lua

LazyVim v14 refactoring

Sun Dec 15 05:16:50 PM +04 2024

updated gitconfig and fzf-lua

Tue Dec 17 06:48:21 PM +04 2024

Update start.sh

Update start.sh

updated readme to put zsh installation BEFORE start.sh

refactored

Update packages_apt.sh

Update README.md

Update start.sh

Update .gitconfig

Update packages_flatpak.sh

Update _install.sh

Update start.sh
  • Loading branch information
monoira committed Dec 25, 2024
2 parents be4f920 + 84a3551 commit f34ac71
Show file tree
Hide file tree
Showing 26 changed files with 111 additions and 169 deletions.
43 changes: 26 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
and possibly more configurations
- zsh functions
- Various installation scripts
- VSCode settings and workspaces
- VSCode settings & workspaces

( I no longer use VSCode, even in this scripts, but keep the settings anyway )

Expand Down Expand Up @@ -67,16 +67,31 @@ install_scripts directory

## Installation

METHOD SPECIFIC REQUIREMENTS:
**install OhMyZsh**

- Must have ssh key and be signed in to Github with it
since this script uses git clone with ssh
```bash
sudo apt install -y zsh
```

```bash
sh -c "$(wget https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh -O -)"
```

```bash
git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
```

```bash
git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
```

**dotfiles installation**

```bash
wget -qO- https://raw.githubusercontent.com/monoira/.dotfiles/main/start.sh | bash
```

When scripts finish, reboot your system.
**When scripts finish, reboot your system.**

## Why are you using both snap and flatpak?

Expand Down Expand Up @@ -107,19 +122,13 @@ with non-snap versions and finally be snap-free.

## Manual tasks that can not be automated

- install OhMyZsh
- for vim-dadbod, create file ~/.config/nvim/lua/config/dbs.lua with such content

```bash
sh -c "$(wget https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh -O -)"
```

```bash
git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
```

```bash
git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
```
```lua
vim.g.dbs = {
{ name = "dev", url = "postgres://USERNAME:PASSWORD@HOST:PORT/DATABASE_NAME" },
}
```

- add [Vim extension to Dbeaver manually](https://www.youtube.com/watch?v=soznrFTtL2s)
- add a keyboard layout
Expand Down
10 changes: 2 additions & 8 deletions git/.gitconfig
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
[user]
name = Irakli_Tatarashvili
email = 116330974+[email protected].
name = monoira
email = [email protected]
[init]
defaultBranch = main
[credential "https://github.com"]
helper =
helper = !/usr/bin/gh auth git-credential
[credential "https://gist.github.com"]
helper =
helper = !/usr/bin/gh auth git-credential
3 changes: 3 additions & 0 deletions install_scripts/_install.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/env bash

# starting updates
sudo apt update -y && sudo apt upgrade -y && sudo snap refresh

bash ~/.dotfiles/install_scripts/flatpak.sh

bash ~/.dotfiles/install_scripts/packages_apt.sh
Expand Down
4 changes: 2 additions & 2 deletions install_scripts/gnome_settings.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ gsettings set org.gnome.shell.extensions.dash-to-dock show-trash false

# desktop icons size
gsettings set org.gnome.shell.extensions.ding icon-size 'small'

# hides home directory on desktop
gsettings set org.gnome.shell.extensions.ding show-home false

# NOTE: ubuntu specific settings
# disable update notifications
gsettings set com.ubuntu.update-notifier no-show-notifications true
# disables notification banners
gsettings set org.gnome.desktop.notifications show-banners true
3 changes: 2 additions & 1 deletion install_scripts/packages_apt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ sudo apt install -y nodejs
sudo apt install -y npm

sudo apt install -y alacritty
sudo apt install -y zsh
sudo apt install -y tmux

# packages needed for neovim
Expand All @@ -30,6 +29,8 @@ sudo apt install -y xclip
# clipboard for - wayland
sudo apt install -y wl-clipboard

# needed for mason's sqlfluff
sudo apt install -y python3.12-venv
echo "<--- installing general use apt packages... --->"

sudo apt install -y screenfetch
Expand Down
2 changes: 1 addition & 1 deletion install_scripts/packages_flatpak.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash

echo "<--- installing postman... --->"
flatpak install flathub --user -y com.getpostman.Postman
flatpak install flathub -y com.getpostman.Postman
1 change: 0 additions & 1 deletion install_scripts/packages_snap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ sudo ln -s "$HOME/.local/share/fonts" "$HOME/snap/figma-linux/current/.local/sha
sudo snap install --classic nvim

# purging garbage packages on ubuntu
sudo apt purge -y kate
sudo snap remove --purge snap-store
4 changes: 3 additions & 1 deletion install_scripts/vimv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
# NOTE: cargo required for vimv.
echo "<--- installing vimv... --->"

cargo install vimv
# The --locked flag ensures that Cargo uses the EXACT DEPENDENCY VERSIONS specified in the Cargo.lock file,
# ignoring updates. This ensures reproducible builds.
cargo install vimv --locked
sudo ln -sf ~/.cargo/bin/vimv /bin/vimv
4 changes: 2 additions & 2 deletions nvim/.config/nvim/init.lua
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
require("config.lazy")

-- NOTE: DATABASES
-- this is what it's content is supposed to look like
-- ~/.config/nvim/lua/config/dbs.lua content example
-- vim.g.dbs = {
-- { name = "dev", url = "postgres://<username>:<password>@<host>:<port>/<database>" },
-- { name = "dev", url = "postgres://USERNAME:PASSWORD@HOST:PORT/DATABASE_NAME" },
-- }
require("config.dbs")
12 changes: 12 additions & 0 deletions nvim/.config/nvim/lua/config/autocmds.lua
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
-- Autocmds are automatically loaded on the VeryLazy event
-- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
-- Add any additional autocmds here

-- HACK: this disables stupid "No information available" notification on every hover
-- ex: shift+k on Typescript code
local banned_messages = { "No information available" }
vim.notify = function(msg, ...)
for _, banned in ipairs(banned_messages) do
if msg == banned then
return
end
end
return msg, ...
end
4 changes: 0 additions & 4 deletions nvim/.config/nvim/lua/config/lazy.lua
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ require("lazy").setup({

{ import = "lazyvim.plugins.extras.util.project" },

{ import = "lazyvim.plugins.extras.editor.telescope" },

-- HACK: use lua snip until nvim-snippets gets better documentation.
-- unless nvim-snippets doesn't have vscode-snippets and is too complicated.
{ import = "lazyvim.plugins.extras.coding.luasnip" },

-- LATER: debugger
Expand Down
4 changes: 2 additions & 2 deletions nvim/.config/nvim/lua/config/options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ vim.o.undodir = "/tmp/.vim/.undodir"
-- disabling the swap file
vim.opt.swapfile = false

-- Highlight the current line
-- highlight the current line
vim.opt.cursorline = true

-- Enable 24-bit RGB colors
-- enable 24-bit RGB colors
vim.opt.termguicolors = true

-- HACK: manual root detection - if you change something here, also change it in project.nvim
Expand Down
File renamed without changes.
3 changes: 3 additions & 0 deletions nvim/.config/nvim/lua/plugins/3_disabled.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
return {
{ "folke/noice.nvim", enabled = false },
}
19 changes: 19 additions & 0 deletions nvim/.config/nvim/lua/plugins/fzf-lua.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
return {
"ibhagwan/fzf-lua",
config = function()
-- calling `setup` is optional for customization
require("fzf-lua").setup({
file_ignore_patterns = {
"node_modules/",
"dist/",
".next",
".git/",
".gitlab/",
"build/",
"target/",
"yarn.lock",
"package-lock.json",
},
})
end,
}
30 changes: 0 additions & 30 deletions nvim/.config/nvim/lua/plugins/init.lua

This file was deleted.

1 change: 0 additions & 1 deletion nvim/.config/nvim/lua/plugins/lualine.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
-- bottom line
return {
"nvim-lualine/lualine.nvim",
dependencies = { "nvim-tree/nvim-web-devicons" },
opts = function(_, opts)
opts.sections.lualine_z = {}
end,
Expand Down
9 changes: 8 additions & 1 deletion nvim/.config/nvim/lua/plugins/luasnip.lua
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
return {
"L3MON4D3/LuaSnip",
lazy = true,
dependencies = {
"rafamadriz/friendly-snippets",
config = function()
require("luasnip.loaders.from_vscode").lazy_load()
require("luasnip.loaders.from_vscode").lazy_load({ paths = "~/.config/nvim/snippets" })
end,
},
opts = {
history = true,
delete_check_events = "TextChanged",
},
require("luasnip.loaders.from_vscode").lazy_load({ paths = "~/.config/nvim/snippets" }),
}
13 changes: 0 additions & 13 deletions nvim/.config/nvim/lua/plugins/noice.lua

This file was deleted.

19 changes: 19 additions & 0 deletions nvim/.config/nvim/lua/plugins/nvim-highlight-colors.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
return {
"brenoprata10/nvim-highlight-colors",
config = function()
require("nvim-highlight-colors").setup({
---Render style
---@usage 'background'|'foreground'|'virtual'
render = "background",

---Set virtual symbol (requires render to be set to 'virtual')
virtual_symbol = "",

---Highlight named colors, e.g. 'green'
enable_named_colors = true,

---Highlight tailwind colors, e.g. 'bg-blue-500'
enable_tailwind = true,
})
end,
}
10 changes: 0 additions & 10 deletions nvim/.config/nvim/lua/plugins/project.lua
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,4 @@ return {
scope_chdir = "global",
datapath = vim.fn.stdpath("data"),
},
event = "VeryLazy",
config = function(_, opts)
require("project_nvim").setup(opts)
require("lazyvim.util").on_load("telescope.nvim", function()
require("telescope").load_extension("projects")
end)
end,
keys = {
{ "<leader>fp", "<Cmd>Telescope projects<CR>", desc = "Projects" },
},
}
72 changes: 0 additions & 72 deletions nvim/.config/nvim/lua/plugins/telescope.lua

This file was deleted.

Loading

0 comments on commit f34ac71

Please sign in to comment.