diff --git a/foot/foot.ini b/foot/foot.ini new file mode 100644 index 0000000..117fcd8 --- /dev/null +++ b/foot/foot.ini @@ -0,0 +1,228 @@ +# -*- conf -*- + +# shell=$SHELL (if set, otherwise user's default shell from /etc/passwd) +# term=foot (or xterm-256color if built with -Dterminfo=disabled) +# login-shell=no + +# app-id=foot +# title=foot +# locked-title=no + +font=monospace:size=16 +# font-bold= +# font-italic= +# font-bold-italic= +# font-size-adjustment=0.5 +# line-height= +# letter-spacing=0 +# horizontal-letter-offset=0 +# vertical-letter-offset=0 +# underline-offset= +# underline-thickness= +# box-drawings-uses-font-glyphs=no +# dpi-aware=auto + +# initial-window-size-pixels=700x500 # Or, +# initial-window-size-chars= +# initial-window-mode=windowed +# pad=0x0 # optionally append 'center' +# resize-delay-ms=100 + +# notify=notify-send -a ${app-id} -i ${app-id} ${title} ${body} + +# bold-text-in-bright=no +# word-delimiters=,│`|:"'()[]{}<> +# selection-target=primary +# workers= +# utempter=/usr/lib/utempter/utempter + +[environment] +# name=value + +[bell] +# urgent=no +# notify=no +# command= +# command-focused=no + +[scrollback] +# lines=1000 +# multiplier=3.0 +# indicator-position=relative +# indicator-format="" + +[url] +# launch=xdg-open ${url} +# label-letters=sadfjklewcmpgh +# osc8-underline=url-mode +# protocols=http, https, ftp, ftps, file, gemini, gopher +# uri-characters=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[] + +[mouse] +# hide-when-typing=no +# alternate-scroll-mode=yes + +[cursor] +color = 080808 9e9e9e + +[colors] +foreground = b2b2b2 +background = 080808 + +# selection-foreground = 080808 +# selection-background = b2ceee + +regular0 = 323437 +regular1 = ff5454 +regular2 = 8cc85f +regular3 = e3c78a +regular4 = 80a0ff +regular5 = d183e8 +regular6 = 79dac8 +regular7 = c6c6c6 + +bright0 = 949494 +bright1 = ff5189 +bright2 = 36c692 +bright3 = c2c292 +bright4 = 74b2ff +bright5 = ae81ff +bright6 = 85dc85 +bright7 = e4e4e4 + +# [cursor] +# style=block +# color= +# blink=no +# beam-thickness=1.5 +# underline-thickness= + +# [colors] +# selection-foreground=282c34 +# selection-background=979eab +# alpha=1.0 +# background=002b36 +# foreground=839496 + +## Normal/regular colors (color palette 0-7) +# regular0=073642 # black +# regular1=dc322f # red +# regular2=859900 # green +# regular3=b58900 # yellow +# regular4=268bd2 # blue +# regular5=d33682 # magenta +# regular6=2aa198 # cyan +# regular7=eee8d5 # white + +## Bright colors (color palette 8-15) +# bright0=08404f # bright black +# bright1=e35f5c # bright red +# bright2=9fb700 # bright green +# bright3=d9a400 # bright yellow +# bright4=4ba1de # bright blue +# bright5=dc619d # bright magenta +# bright6=32c1b6 # bright cyan +# bright7=ffffff # bright white + +## dimmed colors (see foot.ini(5) man page) +# dim0= +# ... +# dim7= + +## The remaining 256-color palette +# 16 = <256-color palette #16> +# ... +# 255 = <256-color palette #255> + +## Misc colors +# selection-foreground= +# selection-background= +# jump-labels= # black-on-yellow +# scrollback-indicator= # black-on-bright-blue +# search-box-no-match= # black-on-red +# search-box-match= # black-on-yellow +# urls= + +[csd] +# preferred=server +# size=26 +# font= +# color= +# hide-when-typing=no +# border-width=0 +# border-color= +# button-width=26 +# button-color= +# button-minimize-color= +# button-maximize-color= +# button-close-color= + +[key-bindings] +# scrollback-up-page=Shift+Page_Up +# scrollback-up-half-page=none +# scrollback-up-line=none +# scrollback-down-page=Shift+Page_Down +# scrollback-down-half-page=none +# scrollback-down-line=none +# clipboard-copy=Control+Shift+c XF86Copy +# clipboard-paste=Control+Shift+v XF86Paste +# primary-paste=Shift+Insert +# search-start=Control+Shift+r +# font-increase=Control+plus Control+equal Control+KP_Add +# font-decrease=Control+minus Control+KP_Subtract +# font-reset=Control+0 Control+KP_0 +# spawn-terminal=Control+Shift+n +# minimize=none +# maximize=none +# fullscreen=none +# pipe-visible=[sh -c "xurls | fuzzel | xargs -r firefox"] none +# pipe-scrollback=[sh -c "xurls | fuzzel | xargs -r firefox"] none +# pipe-selected=[xargs -r firefox] none +# show-urls-launch=Control+Shift+u +# show-urls-copy=none +# show-urls-persistent=none +# prompt-prev=Control+Shift+z +# prompt-next=Control+Shift+x +# unicode-input=none +# noop=none + +[search-bindings] +# cancel=Control+g Control+c Escape +# commit=Return +# find-prev=Control+r +# find-next=Control+s +# cursor-left=Left Control+b +# cursor-left-word=Control+Left Mod1+b +# cursor-right=Right Control+f +# cursor-right-word=Control+Right Mod1+f +# cursor-home=Home Control+a +# cursor-end=End Control+e +# delete-prev=BackSpace +# delete-prev-word=Mod1+BackSpace Control+BackSpace +# delete-next=Delete +# delete-next-word=Mod1+d Control+Delete +# extend-to-word-boundary=Control+w +# extend-to-next-whitespace=Control+Shift+w +# clipboard-paste=Control+v Control+Shift+v Control+y XF86Paste +# primary-paste=Shift+Insert +# unicode-input=none + +[url-bindings] +# cancel=Control+g Control+c Control+d Escape +# toggle-url-visible=t + +[text-bindings] +# \x03=Mod4+c # Map Super+c -> Ctrl+c + +[mouse-bindings] +# selection-override-modifiers=Shift +# primary-paste=BTN_MIDDLE +# select-begin=BTN_LEFT +# select-begin-block=Control+BTN_LEFT +# select-extend=BTN_RIGHT +# select-extend-character-wise=Control+BTN_RIGHT +# select-word=BTN_LEFT-2 +# select-word-whitespace=Control+BTN_LEFT-2 +# select-row=BTN_LEFT-3 + +# vim: ft=dosini diff --git a/nvim/after/plugin/colours.lua b/nvim/after/plugin/colours.lua index 2ad675b..024878e 100644 --- a/nvim/after/plugin/colours.lua +++ b/nvim/after/plugin/colours.lua @@ -1,13 +1,13 @@ require("rose-pine").setup({ - variant = "moon" + variant = "moon" }) function SetColour(colour) - colour = colour or "gruvbox" - vim.cmd(string.format("colorscheme %s", colour)) + colour = colour or "gruvbox" + vim.cmd(string.format("colorscheme %s", colour)) - --vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) - --vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) + --vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) + --vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) end SetColour() diff --git a/nvim/lua/RageCage64/packer.lua b/nvim/lua/RageCage64/packer.lua index e28c826..9d000a1 100644 --- a/nvim/lua/RageCage64/packer.lua +++ b/nvim/lua/RageCage64/packer.lua @@ -1,49 +1,51 @@ vim.cmd [[packadd packer.nvim]] return require('packer').startup(function(use) - use 'wbthomason/packer.nvim' - - -- Navigation - use { - 'nvim-telescope/telescope.nvim', tag = '0.1.1', - -- or , branch = '0.1.x', - requires = { {'nvim-lua/plenary.nvim'} } - } - - -- Colours - use("ellisonleao/gruvbox.nvim") - use({'rose-pine/neovim', as = 'rose-pine' }) - - -- Treesitter - use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) - use('nvim-treesitter/playground') - - -- Editing - use('mbbill/undotree') - use('tpope/vim-surround') - use('tpope/vim-commentary') - - -- LSP - use { - 'VonHeikemen/lsp-zero.nvim', - branch = 'v2.x', - requires = { - -- LSP Support - {'neovim/nvim-lspconfig'}, -- Required - { -- Optional - 'williamboman/mason.nvim', - run = function() - vim.cmd [[MasonUpdate]] - end, - }, - {'williamboman/mason-lspconfig.nvim'}, -- Optional - - -- Autocompletion - {'hrsh7th/nvim-cmp'}, -- Required - {'hrsh7th/cmp-nvim-lsp'}, -- Required - {'L3MON4D3/LuaSnip'}, -- Required - }, - - use('editorconfig/editorconfig-vim'), -} + use 'wbthomason/packer.nvim' + + -- Navigation + use { + 'nvim-telescope/telescope.nvim', tag = '0.1.1', + -- or , branch = '0.1.x', + requires = { { 'nvim-lua/plenary.nvim' } } + } + + -- Colours + use('ellisonleao/gruvbox.nvim') + use({ 'rose-pine/neovim', as = 'rose-pine' }) + use({ 'bluz71/vim-moonfly-colors', as = 'moonfly' }) + + -- Treesitter + use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) + use('nvim-treesitter/playground') + + -- Editing + use('mbbill/undotree') + use('tpope/vim-surround') + use('tpope/vim-commentary') + + -- LSP + use { + 'VonHeikemen/lsp-zero.nvim', + branch = 'v2.x', + requires = { + -- LSP Support + { 'neovim/nvim-lspconfig' }, -- Required + { + -- Optional + 'williamboman/mason.nvim', + run = function() + vim.cmd [[MasonUpdate]] + end, + }, + { 'williamboman/mason-lspconfig.nvim' }, -- Optional + + -- Autocompletion + { 'hrsh7th/nvim-cmp' }, -- Required + { 'hrsh7th/cmp-nvim-lsp' }, -- Required + { 'L3MON4D3/LuaSnip' }, -- Required + }, + + use('editorconfig/editorconfig-vim'), + } end) diff --git a/nvim/plugin/packer_compiled.lua b/nvim/plugin/packer_compiled.lua index 804d67d..9ac5133 100644 --- a/nvim/plugin/packer_compiled.lua +++ b/nvim/plugin/packer_compiled.lua @@ -49,8 +49,8 @@ local function save_profiles(threshold) end time([[Luarocks path setup]], true) -local package_path_str = "/home/braydon/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/braydon/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/braydon/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/braydon/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/braydon/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" +local package_path_str = "/home/braydonk/.cache/nvim/packer_hererocks/2.1.1694316387/share/lua/5.1/?.lua;/home/braydonk/.cache/nvim/packer_hererocks/2.1.1694316387/share/lua/5.1/?/init.lua;/home/braydonk/.cache/nvim/packer_hererocks/2.1.1694316387/lib/luarocks/rocks-5.1/?.lua;/home/braydonk/.cache/nvim/packer_hererocks/2.1.1694316387/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/braydonk/.cache/nvim/packer_hererocks/2.1.1694316387/lib/lua/5.1/?.so" if not string.find(package.path, package_path_str, 1, true) then package.path = package.path .. ';' .. package_path_str end @@ -76,97 +76,97 @@ time([[Defining packer_plugins]], true) _G.packer_plugins = { LuaSnip = { loaded = true, - path = "/home/braydon/.local/share/nvim/site/pack/packer/start/LuaSnip", + path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/LuaSnip", url = "https://github.com/L3MON4D3/LuaSnip" }, ["cmp-nvim-lsp"] = { loaded = true, - path = "/home/braydon/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", + path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", url = "https://github.com/hrsh7th/cmp-nvim-lsp" }, ["editorconfig-vim"] = { loaded = true, - path = "/home/braydon/.local/share/nvim/site/pack/packer/start/editorconfig-vim", + path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/editorconfig-vim", url = "https://github.com/editorconfig/editorconfig-vim" }, ["gruvbox.nvim"] = { loaded = true, - path = "/home/braydon/.local/share/nvim/site/pack/packer/start/gruvbox.nvim", + path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/gruvbox.nvim", url = "https://github.com/ellisonleao/gruvbox.nvim" }, ["lsp-zero.nvim"] = { loaded = true, - path = "/home/braydon/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim", + path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim", url = "https://github.com/VonHeikemen/lsp-zero.nvim" }, ["mason-lspconfig.nvim"] = { loaded = true, - path = "/home/braydon/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", + path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", url = "https://github.com/williamboman/mason-lspconfig.nvim" }, ["mason.nvim"] = { loaded = true, - path = "/home/braydon/.local/share/nvim/site/pack/packer/start/mason.nvim", + path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/mason.nvim", url = "https://github.com/williamboman/mason.nvim" }, + moonfly = { + loaded = true, + path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/moonfly", + url = "https://github.com/bluz71/vim-moonfly-colors" + }, ["nvim-cmp"] = { loaded = true, - path = "/home/braydon/.local/share/nvim/site/pack/packer/start/nvim-cmp", + path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/nvim-cmp", url = "https://github.com/hrsh7th/nvim-cmp" }, ["nvim-lspconfig"] = { loaded = true, - path = "/home/braydon/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", + path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", url = "https://github.com/neovim/nvim-lspconfig" }, ["nvim-treesitter"] = { loaded = true, - path = "/home/braydon/.local/share/nvim/site/pack/packer/start/nvim-treesitter", + path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/nvim-treesitter", url = "https://github.com/nvim-treesitter/nvim-treesitter" }, ["packer.nvim"] = { loaded = true, - path = "/home/braydon/.local/share/nvim/site/pack/packer/start/packer.nvim", + path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/packer.nvim", url = "https://github.com/wbthomason/packer.nvim" }, playground = { loaded = true, - path = "/home/braydon/.local/share/nvim/site/pack/packer/start/playground", + path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/playground", url = "https://github.com/nvim-treesitter/playground" }, ["plenary.nvim"] = { loaded = true, - path = "/home/braydon/.local/share/nvim/site/pack/packer/start/plenary.nvim", + path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/plenary.nvim", url = "https://github.com/nvim-lua/plenary.nvim" }, ["rose-pine"] = { loaded = true, - path = "/home/braydon/.local/share/nvim/site/pack/packer/start/rose-pine", + path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/rose-pine", url = "https://github.com/rose-pine/neovim" }, ["telescope.nvim"] = { loaded = true, - path = "/home/braydon/.local/share/nvim/site/pack/packer/start/telescope.nvim", + path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/telescope.nvim", url = "https://github.com/nvim-telescope/telescope.nvim" }, undotree = { loaded = true, - path = "/home/braydon/.local/share/nvim/site/pack/packer/start/undotree", + path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/undotree", url = "https://github.com/mbbill/undotree" }, ["vim-commentary"] = { loaded = true, - path = "/home/braydon/.local/share/nvim/site/pack/packer/start/vim-commentary", + path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/vim-commentary", url = "https://github.com/tpope/vim-commentary" }, - ["vim-fugitive"] = { - loaded = true, - path = "/home/braydon/.local/share/nvim/site/pack/packer/start/vim-fugitive", - url = "https://github.com/tpope/vim-fugitive" - }, ["vim-surround"] = { loaded = true, - path = "/home/braydon/.local/share/nvim/site/pack/packer/start/vim-surround", + path = "/home/braydonk/.local/share/nvim/site/pack/packer/start/vim-surround", url = "https://github.com/tpope/vim-surround" } } diff --git a/sway/config b/sway/config index 61baaf3..cb42b47 100644 --- a/sway/config +++ b/sway/config @@ -23,6 +23,9 @@ set $locker sway_manual_lock # set $menu dmenu_path | dmenu | xargs swaymsg exec -- set $menu exec wofi --show drun +# Monitors +set $officemonitor 'Lenovo Group Limited LEN T32p-20 VNA70PG1' + include /etc/sway/config-vars.d/* ### Output configuration @@ -35,6 +38,7 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill # output HDMI-A-1 resolution 1920x1080 position 1920,0 # # You can get the names of your outputs by running: swaymsg -t get_outputs +output $officemonitor scale 1.5 ### Idle configuration # @@ -49,6 +53,16 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill # your displays after another 300 seconds, and turn your screens back on when # resumed. It will also lock your screen before your computer goes to sleep. +# manually lock with mod+ctrl+l +bindsym $mod+Ctrl+l exec $locker + +# Turn off screen at 4 minutes, lock at 5 minutes. +exec swayidle -w \ + before-sleep 'playerctl pause' \ + timeout 300 '$locker' \ + timeout 310 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' + + ### Input configuration # # Example configuration: @@ -140,6 +154,12 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill # Note: workspaces can have any name you want, not just numbers. # We just use 1-10 as the default. + # Move workspace to monitor + bindsym $mod+Control+Shift+$right move workspace to output right + bindsym $mod+Control+Shift+$left move workspace to output left + bindsym $mod+Control+Shift+$down move workspace to output down + bindsym $mod+Control+Shift+$up move workspace to output up + # bind numpad as well bindsym $mod+Mod2+KP_1 workspace number 1 bindsym $mod+Mod2+KP_2 workspace number 2 @@ -265,13 +285,4 @@ bindsym XF86AudioPlay exec playerctl play-pause bindsym XF86AudioNext exec playerctl next bindsym XF86AudioPrev exec playerctl previous -# manually lock with mod+l -bindsym $mod+Ctrl+l exec $locker - -# Turn off screen at 4 minutes, lock at 5 minutes. -exec swayidle -w \ - before-sleep 'playerctl pause' \ - timeout 300 '$locker' \ - timeout 15 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' - include /etc/sway/config.d/* diff --git a/sway_setup.sh b/sway_setup.sh index abd0457..5381a43 100644 --- a/sway_setup.sh +++ b/sway_setup.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash ln -s $(pwd)/sway ~/.config +ln -s $(pwd)/foot ~/.config sudo ln -s sway_manual_lock /usr/bin