diff --git a/.config/nixshell/c.nix b/.config/nixshell/c.nix index 05b3cbf..a9b3c86 100644 --- a/.config/nixshell/c.nix +++ b/.config/nixshell/c.nix @@ -15,6 +15,8 @@ in libinput clang-tools_15 valgrind + xorg.xcbutil + xorg.xcbutilkeysyms ]; nativeBuildInputs = with pkgs; [ pkg-config diff --git a/.config/nixshell/caml.nix b/.config/nixshell/caml.nix new file mode 100644 index 0000000..86a8352 --- /dev/null +++ b/.config/nixshell/caml.nix @@ -0,0 +1,11 @@ +let + pkgs = import {}; +in + pkgs.mkShell { + buildInputs = with pkgs; [ + ocaml + pkg-config + opam + xorg.libX11 + ]; + } diff --git a/.config/nixshell/matrix.nix b/.config/nixshell/matrix.nix index 3c678e0..f66a890 100644 --- a/.config/nixshell/matrix.nix +++ b/.config/nixshell/matrix.nix @@ -1,8 +1,10 @@ let pkgs = import { overlays = [ (import ./cypress-overlay.nix) ]; }; +unstable = import {}; in pkgs.mkShell { name = "matrix-shell"; buildInputs = with pkgs; [ yarn + nodejs docker act gtk2 @@ -26,14 +28,14 @@ in pkgs.mkShell { xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core libdbusmenu libdrm mesa # required for libgbm - cypress + unstable.cypress ]; shellHook = '' export NAME="matrix-shell" - export NODE_OPTIONS=--openssl-legacy-provider export CYPRESS_INSTALL_BINARY=0 - export CYPRESS_RUN_BINARY=${pkgs.cypress}/bin/Cypress + export CYPRESS_RUN_BINARY=${unstable.cypress}/bin/Cypress ''; + # export NODE_OPTIONS=--openssl-legacy-provider } #https://gist.github.com/r-k-b/2485f977b476aa3f76a47329ce7f9ad4?permalink_comment_id=4402925 diff --git a/.config/nixshell/mongo.nix b/.config/nixshell/mongo.nix index a1c625e..cf15063 100644 --- a/.config/nixshell/mongo.nix +++ b/.config/nixshell/mongo.nix @@ -4,8 +4,8 @@ let in pkgs.mkShell { buildInputs = with pkgs; [ - unstable.mongodb - mongosh + #unstable.mongodb + #mongosh ]; shellHook = '' ''; diff --git a/.config/nixshell/python.nix b/.config/nixshell/python.nix new file mode 100644 index 0000000..0b2351a --- /dev/null +++ b/.config/nixshell/python.nix @@ -0,0 +1,50 @@ +let + pkgs = import {}; + my-python-packages = ps: with ps; [ + pandas + requests + tkinter + gunicorn + python-vlc + mpv + ( + buildPythonPackage rec { + pname = "tkVideo"; + version = "0.1"; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-nxSWlqwC7rlPJbJQGtlb1AP75omUZWK2sNVgQJYVGfU="; + }; + doCheck = false; + propagatedBuildInputs = [ + imageio + ]; + } + ) + opencv4 + #( + # buildPythonPackage rec { + # pname = "opencv-python-headless"; + # version = "4.8.0.76"; + # src = fetchPypi { + # inherit pname version; + # sha256 = "sha256-vBVyYYfa4m2KCHd/r2vHHTjyDHhcECZ39Yug6TUAOvs="; + # }; + # doCheck = false; + # propagatedBuildInputs = [ + # ]; + # } + #) + + pillow + flask + flask_sqlalchemy + flask_login + flask-cors + imageio + imageio-ffmpeg + pyavm + ]; + my-python = pkgs.python310.withPackages my-python-packages; +in + my-python.env diff --git a/.config/nixshell/rust.nix b/.config/nixshell/rust.nix index d93470d..638fda1 100644 --- a/.config/nixshell/rust.nix +++ b/.config/nixshell/rust.nix @@ -8,6 +8,7 @@ in cargo libressl rustfmt + mdbook ]; nativeBuildInputs = with pkgs; [ pkg-config diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 30dce04..4052acf 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -19,6 +19,9 @@ vim.o.scrolloff = 8 -- vim.keymap.set("n", "pv", vim.cmd.Ex) +--clear hightlight +vim.keymap.set("n", "h", ":noh", {noremap=true}) + --move line shortcut vim.keymap.set("n", "", ":m +1==", {noremap = true}) vim.keymap.set("n", "", ":m -2==", {noremap = true}) diff --git a/.config/nvim/plugin/harpoon.lua b/.config/nvim/plugin/harpoon.lua index 0340aed..a8ca66f 100644 --- a/.config/nvim/plugin/harpoon.lua +++ b/.config/nvim/plugin/harpoon.lua @@ -2,6 +2,7 @@ local mark = require("harpoon.mark") local ui = require("harpoon.ui") vim.keymap.set("n", "a", mark.add_file) +vim.keymap.set("n", "q", mark.add_file) vim.keymap.set("n", "", ui.toggle_quick_menu) vim.keymap.set("n", "", function() ui.nav_file(1) end) @@ -9,3 +10,6 @@ vim.keymap.set("n", "", function() ui.nav_file(2) end) vim.keymap.set("n", "", function() ui.nav_file(3) end) vim.keymap.set("n", "", function() ui.nav_file(4) end) vim.keymap.set("n", "", function() ui.nav_file(5) end) + +vim.keymap.set("n", "", function() ui.nav_file(1) end) +vim.keymap.set("n", "", function() ui.nav_file(2) end)