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
|
||||
clang-tools_15
|
||||
valgrind
|
||||
xorg.xcbutil
|
||||
xorg.xcbutilkeysyms
|
||||
];
|
||||
nativeBuildInputs = with pkgs; [
|
||||
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) ]; };
|
||||
unstable = import <unstable> {};
|
||||
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
|
||||
|
||||
@@ -4,8 +4,8 @@ let
|
||||
in
|
||||
pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
unstable.mongodb
|
||||
mongosh
|
||||
#unstable.mongodb
|
||||
#mongosh
|
||||
];
|
||||
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
|
||||
libressl
|
||||
rustfmt
|
||||
mdbook
|
||||
];
|
||||
nativeBuildInputs = with pkgs; [
|
||||
pkg-config
|
||||
|
||||
@@ -19,6 +19,9 @@ vim.o.scrolloff = 8
|
||||
--
|
||||
vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
|
||||
|
||||
--clear hightlight
|
||||
vim.keymap.set("n", "<leader>h", ":noh<CR>", {noremap=true})
|
||||
|
||||
--move line shortcut
|
||||
vim.keymap.set("n", "<M-j>", ":m +1<CR>==", {noremap = true})
|
||||
vim.keymap.set("n", "<M-k>", ":m -2<CR>==", {noremap = true})
|
||||
|
||||
@@ -1,18 +1,23 @@
|
||||
return require('packer').startup(function()
|
||||
use 'wbthomason/packer.nvim'
|
||||
use 'sonph/onehalf'
|
||||
use 'navarasu/onedark.nvim'
|
||||
use {
|
||||
'nvim-telescope/telescope.nvim', tag = '0.1.1',
|
||||
-- or , branch = '0.1.x',
|
||||
requires = { {'nvim-lua/plenary.nvim'} }
|
||||
}
|
||||
use({
|
||||
'rose-pine/neovim',
|
||||
as = 'rose-pine',
|
||||
config = function()
|
||||
vim.cmd('colorscheme rose-pine')
|
||||
end
|
||||
})
|
||||
require('onedark').setup {
|
||||
style = 'darker'
|
||||
}
|
||||
require('onedark').load()
|
||||
-- use({
|
||||
-- 'rose-pine/neovim',
|
||||
-- as = 'rose-pine',
|
||||
-- config = function()
|
||||
-- vim.cmd('colorscheme rose-pine')
|
||||
-- end
|
||||
-- })
|
||||
use('nvim-treesitter/nvim-treesitter', {run = ':TSUpdate'})
|
||||
use {
|
||||
'VonHeikemen/lsp-zero.nvim',
|
||||
|
||||
@@ -2,6 +2,7 @@ local mark = require("harpoon.mark")
|
||||
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", "<C-e>", ui.toggle_quick_menu)
|
||||
|
||||
vim.keymap.set("n", "<M-a>", function() ui.nav_file(1) end)
|
||||
@@ -9,3 +10,6 @@ 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-r>", function() ui.nav_file(4) 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)
|
||||
|
||||
@@ -125,6 +125,11 @@ _G.packer_plugins = {
|
||||
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/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 = {
|
||||
loaded = true,
|
||||
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/onehalf",
|
||||
@@ -140,12 +145,6 @@ _G.packer_plugins = {
|
||||
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/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/grimhilt/.local/share/nvim/site/pack/packer/start/rose-pine",
|
||||
url = "https://github.com/rose-pine/neovim"
|
||||
},
|
||||
["telescope.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/telescope.nvim",
|
||||
@@ -158,10 +157,6 @@ time([[Defining packer_plugins]], false)
|
||||
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")
|
||||
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
|
||||
if _G._packer.needs_bufread == true then
|
||||
|
||||
Reference in New Issue
Block a user