.

9 files changed, 176 insertions, 88 deletions

diff --git a/install.sh b/install.sh
index 54b4dc9..24efada 100755
--- a/install.sh
+++ b/install.sh
@@ -121,6 +121,7 @@ symlink ~/.dotfiles/qutebrowser/autoconfig.yml ~/.config/qutebrowser/autoconfig.
 
 # radio
 symlink ~/.dotfiles/radio/student ~/bin/radio-student
+symlink ~/.dotfiles/radio/sljeme ~/bin/radio-sljeme
 
 # ranger
 mkdir -p ~/.config/ranger
@@ -175,13 +176,10 @@ symlink ~/.dotfiles/sway ~/.config/sway
 # tmux
 symlink ~/.dotfiles/tmux/.tmux.conf ~/.tmux.conf
 
-# vim / nvim
-mkdir -p ~/.vim/autoload
-mkdir -p ~/.config
-symlink ~/.dotfiles/vim/.vimrc ~/.vimrc
-symlink ~/.dotfiles/vim/plug.vim ~/.vim/autoload/plug.vim
-symlink ~/.vimrc ~/.vim/init.vim
-symlink ~/.vim ~/.config/nvim
+# nvim
+mkdir -p ~/.config/nvim/autoload
+symlink ~/.dotfiles/nvim/init.lua ~/.config/nvim/init.lua
+symlink ~/.dotfiles/nvim/plug.vim ~/.config/nvim/autoload/plug.vim
 
 # win11
 symlink ~/.dotfiles/vm/vm-win11 ~/bin/vm-win11
@@ -194,6 +192,3 @@ symlink ~/.dotfiles/xorg/.xinitrc ~/.xinitrc
 symlink ~/.dotfiles/xorg/.Xresources ~/.Xresources
 symlink ~/.dotfiles/xorg/loadxresources ~/bin/loadxresources
 symlink ~/.dotfiles/xorg/setwallpaper ~/bin/setwallpaper
-
-# yay
-yay --save --sudo doas
diff --git a/nvim/init.lua b/nvim/init.lua
new file mode 100644
index 0000000..9acac86
--- /dev/null
+++ b/nvim/init.lua
@@ -0,0 +1,148 @@
+-- use modern vim
+vim.o.compatible = false
+
+-- dont use backup files
+vim.o.backup = false
+vim.o.writebackup = false
+vim.o.swapfile = false
+
+-- allow unsaved buffers
+vim.o.hidden = true
+
+-- enable mouse
+vim.o.mouse = 'a'
+
+-- display tabs and trailing spaces
+vim.o.list = true
+vim.o.listchars = 'tab:»·,trail:·,nbsp:·'
+
+-- search options
+vim.o.incsearch = true
+vim.o.hlsearch = true
+
+-- backspace in insert mode
+vim.o.backspace = "indent,eol,start"
+
+-- no sound
+vim.o.visualbell = true
+
+-- set encoding
+vim.o.encoding = "utf-8"
+vim.o.fileencoding = "utf-8"
+
+-- show commands
+vim.o.showcmd = true
+
+-- file format
+vim.o.fileformats = "unix,dos"
+
+-- disable conceal
+vim.g.vim_json_conceal = 0
+vim.g.markdown_syntax_conceal = 0
+-- autocmd FileType json set conceallevel=0
+
+-- show line numbers
+vim.o.number = true
+
+-- 80 character line length highlight
+vim.o.colorcolumn = "80"
+
+-- highlight current line
+vim.o.cursorline = true
+
+-- set tab width and use spaces for tabs
+vim.o.tabstop = 4 
+vim.o.shiftwidth = 4 
+vim.o.softtabstop = 4 
+vim.o.expandtab = true
+
+-- make files use regular tabs
+vim.api.nvim_create_autocmd({"FileType"}, {
+    pattern = "make",
+    command = "set tabstop=4 shiftwidth=8 softtabstop=0 noexpandtab"
+})
+
+-- reload vimrc on change
+vim.api.nvim_create_augroup("reload_vimrc", {})
+vim.api.nvim_create_autocmd({"BufWritePost"}, {
+    group = "reload_vimrc",
+    pattern = vim.env.MYVIMRC,
+    command = "source $MYVIMRC"
+})
+
+-- gui settings
+vim.o.linespace = 4
+vim.o.guifont = "Droid\\ Sans\\ Mono:h12"
+
+-- neovide settings
+if vim.g.neovide then
+    vim.g.neovide_cursor_animation_length = 0.01
+    vim.g.neovide_cursor_trail_length = 0.01
+    vim.g.neovide_cursor_vfx_mode = "sonicboom"
+    vim.g.neovide_scale_factor = 1.0
+    vim.keymap.set('n', '<C-=>', function()
+        vim.g.neovide_scale_factor = vim.g.neovide_scale_factor * 1.1
+    end)
+    vim.keymap.set('n', '<C-->', function()
+        vim.g.neovide_scale_factor = vim.g.neovide_scale_factor / 1.1
+    end)
+end
+
+-- plugin manager
+vim.fn['plug#begin']()
+vim.cmd.Plug('"airblade/vim-gitgutter"')
+vim.cmd.Plug('"christoomey/vim-tmux-navigator"')
+vim.cmd.Plug('"jiangmiao/auto-pairs"')
+vim.cmd.Plug('"majutsushi/tagbar"')
+vim.cmd.Plug('"mg979/vim-visual-multi"')
+vim.cmd.Plug('"nvim-tree/nvim-tree.lua"')
+vim.cmd.Plug('"nvim-tree/nvim-web-devicons"')
+vim.cmd.Plug('"romgrk/barbar.nvim"')
+vim.cmd.Plug('"tanvirtin/monokai.nvim"')
+vim.cmd.Plug('"thaerkh/vim-indentguides"')
+vim.fn['plug#end']()
+
+-- monokai
+require('monokai').setup({})
+
+-- indentguides
+vim.g.indent_guides_enable_on_vim_startup = 1
+vim.g.indent_guides_start_level = 2
+vim.g.indent_guides_guide_size = 1
+
+-- nvim-tree
+require("nvim-tree").setup()
+vim.opt.termguicolors = true
+
+-- barbar
+require('bufferline').setup({
+    auto_hide = false
+})
+local _ = (function(y)
+    local nvim_tree_events = require('nvim-tree.events')
+    local bufferline_api = require('bufferline.api')
+
+    local function get_tree_size()
+        return require'nvim-tree.view'.View.width
+    end
+
+    nvim_tree_events.subscribe('TreeOpen', function()
+        bufferline_api.set_offset(get_tree_size())
+    end)
+
+    nvim_tree_events.subscribe('Resize', function()
+        bufferline_api.set_offset(get_tree_size())
+    end)
+
+    nvim_tree_events.subscribe('TreeClose', function()
+        bufferline_api.set_offset(0)
+    end)
+end)()
+
+-- gitgutter 
+vim.g.gitgutter_realtime = 1
+
+-- function keys map
+vim.keymap.set('', '<F5>', vim.cmd.NvimTreeToggle)
+vim.keymap.set('', '<F6>', vim.cmd.TagbarToggle)
+
diff --git a/vim/.vimrc b/nvim/old_vimrc
index 3ef4748..aac1624 100644
--- a/vim/.vimrc
+++ b/nvim/old_vimrc
@@ -1,6 +1,4 @@
 
-" use modern vim
-set nocompatible
 
 " netrw
 let g:netrw_banner       = 0
@@ -11,22 +9,13 @@ let g:netrw_sort_options = 'i'
 " autostart netrw if vim starts without arguments
 "autocmd VimEnter * if !argc() | Explore | endif
 
-" dont use backup files
-set nobackup
-set nowritebackup
-set noswapfile
 
-" allow unsaved buffers
-set hidden
 
 " plugin manager
 call plug#begin('~/.vim/plugged')
-Plug 'airblade/vim-gitgutter'
-Plug 'mg979/vim-visual-multi'
-Plug 'christoomey/vim-tmux-navigator'
+
 Plug 'w0rp/ale'
-Plug 'sickill/vim-monokai'
-Plug 'thaerkh/vim-indentguides'
+
 Plug 'scrooloose/nerdtree'
 Plug 'scrooloose/nerdcommenter'
 Plug 'Xuyuanp/nerdtree-git-plugin'
@@ -36,7 +25,7 @@ Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
 Plug 'bling/vim-airline'
 Plug 'tpope/vim-fireplace'
 Plug 'ctrlpvim/ctrlp.vim'
-Plug 'majutsushi/tagbar'
+
 Plug 'xolox/vim-misc'
 Plug 'vim-scripts/paredit.vim'
 Plug 'ryanoasis/vim-devicons'
@@ -46,91 +35,32 @@ Plug 'https://git.sr.ht/~sircmpwn/hare.vim'
 "Plug 'tpope/vim-fugitive.git'
 "Plug 'severin-lemaignan/vim-minimap'
 call plug#end()
-filetype plugin indent on
 
-" color theme
-syntax enable
-colorscheme monokai
 
-" indentation guides
-let g:indent_guides_enable_on_vim_startup = 1
-let g:indent_guides_start_level = 2
-let g:indent_guides_guide_size = 1
 
-" show line numbers
-set number
-"set relativenumber
 
-" 80 character line length highlight
-set colorcolumn=80
 
-" highlight current line
-set cursorline
-
-" set tab width and use spaces for tabs
-set tabstop=4
-set shiftwidth=4
-set softtabstop=4
-set expandtab
-" make files use regular tabs
-autocmd FileType make set tabstop=4 shiftwidth=8 softtabstop=0 noexpandtab
 
 " enable spell check
 "autocmd FileType rst set spell
 
-" gui settings
-set linespace=4
-set guifont=Droid\ Sans\ Mono:h12
-let g:neovide_cursor_animation_length = 0.01
-let g:neovide_cursor_trail_length = 0.01
-let g:neovide_cursor_vfx_mode = "sonicboom"
 "if exists('g:GuiLoaded')
     "GuiTabline 0
 "endif
 "autocmd UIEnter * GuiTabline 0
 
-" reload vimrc on change
-augroup reload_vimrc
-    autocmd!
-    autocmd BufWritePost $MYVIMRC source $MYVIMRC
-augroup END
 
 " airline configuration
 set laststatus=2
 let g:airline#extensions#tabline#enabled = 1
 let g:airline#extensions#ale#enabled = 1
 
-" display tabs and trailing spaces
-set list
-set listchars=tab:»·,trail:·,nbsp:·
-
-" search options
-set incsearch
-set hlsearch
-
-" backspace in insert mode
-set backspace=indent,eol,start
-
-" no sound
-set visualbell
-
-" set encoding
-set encoding=utf-8
-set fileencoding=utf-8
-setglobal fileencoding=utf-8
 
 " remap Esc
 "imap <S-Space> <Esc>
 "nmap <S-Space> <Esc>
 
-" show commands
-set showcmd
-
-" file format
-set fileformats=unix,dos
 
-" gitgutter configuration
-let g:gitgutter_realtime = 1
 
 " function keys map
 noremap <F5> :NERDTreeToggle<CR>
@@ -142,8 +72,6 @@ noremap <F9> :tabn<CR>
 " center cursor vertically
 nnoremap <Leader>zz :let &scrolloff=999-&scrolloff<CR>
 
-" enable mouse
-set mouse=a
 
 " ale configuration
 let g:ale_linters = {
@@ -169,7 +97,6 @@ set omnifunc=ale#completion#OmniFunc
 let g:ackprg = 'ag --vimgrep'
 
 " disable conceal
-autocmd FileType json set conceallevel=0
 
 " ctrlP
 "let g:ctrlp_prompt_mappings = {
diff --git a/vim/plug.vim b/nvim/plug.vim
index 652caa8..652caa8 100644
--- a/vim/plug.vim
+++ b/nvim/plug.vim
diff --git a/radio/sljeme b/radio/sljeme
new file mode 100755
index 0000000..e677d65
--- /dev/null
+++ b/radio/sljeme
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+URL=https://25593.live.streamtheworld.com/SLJEMEAAC.aac
+
+# mplayer -ao pulse -quiet $URL | ts '[%Y-%m-%d %H:%M:%S]'
+exec ffmpeg -i $URL -f pulse -name ffmpeg "radio sljeme"
diff --git a/radio/student b/radio/student
index c2c22c1..7308e3c 100755
--- a/radio/student
+++ b/radio/student
@@ -3,4 +3,4 @@
 URL=http://161.53.122.184:8000/AAC128.aac
 
 # mplayer -ao pulse -quiet $URL | ts '[%Y-%m-%d %H:%M:%S]'
-exec mplayer -ao pulse -quiet $URL
+exec ffmpeg -i $URL -f pulse -name ffmpeg "radio student"
diff --git a/shell/.profile b/shell/.profile
index 619b530..04f755a 100644
--- a/shell/.profile
+++ b/shell/.profile
@@ -20,6 +20,7 @@ prepend_path () {
 # export WLR_DRM_NO_MODIFIERS=1
 export EDITOR=nvim
 export QT_QPA_PLATFORMTHEME=qt5ct
+export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket
 export VISUAL=nvim
 
 
@@ -27,3 +28,9 @@ prepend_path ~/opt/janet/bin
 prepend_path ~/opt/python310/bin
 prepend_path ~/bin
 export PATH
+
+
+nix_profile_sh=~/.nix-profile/etc/profile.d/nix.sh
+[ -e $nix_profile_sh ] && . $nix_profile_sh
+export LOCALE_ARCHIVE=~/.nix-profile/lib/locale/locale-archive
+
diff --git a/sublime-text/LSP.sublime-settings b/sublime-text/LSP.sublime-settings
index 79f8bc1..600a0dd 100644
--- a/sublime-text/LSP.sublime-settings
+++ b/sublime-text/LSP.sublime-settings
@@ -16,5 +16,10 @@
             "selector": "source.c | source.c++",
             "enabled": true,
         },
+        "typescript-language-server": {
+            "command": ["typescript-language-server", "--stdio"],
+            "selector": "source.ts",
+            "enabled": true,
+        },
 	},
 }
diff --git a/sublime-text/Preferences.sublime-settings b/sublime-text/Preferences.sublime-settings
index dc53eaf..e33b7bf 100644
--- a/sublime-text/Preferences.sublime-settings
+++ b/sublime-text/Preferences.sublime-settings
@@ -44,7 +44,7 @@
 	[
 	],
 	"font_face": "Roboto Mono",
-	"font_size": 13,
+	"font_size": 12,
 	"highlight_line": true,
 	"highlight_modified_tabs": true,
 	"ignored_packages":