Compare commits
3 Commits
qwerty
...
ebfa8a1088
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ebfa8a1088 | ||
|
|
e84d6e57b8 | ||
|
|
680f6101e9 |
13
.bashrc
Normal file
13
.bashrc
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
|
||||||
|
alias gs='git status'
|
||||||
|
alias gl='git log'
|
||||||
|
alias ga='git add'
|
||||||
|
alias gaa='git add -A'
|
||||||
|
alias gc='git commit -m'
|
||||||
|
alias gt='git tag -ma'
|
||||||
|
alias gp='git push'
|
||||||
|
alias gpt='git push --follow-tags'
|
||||||
|
alias gd='git diff'
|
||||||
|
|
||||||
|
alias n='nvim'
|
||||||
|
alias p='cd ~/Documents/prog'
|
||||||
@@ -15,6 +15,8 @@ in
|
|||||||
libinput
|
libinput
|
||||||
clang-tools_15
|
clang-tools_15
|
||||||
valgrind
|
valgrind
|
||||||
|
xorg.xcbutil
|
||||||
|
xorg.xcbutilkeysyms
|
||||||
];
|
];
|
||||||
nativeBuildInputs = with pkgs; [
|
nativeBuildInputs = with pkgs; [
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|||||||
11
.config/nixshell/caml.nix
Normal file
11
.config/nixshell/caml.nix
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
let
|
||||||
|
pkgs = import <nixpkgs> {};
|
||||||
|
in
|
||||||
|
pkgs.mkShell {
|
||||||
|
buildInputs = with pkgs; [
|
||||||
|
ocaml
|
||||||
|
pkg-config
|
||||||
|
opam
|
||||||
|
xorg.libX11
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -1,8 +1,10 @@
|
|||||||
let pkgs = import <nixpkgs> { overlays = [ (import ./cypress-overlay.nix) ]; };
|
let pkgs = import <nixpkgs> { overlays = [ (import ./cypress-overlay.nix) ]; };
|
||||||
|
unstable = import <unstable> {};
|
||||||
in pkgs.mkShell {
|
in pkgs.mkShell {
|
||||||
name = "matrix-shell";
|
name = "matrix-shell";
|
||||||
buildInputs = with pkgs; [
|
buildInputs = with pkgs; [
|
||||||
yarn
|
yarn
|
||||||
|
nodejs
|
||||||
docker
|
docker
|
||||||
act
|
act
|
||||||
gtk2
|
gtk2
|
||||||
@@ -26,14 +28,14 @@ in pkgs.mkShell {
|
|||||||
xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core libdbusmenu
|
xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core libdbusmenu
|
||||||
libdrm
|
libdrm
|
||||||
mesa # required for libgbm
|
mesa # required for libgbm
|
||||||
cypress
|
unstable.cypress
|
||||||
];
|
];
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
export NAME="matrix-shell"
|
export NAME="matrix-shell"
|
||||||
export NODE_OPTIONS=--openssl-legacy-provider
|
|
||||||
export CYPRESS_INSTALL_BINARY=0
|
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
|
#https://gist.github.com/r-k-b/2485f977b476aa3f76a47329ce7f9ad4?permalink_comment_id=4402925
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ let
|
|||||||
in
|
in
|
||||||
pkgs.mkShell {
|
pkgs.mkShell {
|
||||||
buildInputs = with pkgs; [
|
buildInputs = with pkgs; [
|
||||||
unstable.mongodb
|
#unstable.mongodb
|
||||||
mongosh
|
#mongosh
|
||||||
];
|
];
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
'';
|
'';
|
||||||
|
|||||||
50
.config/nixshell/python.nix
Normal file
50
.config/nixshell/python.nix
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
let
|
||||||
|
pkgs = import <nixpkgs> {};
|
||||||
|
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
|
||||||
@@ -8,6 +8,7 @@ in
|
|||||||
cargo
|
cargo
|
||||||
libressl
|
libressl
|
||||||
rustfmt
|
rustfmt
|
||||||
|
mdbook
|
||||||
];
|
];
|
||||||
nativeBuildInputs = with pkgs; [
|
nativeBuildInputs = with pkgs; [
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|||||||
@@ -19,6 +19,9 @@ vim.o.scrolloff = 8
|
|||||||
--
|
--
|
||||||
vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
|
vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
|
||||||
|
|
||||||
|
--clear hightlight
|
||||||
|
vim.keymap.set("n", "<leader>h", ":noh<CR>", {noremap=true})
|
||||||
|
|
||||||
--move line shortcut
|
--move line shortcut
|
||||||
vim.keymap.set("n", "<M-j>", ":m +1<CR>==", {noremap = true})
|
vim.keymap.set("n", "<M-j>", ":m +1<CR>==", {noremap = true})
|
||||||
vim.keymap.set("n", "<M-k>", ":m -2<CR>==", {noremap = true})
|
vim.keymap.set("n", "<M-k>", ":m -2<CR>==", {noremap = true})
|
||||||
|
|||||||
@@ -1,18 +1,23 @@
|
|||||||
return require('packer').startup(function()
|
return require('packer').startup(function()
|
||||||
use 'wbthomason/packer.nvim'
|
use 'wbthomason/packer.nvim'
|
||||||
use 'sonph/onehalf'
|
use 'sonph/onehalf'
|
||||||
|
use 'navarasu/onedark.nvim'
|
||||||
use {
|
use {
|
||||||
'nvim-telescope/telescope.nvim', tag = '0.1.1',
|
'nvim-telescope/telescope.nvim', tag = '0.1.1',
|
||||||
-- or , branch = '0.1.x',
|
-- or , branch = '0.1.x',
|
||||||
requires = { {'nvim-lua/plenary.nvim'} }
|
requires = { {'nvim-lua/plenary.nvim'} }
|
||||||
}
|
}
|
||||||
use({
|
require('onedark').setup {
|
||||||
'rose-pine/neovim',
|
style = 'darker'
|
||||||
as = 'rose-pine',
|
}
|
||||||
config = function()
|
require('onedark').load()
|
||||||
vim.cmd('colorscheme rose-pine')
|
-- use({
|
||||||
end
|
-- 'rose-pine/neovim',
|
||||||
})
|
-- as = 'rose-pine',
|
||||||
|
-- config = function()
|
||||||
|
-- vim.cmd('colorscheme rose-pine')
|
||||||
|
-- end
|
||||||
|
-- })
|
||||||
use('nvim-treesitter/nvim-treesitter', {run = ':TSUpdate'})
|
use('nvim-treesitter/nvim-treesitter', {run = ':TSUpdate'})
|
||||||
use {
|
use {
|
||||||
'VonHeikemen/lsp-zero.nvim',
|
'VonHeikemen/lsp-zero.nvim',
|
||||||
|
|||||||
@@ -1,11 +1,15 @@
|
|||||||
local mark = require("harpoon.mark")
|
local mark = require("harpoon.mark")
|
||||||
local ui = require("harpoon.ui")
|
local ui = require("harpoon.ui")
|
||||||
|
|
||||||
|
vim.keymap.set("n", "<leader>a", mark.add_file)
|
||||||
vim.keymap.set("n", "<leader>q", mark.add_file)
|
vim.keymap.set("n", "<leader>q", mark.add_file)
|
||||||
vim.keymap.set("n", "<C-e>", ui.toggle_quick_menu)
|
vim.keymap.set("n", "<C-e>", ui.toggle_quick_menu)
|
||||||
|
|
||||||
vim.keymap.set("n", "<M-q>", function() ui.nav_file(1) end)
|
vim.keymap.set("n", "<M-a>", function() ui.nav_file(1) end)
|
||||||
vim.keymap.set("n", "<M-w>", function() ui.nav_file(2) end)
|
vim.keymap.set("n", "<M-z>", function() ui.nav_file(2) end)
|
||||||
vim.keymap.set("n", "<M-e>", function() ui.nav_file(3) end)
|
vim.keymap.set("n", "<M-e>", function() ui.nav_file(3) end)
|
||||||
vim.keymap.set("n", "<M-r>", function() ui.nav_file(4) end)
|
vim.keymap.set("n", "<M-r>", function() ui.nav_file(4) end)
|
||||||
vim.keymap.set("n", "<M-t>", function() ui.nav_file(5) end)
|
vim.keymap.set("n", "<M-t>", function() ui.nav_file(5) end)
|
||||||
|
|
||||||
|
vim.keymap.set("n", "<M-q>", function() ui.nav_file(1) end)
|
||||||
|
vim.keymap.set("n", "<M-w>", function() ui.nav_file(2) end)
|
||||||
|
|||||||
@@ -49,8 +49,8 @@ local function save_profiles(threshold)
|
|||||||
end
|
end
|
||||||
|
|
||||||
time([[Luarocks path setup]], true)
|
time([[Luarocks path setup]], true)
|
||||||
local package_path_str = "/home/hugo.meens/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/hugo.meens/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/hugo.meens/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/hugo.meens/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
|
local package_path_str = "/home/grimhilt/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/grimhilt/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/grimhilt/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/grimhilt/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
|
||||||
local install_cpath_pattern = "/home/hugo.meens/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
|
local install_cpath_pattern = "/home/grimhilt/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
|
||||||
if not string.find(package.path, package_path_str, 1, true) then
|
if not string.find(package.path, package_path_str, 1, true) then
|
||||||
package.path = package.path .. ';' .. package_path_str
|
package.path = package.path .. ';' .. package_path_str
|
||||||
end
|
end
|
||||||
@@ -76,79 +76,78 @@ time([[Defining packer_plugins]], true)
|
|||||||
_G.packer_plugins = {
|
_G.packer_plugins = {
|
||||||
LuaSnip = {
|
LuaSnip = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/hugo.meens/.local/share/nvim/site/pack/packer/start/LuaSnip",
|
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/LuaSnip",
|
||||||
url = "https://github.com/L3MON4D3/LuaSnip"
|
url = "https://github.com/L3MON4D3/LuaSnip"
|
||||||
},
|
},
|
||||||
["cmp-nvim-lsp"] = {
|
["cmp-nvim-lsp"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/hugo.meens/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
|
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
|
||||||
url = "https://github.com/hrsh7th/cmp-nvim-lsp"
|
url = "https://github.com/hrsh7th/cmp-nvim-lsp"
|
||||||
},
|
},
|
||||||
harpoon = {
|
harpoon = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/hugo.meens/.local/share/nvim/site/pack/packer/start/harpoon",
|
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/harpoon",
|
||||||
url = "https://github.com/theprimeagen/harpoon"
|
url = "https://github.com/theprimeagen/harpoon"
|
||||||
},
|
},
|
||||||
["lsp-zero.nvim"] = {
|
["lsp-zero.nvim"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/hugo.meens/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim",
|
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim",
|
||||||
url = "https://github.com/VonHeikemen/lsp-zero.nvim"
|
url = "https://github.com/VonHeikemen/lsp-zero.nvim"
|
||||||
},
|
},
|
||||||
["mason-lspconfig.nvim"] = {
|
["mason-lspconfig.nvim"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/hugo.meens/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim",
|
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim",
|
||||||
url = "https://github.com/williamboman/mason-lspconfig.nvim"
|
url = "https://github.com/williamboman/mason-lspconfig.nvim"
|
||||||
},
|
},
|
||||||
["mason.nvim"] = {
|
["mason.nvim"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/hugo.meens/.local/share/nvim/site/pack/packer/start/mason.nvim",
|
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/mason.nvim",
|
||||||
url = "https://github.com/williamboman/mason.nvim"
|
url = "https://github.com/williamboman/mason.nvim"
|
||||||
},
|
},
|
||||||
["nvim-autopairs"] = {
|
["nvim-autopairs"] = {
|
||||||
config = { "\27LJ\2\n@\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0" },
|
config = { "\27LJ\2\n@\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0" },
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/hugo.meens/.local/share/nvim/site/pack/packer/start/nvim-autopairs",
|
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/nvim-autopairs",
|
||||||
url = "https://github.com/windwp/nvim-autopairs"
|
url = "https://github.com/windwp/nvim-autopairs"
|
||||||
},
|
},
|
||||||
["nvim-cmp"] = {
|
["nvim-cmp"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/hugo.meens/.local/share/nvim/site/pack/packer/start/nvim-cmp",
|
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/nvim-cmp",
|
||||||
url = "https://github.com/hrsh7th/nvim-cmp"
|
url = "https://github.com/hrsh7th/nvim-cmp"
|
||||||
},
|
},
|
||||||
["nvim-lspconfig"] = {
|
["nvim-lspconfig"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/hugo.meens/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
|
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
|
||||||
url = "https://github.com/neovim/nvim-lspconfig"
|
url = "https://github.com/neovim/nvim-lspconfig"
|
||||||
},
|
},
|
||||||
["nvim-treesitter"] = {
|
["nvim-treesitter"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/hugo.meens/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
|
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
|
||||||
url = "https://github.com/nvim-treesitter/nvim-treesitter"
|
url = "https://github.com/nvim-treesitter/nvim-treesitter"
|
||||||
},
|
},
|
||||||
|
["onedark.nvim"] = {
|
||||||
|
loaded = true,
|
||||||
|
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/onedark.nvim",
|
||||||
|
url = "https://github.com/navarasu/onedark.nvim"
|
||||||
|
},
|
||||||
onehalf = {
|
onehalf = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/hugo.meens/.local/share/nvim/site/pack/packer/start/onehalf",
|
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/onehalf",
|
||||||
url = "https://github.com/sonph/onehalf"
|
url = "https://github.com/sonph/onehalf"
|
||||||
},
|
},
|
||||||
["packer.nvim"] = {
|
["packer.nvim"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/hugo.meens/.local/share/nvim/site/pack/packer/start/packer.nvim",
|
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/packer.nvim",
|
||||||
url = "https://github.com/wbthomason/packer.nvim"
|
url = "https://github.com/wbthomason/packer.nvim"
|
||||||
},
|
},
|
||||||
["plenary.nvim"] = {
|
["plenary.nvim"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/hugo.meens/.local/share/nvim/site/pack/packer/start/plenary.nvim",
|
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/plenary.nvim",
|
||||||
url = "https://github.com/nvim-lua/plenary.nvim"
|
url = "https://github.com/nvim-lua/plenary.nvim"
|
||||||
},
|
},
|
||||||
["rose-pine"] = {
|
|
||||||
config = { "\27LJ\2\n9\0\0\3\0\3\0\0056\0\0\0009\0\1\0'\2\2\0B\0\2\1K\0\1\0\26colorscheme rose-pine\bcmd\bvim\0" },
|
|
||||||
loaded = true,
|
|
||||||
path = "/home/hugo.meens/.local/share/nvim/site/pack/packer/start/rose-pine",
|
|
||||||
url = "https://github.com/rose-pine/neovim"
|
|
||||||
},
|
|
||||||
["telescope.nvim"] = {
|
["telescope.nvim"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/hugo.meens/.local/share/nvim/site/pack/packer/start/telescope.nvim",
|
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/telescope.nvim",
|
||||||
url = "https://github.com/nvim-telescope/telescope.nvim"
|
url = "https://github.com/nvim-telescope/telescope.nvim"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -158,10 +157,6 @@ time([[Defining packer_plugins]], false)
|
|||||||
time([[Config for nvim-autopairs]], true)
|
time([[Config for nvim-autopairs]], true)
|
||||||
try_loadstring("\27LJ\2\n@\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs")
|
try_loadstring("\27LJ\2\n@\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs")
|
||||||
time([[Config for nvim-autopairs]], false)
|
time([[Config for nvim-autopairs]], false)
|
||||||
-- Config for: rose-pine
|
|
||||||
time([[Config for rose-pine]], true)
|
|
||||||
try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\0056\0\0\0009\0\1\0'\2\2\0B\0\2\1K\0\1\0\26colorscheme rose-pine\bcmd\bvim\0", "config", "rose-pine")
|
|
||||||
time([[Config for rose-pine]], false)
|
|
||||||
|
|
||||||
_G._packer.inside_compile = false
|
_G._packer.inside_compile = false
|
||||||
if _G._packer.needs_bufread == true then
|
if _G._packer.needs_bufread == true then
|
||||||
|
|||||||
Reference in New Issue
Block a user