diff --git a/boxes/mainsail.nix b/boxes/mainsail.nix index d420b9b..b2808c2 100644 --- a/boxes/mainsail.nix +++ b/boxes/mainsail.nix @@ -58,7 +58,7 @@ libreoffice anki - youtube-tui + ytfzf kdenlive libreoffice i3 diff --git a/builds/rebuild.nix b/builds/rebuild.nix new file mode 100644 index 0000000..e03af19 --- /dev/null +++ b/builds/rebuild.nix @@ -0,0 +1,26 @@ +{ stdenv +, lib +, bash +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "rebuild"; + version = "1.00"; + + src = ./rebuild; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ bash ]; + + buildPhase = ""; + + installPhase = '' + mkdir -p $out/bin + cp $src/rebuild $out/bin + wrapProgram $out/bin/rebuild --prefix PATH : ${lib.makeBinPath [ bash ]} + ''; + + phases = [ "buildPhase" "installPhase" ]; +} + diff --git a/builds/utils/sh/rebuild b/builds/rebuild/rebuild similarity index 100% rename from builds/utils/sh/rebuild rename to builds/rebuild/rebuild diff --git a/builds/utils/sh/disp b/builds/utils/sh/disp index 9453a3e..f6eb3a1 100755 --- a/builds/utils/sh/disp +++ b/builds/utils/sh/disp @@ -15,7 +15,10 @@ if [ "$(exists "DP-1")" -gt 1 ]; then exit 0 fi -if [ "$(exists "HDMI-1")" -gt 1 ] && [ "$(hostname)" = "mainsail" ]; then - printf "mainsail selected\nHDMI-1 detected only, doing that\n" - bspc monitor HDMI-1 -d 1 2 3 4 5 6 7 8 9 +if [ "$(hostname)" = "mainsail" ]; then + # this is a tower, so there's only one configuration + printf "mainsail detected\n" + xrandr --output VGA-1 --left-of HDMI-1 + bspc monitor VGA-1 -d 1 3 5 7 9 + bspc monitor HDMI-1 -d 2 4 6 8 0 fi diff --git a/common/main.nix b/common/main.nix index beebdae..4f22544 100644 --- a/common/main.nix +++ b/common/main.nix @@ -28,6 +28,8 @@ in { dig htop gnumake + + (pkgs.callPackage ../builds/rebuild.nix {}) ]; system.copySystemConfiguration = true; diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 0a5b4b8..82fad69 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -157,11 +157,6 @@ local packer = require('packer').startup(function(use) use 'lervag/vimtex' use 'https://github.com/protex/better-digraphs.nvim' use 'https://github.com/itchyny/calendar.vim' - use { - "empat94/nvim-rss", - requires = { "tami5/sqlite.lua" }, - rocks = "luaexpat", - } use { "folke/which-key.nvim", config = function() @@ -178,33 +173,6 @@ local packer = require('packer').startup(function(use) end); -- }}} --- lsp configuration {{{ -local lsp = require('lsp-zero').preset({}) - -lsp.on_attach(function(client, bufnr) - lsp.default_keymaps({buffer = bufnr}) -end) - -local lspconfig = require('lspconfig') - -lsp.ensure_installed({ - 'rnix', - 'jedi_language_server', -}) - -lspconfig.lua_ls.setup(lsp.nvim_lua_ls()) -lspconfig.rnix.setup({}) -lspconfig.jedi_language_server.setup({}) - -lsp.setup() --- }}} - -require("nvim-rss").setup({ - feeds_dir = "/home/usr", - date_format = "%x %r", - verbose = false, -}) - nnoremap('ff', function() require('telescope.builtin').find_files() end) diff --git a/config/sxhkd/mouse b/config/sxhkd/mouse index 28aa7ac..65308bb 100644 --- a/config/sxhkd/mouse +++ b/config/sxhkd/mouse @@ -5,10 +5,10 @@ q xdotool mousemove_relative -- {-5,-50,-20} 0 {ctrl +,shift +,_} j - xdotool mousemove_relative -- 0 {-5,-50,-20} + xdotool mousemove_relative -- 0 {5,50,20} {ctrl +,shift +,_} k - xdotool mousemove_relative -- 0 {5,50,20} + xdotool mousemove_relative -- 0 {-5,-50,-20} {ctrl +,shift +,_} l xdotool mousemove_relative -- {5,50,20} 0 diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc index 1909839..17dff35 100644 --- a/config/sxhkd/sxhkdrc +++ b/config/sxhkd/sxhkdrc @@ -41,7 +41,7 @@ super + {_,ctrl +,shift + }{h,j,k,l} bspc node -{f,p,s} {west,south,north,east} super + {_,shift + } {1-9,0} - bspc {desktop -f,node -d} '^{1-9,10}' + bspc {desktop -f,node -d} '{1-9,10}' super + {t,f,s} bspc node -t {tiled,floating,fullscreen}