diff --git a/config/alacritty/alacritty.yml b/config/alacritty/alacritty.yml index 6df727c0..b7c9ec15 100644 --- a/config/alacritty/alacritty.yml +++ b/config/alacritty/alacritty.yml @@ -77,14 +77,14 @@ font: # The bold font face bold: - family: "JetBrainsMono NF" + family: "JetBrainsMono NF" style: Bold # family: "Fira Code" # family: "Source Code Pro" # The italic font face italic: - family: "JetbrainsMono NF" + family: "JetbrainsMono NF" style: Italic # style: "Light Oblique" # family: "Fira Code" @@ -432,7 +432,7 @@ debug: # Entries in shell.args are passed unmodified as arguments to the shell. shell: program: - bash + zsh # args: #- --command=tmux # vim: nospell diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc new file mode 100755 index 00000000..25e3a0a5 --- /dev/null +++ b/config/bspwm/bspwmrc @@ -0,0 +1,27 @@ +#!/nix/store/7q1b1bsmxi91zci6g8714rcljl620y7f-bash-5.2-p15/bin/sh + +pgrep -x sxhkd > /dev/null || sxhkd & + +bspc monitor -d 1 2 3 4 5 6 + +bspc config border_width 2 +bspc config window_gap 12 + +bspc config split_ratio 0.52 +bspc config borderless_monocle true +bspc config gapless_monocle true + +bspc rule -a Gimp desktop='^8' state=floating follow=on +bspc rule -a Chromium desktop='^2' +bspc rule -a mplayer2 state=floating +bspc rule -a Kupfer.py focus=on +bspc rule -a Screenkey manage=off + +feh --bg-scale /home/sako/background.png & + +/home/sako/.config/polybar/startpolybar & + +nm-applet & +blueman-applet & + +keepassxc & diff --git a/config/neovim/README.md b/config/nvim/README.md similarity index 100% rename from config/neovim/README.md rename to config/nvim/README.md diff --git a/config/neovim/init.lua b/config/nvim/init.lua similarity index 100% rename from config/neovim/init.lua rename to config/nvim/init.lua diff --git a/config/neovim/lua/core/keymaps.lua b/config/nvim/lua/core/keymaps.lua similarity index 100% rename from config/neovim/lua/core/keymaps.lua rename to config/nvim/lua/core/keymaps.lua diff --git a/config/neovim/lua/core/plugin_config/autopairs.lua b/config/nvim/lua/core/plugin_config/autopairs.lua similarity index 100% rename from config/neovim/lua/core/plugin_config/autopairs.lua rename to config/nvim/lua/core/plugin_config/autopairs.lua diff --git a/config/neovim/lua/core/plugin_config/cmp_config.lua b/config/nvim/lua/core/plugin_config/cmp_config.lua similarity index 100% rename from config/neovim/lua/core/plugin_config/cmp_config.lua rename to config/nvim/lua/core/plugin_config/cmp_config.lua diff --git a/config/neovim/lua/core/plugin_config/gitsigns.lua b/config/nvim/lua/core/plugin_config/gitsigns.lua similarity index 100% rename from config/neovim/lua/core/plugin_config/gitsigns.lua rename to config/nvim/lua/core/plugin_config/gitsigns.lua diff --git a/config/neovim/lua/core/plugin_config/init.lua b/config/nvim/lua/core/plugin_config/init.lua similarity index 100% rename from config/neovim/lua/core/plugin_config/init.lua rename to config/nvim/lua/core/plugin_config/init.lua diff --git a/config/neovim/lua/core/plugin_config/kanagawa.lua b/config/nvim/lua/core/plugin_config/kanagawa.lua similarity index 100% rename from config/neovim/lua/core/plugin_config/kanagawa.lua rename to config/nvim/lua/core/plugin_config/kanagawa.lua diff --git a/config/neovim/lua/core/plugin_config/liveserver.lua b/config/nvim/lua/core/plugin_config/liveserver.lua similarity index 100% rename from config/neovim/lua/core/plugin_config/liveserver.lua rename to config/nvim/lua/core/plugin_config/liveserver.lua diff --git a/config/neovim/lua/core/plugin_config/lsp_config.lua b/config/nvim/lua/core/plugin_config/lsp_config.lua similarity index 100% rename from config/neovim/lua/core/plugin_config/lsp_config.lua rename to config/nvim/lua/core/plugin_config/lsp_config.lua diff --git a/config/neovim/lua/core/plugin_config/lualine.lua b/config/nvim/lua/core/plugin_config/lualine.lua similarity index 100% rename from config/neovim/lua/core/plugin_config/lualine.lua rename to config/nvim/lua/core/plugin_config/lualine.lua diff --git a/config/neovim/lua/core/plugin_config/null_ls.lua b/config/nvim/lua/core/plugin_config/null_ls.lua similarity index 100% rename from config/neovim/lua/core/plugin_config/null_ls.lua rename to config/nvim/lua/core/plugin_config/null_ls.lua diff --git a/config/neovim/lua/core/plugin_config/nvim-tree.lua b/config/nvim/lua/core/plugin_config/nvim-tree.lua similarity index 100% rename from config/neovim/lua/core/plugin_config/nvim-tree.lua rename to config/nvim/lua/core/plugin_config/nvim-tree.lua diff --git a/config/neovim/lua/core/plugin_config/precense.lua b/config/nvim/lua/core/plugin_config/precense.lua similarity index 100% rename from config/neovim/lua/core/plugin_config/precense.lua rename to config/nvim/lua/core/plugin_config/precense.lua diff --git a/config/neovim/lua/core/plugin_config/telescope.lua b/config/nvim/lua/core/plugin_config/telescope.lua similarity index 100% rename from config/neovim/lua/core/plugin_config/telescope.lua rename to config/nvim/lua/core/plugin_config/telescope.lua diff --git a/config/neovim/lua/core/plugin_config/treesitter.lua b/config/nvim/lua/core/plugin_config/treesitter.lua similarity index 100% rename from config/neovim/lua/core/plugin_config/treesitter.lua rename to config/nvim/lua/core/plugin_config/treesitter.lua diff --git a/config/neovim/lua/core/plugins.lua b/config/nvim/lua/core/plugins.lua similarity index 100% rename from config/neovim/lua/core/plugins.lua rename to config/nvim/lua/core/plugins.lua diff --git a/configuration.nix b/configuration.nix index b5c2993d..84082c18 100644 --- a/configuration.nix +++ b/configuration.nix @@ -138,6 +138,7 @@ # TODO(sako):: put this in different files # Define a user account. Don't forget to set a password with ‘passwd’. users.users.sako= { + shell = pkgs.zsh; isNormalUser = true; extraGroups = [ "wheel" "networkmanager" ]; # Enable ‘sudo’ for the user. packages = with pkgs; [ @@ -182,16 +183,27 @@ }; xdg.configFile = { nvim = { - source = config/neovim; + source = config/nvim; recursive = true; }; - alacritty = { - source = config/alacritty; - }; - - }; - + alacritty = { + source = config/alacritty; + }; + polybar = { + source = config/polybar; + recursive = true; + }; + bspwm = { + source = config/bspwm; + }; }; + }; + + programs.zsh = { + enable = true; + # TODO(sako):: make my own zsh config + promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; + }; fonts.fonts = with pkgs;[ jetbrains-mono