Skip to content

Commit 589429a

Browse files
committed
updates
1 parent e6cfd7f commit 589429a

22 files changed

+345
-61
lines changed

.tmux.conf

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
12
# remap prefix from 'C-b' to 'C-d'
23
unbind C-b
34
set-option -g prefix C-d
45
bind-key C-d send-prefix
56

6-
set -g default-terminal "screen-256color"
7+
set -g default-terminal screen-256color
8+
set-option -ga terminal-overrides ",xterm-256color:Tc"
79

810
# start window and pane indexing from 1
911
set -g base-index 1
@@ -19,6 +21,8 @@ set -g history-limit 10000
1921
set -g mouse on
2022
setw -g monitor-activity on
2123

24+
set-option -g focus-events on
25+
2226
# modified split key configuration
2327
bind-key i split-window -h
2428
bind-key - split-window -v
@@ -54,12 +58,12 @@ bind-key -n C-h if-shell "$is_vim" "send-keys C-h" "select-pane -L"
5458
bind-key -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D"
5559
bind-key -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U"
5660
bind-key -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R"
57-
bind-key -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"
61+
# bind-key -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"
5862
bind-key -T copy-mode-vi C-h select-pane -L
5963
bind-key -T copy-mode-vi C-j select-pane -D
6064
bind-key -T copy-mode-vi C-k select-pane -U
6165
bind-key -T copy-mode-vi C-l select-pane -R
62-
bind-key -T copy-mode-vi C-\ select-pane -l
66+
# bind-key -T copy-mode-vi C-\ select-pane -l
6367

6468
# copy in linux system clipboard
6569
bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
@@ -97,8 +101,8 @@ setw -g monitor-activity on
97101
set -g visual-activity on
98102

99103
# set color for status bar
100-
set-option -g status-style bg="#282828"
101-
set-option -g status-style fg=yellow #yellow
104+
#set-option -g status-style bg="#282828"
105+
#set-option -g status-style fg=yellow #yellow
102106
set-option -g status-style dim
103107

104108
# set window list colors - red for active and cyan for inactive

autocmd/javascript.xml

-5
This file was deleted.

i3/config

+12-8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
# This file has been auto-generated by i3-config-wizard(1).
23
# It will not be overwritten, so edit it as you like.
34
#
@@ -22,13 +23,14 @@ font pango:monospace 10
2223
floating_modifier $mod
2324

2425
# start a terminal
25-
bindsym $mod+Shift+Return exec st
26+
bindsym $mod+Shift+Return exec gnome-terminal
2627

2728
# kill focused window
2829
bindsym $mod+Shift+c kill
2930

3031
# start dmenu (a program launcher)
31-
bindsym $mod+p exec dmenu_run
32+
#bindsym $mod+p exec dmenu_run
33+
bindsym $mod+p exec rofi -show run
3234

3335
# change focus
3436
bindsym $mod+j focus left
@@ -151,8 +153,8 @@ bar {
151153
# Ozan
152154

153155
# wallpaper
154-
# exec --no-startup-id xsetroot -solid "#000000"
155-
exec --no-startup-id feh --bg-scale /home/ozanseymen/Downloads/Dark_debian_1920x1200.jpg
156+
# exec --no-startup-id feh --bg-fill /home/ozanseymen/Downloads/linux-debian.jpg
157+
exec --no-startup-id hsetroot -solid "#000000"
156158

157159
# app specific keyboard shortcuts
158160
bindsym $mod+o exec google-chrome --new-window --profile-directory="Default"
@@ -168,12 +170,14 @@ bindsym $mod+Shift+Ctrl+j exec i3-msg move workspace to output down
168170
bindsym $mod+Shift+Ctrl+h exec i3-msg move workspace to output left
169171
bindsym $mod+Shift+Ctrl+l exec i3-msg move workspace to output right
170172

171-
# i3-gaps
173+
# gaps
172174
for_window [class=".*"] border pixel 2
173175

174-
# gaps inner 15
175-
# gaps outer 15
176-
bindsym $mod+Shift+t gaps inner current set 15; gaps outer current set 15
176+
gaps inner 10px
177+
gaps outer 5px
178+
smart_gaps on
179+
180+
bindsym $mod+Shift+t gaps inner current set 10; gaps outer current set 5
177181
bindsym $mod+Shift+f gaps inner current set 0; gaps outer current set 0
178182
bindsym $mod+g gaps inner current plus 5
179183
bindsym $mod+Shift+g gaps inner current minus 5

i3/i3blocks.conf

-42
This file was deleted.

i3status/config

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ battery all {
4343
}
4444

4545
tztime local {
46-
format = "%Y-%m-%d %H:%M:%S"
46+
format = "%d/%m/%Y %H:%M:%S"
4747
}
4848

4949
load {

i3status/config_old

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# i3status configuration file.
2+
# see "man i3status" for documentation.
3+
4+
# It is important that this file is edited as UTF-8.
5+
# The following line should contain a sharp s:
6+
# ß
7+
# If the above line is not correctly displayed, fix your editor first!
8+
#
9+
#
10+
11+
12+
13+
14+
#
15+
# I've copied this file from /etc/i3status.conf
16+
17+
general {
18+
colors = true
19+
interval = 5
20+
}
21+
22+
# order += "ipv6"
23+
# order += "disk /"
24+
order += "wireless _first_"
25+
# order += "ethernet _first_"
26+
order += "battery all"
27+
order += "load"
28+
order += "tztime local"
29+
30+
wireless _first_ {
31+
format_up = "W: (%quality at %essid)"
32+
format_down = "W: down"
33+
}
34+
35+
ethernet _first_ {
36+
# if you use %speed, i3status requires root privileges
37+
format_up = "E: %ip (%speed)"
38+
format_down = "E: down"
39+
}
40+
41+
battery all {
42+
format = "%status %percentage %remaining"
43+
}
44+
45+
tztime local {
46+
format = "%Y-%m-%d %H:%M:%S"
47+
}
48+
49+
load {
50+
format = "%1min"
51+
}
52+
53+
disk "/" {
54+
format = "%avail"
55+
}

nvim/.luarc.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"diagnostics.globals": [
3+
"vim"
4+
]
5+
}

nvim/after/plugin/catppuccin.lua

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
-- load catppuccin
2+
require("catppuccin").setup({
3+
flavour = "mocha", -- latte, frappe, macchiato, mocha
4+
})
5+
6+
vim.cmd.colorscheme "catppuccin"

nvim/after/plugin/comment.lua

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
require('Comment').setup()

nvim/after/plugin/completions.lua

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
local cmp = require'cmp'
2+
3+
cmp.setup({
4+
snippet = {
5+
expand = function(args)
6+
require('luasnip').lsp_expand(args.body)
7+
end,
8+
},
9+
window = {
10+
completion = cmp.config.window.bordered(),
11+
documentation = cmp.config.window.bordered(),
12+
},
13+
mapping = cmp.mapping.preset.insert({
14+
['<C-b>'] = cmp.mapping.scroll_docs(-4),
15+
['<C-f>'] = cmp.mapping.scroll_docs(4),
16+
['<C-Space>'] = cmp.mapping.complete(),
17+
['<C-e>'] = cmp.mapping.abort(),
18+
['<CR>'] = cmp.mapping.confirm({ select = true }),
19+
}),
20+
sources = cmp.config.sources({
21+
{ name = 'nvim_lsp' },
22+
{ name = 'luasnip' }, -- For luasnip users.
23+
}, {
24+
{ name = 'buffer' },
25+
})
26+
})
27+
28+
require("luasnip.loaders.from_vscode").lazy_load()

nvim/after/plugin/git.lua

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
require('gitsigns').setup()
2+
3+
vim.keymap.set('n', '<leader>gp', ':Gitsigns preview_hunk<CR>', {})

nvim/after/plugin/lsp.lua

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
-- :LspInfo in any buffer will show you what lsp servers are connected to that buffer
2+
3+
-- setup language servers
4+
require("mason").setup()
5+
require("mason-lspconfig").setup({
6+
-- list of all lsp servers:
7+
-- https://github.com/williamboman/mason-lspconfig.nvim?tab=readme-ov-file#available-lsp-servers
8+
ensure_installed = {
9+
"lua_ls",
10+
"rust_analyzer"
11+
}
12+
})
13+
14+
-- setup language clients
15+
-- to add support for another language, add the language under `ensure_installed`
16+
-- and do lspconfig.xyz.setup({})
17+
local lspconfig = require("lspconfig")
18+
19+
-- lsp keybinding configuration
20+
-- https://github.com/neovim/nvim-lspconfig?tab=readme-ov-file#suggested-configuration
21+
vim.keymap.set('n', '<leader>lh', vim.lsp.buf.hover, {})
22+
vim.keymap.set('n', '<leader>ld', vim.lsp.buf.definition, {})
23+
vim.keymap.set('n', '<leader>la', vim.lsp.buf.code_action, {})
24+
25+
local capabilities = require('cmp_nvim_lsp').default_capabilities()
26+
27+
-- setting for lua
28+
lspconfig.lua_ls.setup({capabilities = capabilities})
29+
lspconfig.rust_analyzer.setup({capabilities = capabilities})

nvim/after/plugin/neotree.lua

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
vim.keymap.set('n', '<leader>n', ':Neotree toggle<CR>', {})

nvim/after/plugin/telescope.lua

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
local telescope = require('telescope')
2+
local builtin = require('telescope.builtin')
3+
4+
telescope.setup {
5+
defaults = {
6+
file_ignore_patterns = {
7+
"target"
8+
}
9+
},
10+
extensions = {
11+
["ui-select"] = {
12+
require("telescope.themes").get_dropdown {}
13+
}
14+
}
15+
}
16+
17+
require("telescope").load_extension("ui-select")
18+
19+
-- configure key bindings
20+
vim.keymap.set('n', '<C-p>', builtin.find_files, {})
21+
vim.keymap.set('n', '<leader>s', builtin.live_grep, {})
22+
-- vim.keymap.set('n', '<leader>s', function()
23+
-- builtin.grep_string({ search = vim.fn.input("Grep > ") });
24+
-- end)

nvim/after/plugin/treesitter.lua

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
local config = require("nvim-treesitter.configs")
2+
3+
config.setup({
4+
auto_install = true
5+
})

nvim/init.lua

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
require("ozan")

nvim/lazy-lock.json

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
3+
"LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" },
4+
"catppuccin": { "branch": "main", "commit": "c2034f7b549152e5cc757820426341ea5000bc7a" },
5+
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
6+
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
7+
"friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" },
8+
"gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
9+
"lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
10+
"mason-lspconfig.nvim": { "branch": "main", "commit": "2b3d247fce06f53934174f5dfe0362c42d65c00c" },
11+
"mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
12+
"neo-tree.nvim": { "branch": "v3.x", "commit": "e578fe7a5832421b0d2c5b3c0a7a1e40e0f6a47a" },
13+
"nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" },
14+
"nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
15+
"nvim-lspconfig": { "branch": "master", "commit": "9a6279953c82d01b58825a46ede032ab246a5983" },
16+
"nvim-treesitter": { "branch": "master", "commit": "4fbf150a1621d52f17b099506e1a32f107079210" },
17+
"nvim-web-devicons": { "branch": "master", "commit": "aaec87dbdaa776bfa0a13c8694bec9bcb7454719" },
18+
"plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
19+
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
20+
"telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
21+
"vim-buftabline": { "branch": "master", "commit": "73b9ef5dcb6cdf6488bc88adb382f20bc3e3262a" },
22+
"vim-fugitive": { "branch": "master", "commit": "e7bf502a6ae492f42a91d231864e25630286319b" },
23+
"vim-tmux-navigator": { "branch": "master", "commit": "38b1d0402c4600543281dc85b3f51884205674b6" }
24+
}

nvim/lua/ozan/init.lua

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
require("ozan.remap")
2+
require("ozan.set")
3+
require("ozan.lazy")

0 commit comments

Comments
 (0)