From fa53788c7a7b7a05a5bb40147575f5d8669307dd Mon Sep 17 00:00:00 2001 From: Anish L Date: Sun, 10 Oct 2021 18:34:00 +1000 Subject: [PATCH] some changes, will need to add these to devos --- config/git/config | 6 ++-- config/sxhkd/sxhkdrc | 4 +-- hosts/common.nix | 7 ++-- hosts/curve/configuration.nix | 8 ++++- hosts/curve/default.nix | 2 +- modules/editors/vim.nix | 2 +- modules/nvim.nix | 62 ++++++++++++++++++++++++++++++++--- result | 2 +- 8 files changed, 75 insertions(+), 18 deletions(-) diff --git a/config/git/config b/config/git/config index 3ec8b11d..32869dc5 100644 --- a/config/git/config +++ b/config/git/config @@ -6,9 +6,9 @@ [init] defaultBranch = main [github] - user = hlissner + user = chickensoupwithrice [gitlab] - user = hlissner + user = [rebase] autosquash = true [push] @@ -30,7 +30,7 @@ insteadOf = gh: [url "git@github.com:"] insteadOf = ssh+gh: -[url "git@github.com:hlissner/"] +[url "git@github.com:chickensoupwithrice/"] insteadOf = gh:/ [url "https://gitlab.com/"] insteadOf = gl: diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc index 930d09cd..d9acf138 100644 --- a/config/sxhkd/sxhkdrc +++ b/config/sxhkd/sxhkdrc @@ -13,10 +13,10 @@ super + apostrophe # Attach to a detached session. If none is available create a new one, rather # than attach to one that is already attached to elsewhere. super + Return - xst -e bash -c "(tmux ls | grep -qEv 'attached|scratch' && tmux at) || tmux" + kitty ctrl + super + Return - xst + xst -e bash -c "(tmux ls | grep -qEv 'attached|scratch' && tmux at) || tmux" # Open a disposable, floating terminal window, for quick shell commands. super + grave diff --git a/hosts/common.nix b/hosts/common.nix index 97214058..3ce7a772 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -1,10 +1,10 @@ { config, pkgs, ... }: { - imports = [ +# imports = [ # ./nvim.nix # ./unstable.nix - ]; +# ]; environment.systemPackages = with pkgs; [ @@ -81,7 +81,6 @@ powerline-fonts supercollider haskellPackages.tidal - # vim-zettel pandoc ]; @@ -90,7 +89,7 @@ # needed for vcv-rack nixpkgs.config.allowUnfree = true; - system.copySystemConfiguration = true; + #system.copySystemConfiguration = true; #services.syncthing = { # enable = true; # openDefaultPorts = true; diff --git a/hosts/curve/configuration.nix b/hosts/curve/configuration.nix index 0e2431b1..409453ef 100755 --- a/hosts/curve/configuration.nix +++ b/hosts/curve/configuration.nix @@ -32,6 +32,11 @@ }; }; + services.udev.extraRules = '' + SUBSYSTEMS=="usb", ATTRS{manufacturer}=="NVIDIA Corp.", ATTRS{product}=="APX", GROUP="switch" + ''; + services.udev.packages = [ pkgs.android-udev-rules ]; + # nix = { # package = pkgs.nixUnstable; # extraOptions = "experimental-features = nix-command flakes"; @@ -59,10 +64,11 @@ hardware.pulseaudio.enable = true; services.xserver.libinput.enable = true; + programs.adb.enable = true; users.users.anish = { isNormalUser = true; - extraGroups = [ "wheel" "video" ]; + extraGroups = [ "wheel" "video" "switch" "adbusers" ]; }; # Enable the OpenSSH daemon. diff --git a/hosts/curve/default.nix b/hosts/curve/default.nix index 44846df4..601086f2 100644 --- a/hosts/curve/default.nix +++ b/hosts/curve/default.nix @@ -52,7 +52,7 @@ editors = { default = "vim"; #emacs.enable = true; - vim.enable = true; + #vim.enable = true; }; shell = { adl.enable = true; diff --git a/modules/editors/vim.nix b/modules/editors/vim.nix index 6bf2c9e6..e4d26962 100644 --- a/modules/editors/vim.nix +++ b/modules/editors/vim.nix @@ -274,7 +274,7 @@ in { # taskwiki # #vim-zettel # ]; - #}; + }; environment.shellAliases = { vim = "nvim"; diff --git a/modules/nvim.nix b/modules/nvim.nix index 081e0a5c..6aef29a1 100644 --- a/modules/nvim.nix +++ b/modules/nvim.nix @@ -1,17 +1,63 @@ { pkgs, ... }: - #nvim +let + customPlugins = { + vim-zettel = pkgs.vimUtils.buildVimPlugin { + name = "vim-zettel"; + src = pkgs.fetchFromGitHub { + owner = "michal-h21"; + repo = "vim-zettel"; + rev = "929d90eec62e6f693c2702d2b6f76a93f2f1689d"; + sha256 = "1fzKmknfVlEYwqeXgbKITbb2/PJ023iJyMz6vak3qh4="; + }; + }; + vimwiki-dev = pkgs.vimUtils.buildVimPlugin { + name = "vimwiki-dev"; + src = pkgs.fetchFromGitHub { + owner = "vimwiki"; + repo = "vimwiki"; + rev = "d035a3428c6343b4f218e51340ddf690ad8c57ee"; + sha256 = "000000000000000000000000PJ023iJyMz6vak3qh4="; + }; + }; + taskwiki-t = pkgs.vimUtils.buildVimPluginFrom2Nix { + pname = "taskwiki"; + version = "2021-09-22"; + src = pkgs.fetchFromGitHub { + owner = "tools-life"; + repo = "taskwiki"; + rev = "c4392c36c01cfffcb06f460d722990b98bc53bdb"; + sha256 = "QrxFqu/Y6FykXGqIlK52+nDwmnBhubURl6v2Zc/KwPw="; + }; + meta.homepage = "https://github.com/tools-life/taskwiki/"; + }; + }; + my-python-packages = python-packages: with python-packages; [ + tasklib + pynvim + six + # other python packages you want + ]; + python-with-my-packages = pkgs.python3.withPackages my-python-packages; +in { environment.variables.EDITOR = "nvim"; environment.shellAliases = { k = "vim -c :VimwikiIndex"; kz = "vim -c :VimwikiIndex -c :ZettelNew"; }; - environment.systemPackages = with pkgs; [ + environment.systemPackages = with pkgs // customPlugins; [ nodejs + python-with-my-packages + #python3Packages.pynvim + #python3Packages.six + #python3Packages.tasklib + #python3 ( neovim.override { vimAlias = true; + withPython3 = true; + extraPython3Packages = pkgs: with pkgs; [ tasklib six ]; configure = { packages.myPlugins = with pkgs.vimPlugins; { start = [ @@ -30,21 +76,24 @@ coc-python coc-pairs coc-emmet - emmet-vim LanguageClient-neovim ayu-vim rainbow_parentheses-vim vim-surround vim-fugitive - #iron-nvim #nvim-colorizer vim-devicons # testing #vim-processing #vim-tidal taskwiki - #vim-zettel + vim-zettel #vimwiki-sync + telescope-nvim + # Clojure stuff + conjure + vim-sexp + vim-sexp-mappings-for-regular-people ]; }; customRC = '' @@ -105,6 +154,9 @@ let g:syntastic_check_on_open = 1 let g:syntastic_check_on_wq = 0 + " Sexp in Conjure (since it's fennel) + " let g:sexp_filetypes = [ "fennel" ] + let g:rainbow_active = 0 autocmd BufReadPost,BufNewFile c,py,nix RainbowParenthesesToggleAll diff --git a/result b/result index 701bab1e..1d33f7e0 120000 --- a/result +++ b/result @@ -1 +1 @@ -/nix/store/pvjf03kq24z7qbamxdg8mba73c2jpmk1-nixos-system-curve-21.11.20210724.dd14e5d \ No newline at end of file +/nix/store/wspdn6hk1104zpry75swll0qvs4jdyip-nixos-system-curve-21.11.20210724.dd14e5d \ No newline at end of file