diff --git a/flake.lock b/flake.lock index c933b58d..47f00976 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1638319138, - "narHash": "sha256-ve33f4nTKQluyvm5URQwL019x0Fnrg8urqzvymNeD+s=", + "lastModified": 1643841757, + "narHash": "sha256-9tKhu4JzoZvustC9IEWK6wKcDhPLuK/ICbLgm8QnLnk=", "owner": "ryantm", "repo": "agenix", - "rev": "52ea2f8c3231cc2b5302fa28c63588aacb77ea29", + "rev": "a17d1f30550260f8b45764ddbd0391f4b1ed714a", "type": "github" }, "original": { @@ -27,11 +27,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1630693543, - "narHash": "sha256-7Sly3ReaJZw60Qo0rpfN4jF6zy94nwQz6ENgUUFzJfg=", + "lastModified": 1641830469, + "narHash": "sha256-uhDmgNP/biOWe4FtOa6c2xZnREH+NP9rdrMm0LccRUk=", "owner": "lovesegfault", "repo": "beautysh", - "rev": "5609593961b70428f58d5c1b4b25cdda43b0d0bd", + "rev": "e85d9736927c0fcf2abb05cb3a2d8d9b4502a2eb", "type": "github" }, "original": { @@ -67,11 +67,11 @@ ] }, "locked": { - "lastModified": 1633877936, - "narHash": "sha256-+o3n6s7fR8dBGRldTGelyp2j3jSyTlrniOXwNfmMG20=", + "lastModified": 1642035816, + "narHash": "sha256-1Lq5c1AeUv/1SK08+O704JVfDdD/zodHzA0cv0TIga8=", "owner": "divnix", "repo": "bud", - "rev": "15df091133ff95216c321b09be04905c0a0944c4", + "rev": "a789d710851441ba7e7cd59be378623b1fe05688", "type": "github" }, "original": { @@ -87,11 +87,11 @@ ] }, "locked": { - "lastModified": 1634994402, - "narHash": "sha256-xmlCVVOYGpZoxgOqsDOVF0B0ASrnbNGVAEzID9qh2xo=", + "lastModified": 1645007752, + "narHash": "sha256-FQZMiVP/1vgR7x+TWonMf0NZczrZ4ZjhSTj3rM+kglY=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "44da835ac40dab5fd231298b59d83487382d2fab", + "rev": "c944b5ee82a829ddf7fa6bd9300bc2fe3d005fa1", "type": "github" }, "original": { @@ -110,11 +110,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1638318651, - "narHash": "sha256-YsYBMa8Chtb6ccGZOVStReiZ33ZNmi7kNPLf/Ua2kY8=", + "lastModified": 1639771334, + "narHash": "sha256-4hgZmsCPaL5QlcEijHmzaYYrEwHtUFqraCUrCqLGJOo=", "owner": "input-output-hk", "repo": "deploy-rs", - "rev": "1d3a4f4681a98479219c628165bb6b3a12eae843", + "rev": "7267eab9139ca4476fd8ed49e2e8652bba4c037f", "type": "github" }, "original": { @@ -145,7 +145,6 @@ "deploy" ], "devshell": "devshell", - "flake-utils": "flake-utils_3", "flake-utils-plus": "flake-utils-plus", "home-manager": [ "home" @@ -160,11 +159,11 @@ ] }, "locked": { - "lastModified": 1638227261, - "narHash": "sha256-CbleULqH3NRnnLdwqHqi0qk1sEmhyXE8ZOzjofilGM4=", + "lastModified": 1643510242, + "narHash": "sha256-9C9DyJhQ5bevk0CEEjGct+U9EqUgHg8T70nxz47zjMI=", "owner": "divnix", "repo": "digga", - "rev": "1ce6cef4230f82cb986ef3d08d57a2e3a0e6e80d", + "rev": "33bfb05b8a148d8ad6a842de74e22209bf9fe5d7", "type": "github" }, "original": { @@ -179,11 +178,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1637303083, - "narHash": "sha256-e2A5JBjxYNpjoGd53K0oVUUaS9ojwOT5rnThyPNS46M=", + "lastModified": 1639117493, + "narHash": "sha256-67H9uXUdauaqMfkcKzpgHR3GeOKPAwOs6G3C1VpT67o=", "owner": "nix-community", "repo": "fenix", - "rev": "8294ceadbbbe1a886640bfcc15f5a02a2b471955", + "rev": "94b5686cad2ed210da106b0b7e1e212dab43fbf2", "type": "github" }, "original": { @@ -226,11 +225,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "lastModified": 1631561581, + "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", "owner": "numtide", "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", "type": "github" }, "original": { @@ -241,29 +240,29 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_4" + "flake-utils": "flake-utils_3" }, "locked": { - "lastModified": 1630859749, - "narHash": "sha256-qkoU2rIbbP2+T0dfcqXW35GCWNsi0Y1IgN9BELmt4Zo=", - "owner": "divnix", + "lastModified": 1639385028, + "narHash": "sha256-oqorKz3mwf7UuDJwlbCEYCB2LfcWLL0DkeCWhRIL820=", + "owner": "gytis-ivaskevicius", "repo": "flake-utils-plus", - "rev": "a4e267e3fc87e60c5029c6c3855935ff1ff3018e", + "rev": "be1be083af014720c14f3b574f57b6173b4915d0", "type": "github" }, "original": { - "owner": "divnix", + "owner": "gytis-ivaskevicius", "repo": "flake-utils-plus", "type": "github" } }, "flake-utils_2": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { @@ -302,21 +301,6 @@ "type": "github" } }, - "flake-utils_5": { - "locked": { - "lastModified": 1631561581, - "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home": { "inputs": { "nixpkgs": [ @@ -324,11 +308,11 @@ ] }, "locked": { - "lastModified": 1638267006, - "narHash": "sha256-heZdDlD09rnoeEiZ4wKfbXNDkO5I9qVFvX9d790h/XE=", + "lastModified": 1643933536, + "narHash": "sha256-yRmsWAG4DnLxLIUtlaZsl0kH7rN5xSoyNRlf0YZrcH4=", "owner": "nix-community", "repo": "home-manager", - "rev": "3e93c4e8b2b479c712b7c20a428993b459118842", + "rev": "2860d7e3bb350f18f7477858f3513f9798896831", "type": "github" }, "original": { @@ -356,11 +340,11 @@ }, "latest_2": { "locked": { - "lastModified": 1638376152, - "narHash": "sha256-ucgLpVqhFnClH7YRUHBHnmiOd82RZdFR3XJt36ks5fE=", + "lastModified": 1644525281, + "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6daa4a5c045d40e6eae60a3b6e427e8700f1c07f", + "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", "type": "github" }, "original": { @@ -377,11 +361,11 @@ ] }, "locked": { - "lastModified": 1638203339, - "narHash": "sha256-Sz3iCvbWrVWOD/XfYQeRJgP/7MVYL3/VKsNXvDeWBFc=", + "lastModified": 1639947939, + "narHash": "sha256-pGsM8haJadVP80GFq4xhnSpNitYNQpaXk4cnA796Cso=", "owner": "nmattia", "repo": "naersk", - "rev": "c3e56b8a4ffb6d906cdfcfee034581f9a8ece571", + "rev": "2fc8ce9d3c025d59fee349c1f80be9785049d653", "type": "github" }, "original": { @@ -392,11 +376,11 @@ }, "nixlib": { "locked": { - "lastModified": 1638059559, - "narHash": "sha256-cCGV2TCDLN+iwHxoplk4uZOvc7TqdlsW5nBVcu943IU=", + "lastModified": 1641688481, + "narHash": "sha256-6L+EU12xLDHby7y8elgFtRKVBxix+7qV8DhVgXqrKZo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "44e0fa2ab408508a60dd4f213d75fd0c64262dde", + "rev": "f697717b3d3a074ffc16c8c8227504f0db292886", "type": "github" }, "original": { @@ -407,11 +391,11 @@ }, "nixos": { "locked": { - "lastModified": 1638442392, - "narHash": "sha256-6FFbew4MfkdwcdM8Tzpm91uxBJsGKFZHkFDiDPKlgdM=", + "lastModified": 1645043747, + "narHash": "sha256-HjepP5RqpkPR5N1k1GnYmekYjZKqhVjYec1G6W/ZLz4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6525c02d2b1692a3bcd457ff8943ce55b9c129da", + "rev": "62a2a1be29f6a3356e72d87970da4c396ac8d08f", "type": "github" }, "original": { @@ -442,11 +426,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1638440530, - "narHash": "sha256-kmoNW+RmSka988iWvSrkiAxO8g6D76O0gW2cIIhL6U8=", + "lastModified": 1644870092, + "narHash": "sha256-RLPD92lqXW98LDIbbwYqwAbt3R4iD1V1PiylfgBq5cU=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "4c9f07277bd4bc29a051ff2a0ca58c6403e3881a", + "rev": "10eab1c4cd8e715c0b41d32c28af2b89fc67bed0", "type": "github" }, "original": { @@ -457,11 +441,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1638565206, - "narHash": "sha256-5z7RBRw0qh3REJieanK3PkMHl0EuzZr2efZqAz44Bjg=", + "lastModified": 1633971123, + "narHash": "sha256-WmI4NbH1IPGFWVkuBkKoYgOnxgwSfWDgdZplJlQ93vA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9a1652a858329525c143450db2474ef439cf6c1", + "rev": "e4ef597edfd8a0ba5f12362932fc9b1dd01a0aef", "type": "github" }, "original": { @@ -473,11 +457,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1638585354, - "narHash": "sha256-wzt6GBJNriOPEeHSZ6SdmESBmAZYlXPIFbVjZjRqsGc=", + "lastModified": 1645098413, + "narHash": "sha256-kROvsEv0t0zhl1c57ELsFr0Bkq90VOnQtIdNY8OHZ2U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "77dc4eecc2c8c9b99f9715224f3ff139cfe5dea4", + "rev": "0e6dd09d2420ff6d6c084e2e1a14c3404d871421", "type": "github" }, "original": { @@ -488,11 +472,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1636976544, - "narHash": "sha256-9ZmdyoRz4Qu8bP5BKR1T10YbzcB9nvCeQjOEw2cRKR0=", + "lastModified": 1638986258, + "narHash": "sha256-OceRdctKZRSgqQxVRvvNB0MaEnFMzQqjUffecoDE9eI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "931ab058daa7e4cd539533963f95e2bb0dbd41e6", + "rev": "581d2d6c9cd5c289002203581d8aa0861963a933", "type": "github" }, "original": { @@ -504,11 +488,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1638432899, - "narHash": "sha256-iZ+rgyRx3JVyylXYxSyW01liDWEn+O8cKnin6cMzOFU=", + "lastModified": 1644972330, + "narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "56cbe42f1668338d05febfbb866e32f2c865609a", + "rev": "19574af0af3ffaf7c9e359744ed32556f34536bd", "type": "github" }, "original": { @@ -534,17 +518,17 @@ "nvfetcher": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixos" ] }, "locked": { - "lastModified": 1634524567, - "narHash": "sha256-v9ZTZj1WNQaaVfs1P1mUPuh518mmwpqszj1EjdeGUmc=", + "lastModified": 1644123018, + "narHash": "sha256-xEhhLmuy4FnT4Zdkf3epPX9T3xqn59yERCsicG4IEyM=", "owner": "berberman", "repo": "nvfetcher", - "rev": "807513f4bbd0e3b5863f4c3b91f8ac846ed6da9b", + "rev": "9f2cb15c4668859312b6a854d79ad753d5b98b03", "type": "github" }, "original": { @@ -559,11 +543,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1625240517, - "narHash": "sha256-2E1gaOP+bCplhf3kliVQWK5N1NV2h06mkJk2KTiRTJQ=", + "lastModified": 1633382856, + "narHash": "sha256-hYlet806M9xJj4yxf0g5fhDT2IEUVIMAl7sqIeZ8DUM=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "e40e8ed0e8c11e709e4c8c7c20174facd265a021", + "rev": "705cbfa10e3d9bfed2e59e0256844ae3704dbd7e", "type": "github" }, "original": { @@ -591,11 +575,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1637268320, - "narHash": "sha256-lxB1r+7cmZisiGLx0tZ2LaC6X/EcQTbRIWZfnLIIgs4=", + "lastModified": 1639071661, + "narHash": "sha256-4YySLORuK0qGGIEJj78S7CZ4jy4GIHJ5ks17k5AWblo=", "owner": "rust-analyzer", "repo": "rust-analyzer", - "rev": "f0da9406bcbde1bc727242b481d8de825e84f59a", + "rev": "2534b7db1a093543d5bd759b3a1ca9e34418fa31", "type": "github" }, "original": { diff --git a/hosts/curve/configuration.nix b/hosts/curve/configuration.nix index f698eef0..052d8afd 100644 --- a/hosts/curve/configuration.nix +++ b/hosts/curve/configuration.nix @@ -44,8 +44,6 @@ # keyMap = "us"; # }; - services.xserver.layout = "us,dvorak"; - sound.enable = true; hardware.pulseaudio.enable = true; diff --git a/hosts/curve/default.nix b/hosts/curve/default.nix index 319b89f1..b748bcbf 100644 --- a/hosts/curve/default.nix +++ b/hosts/curve/default.nix @@ -17,6 +17,9 @@ programs.adb.enable = true; #virtualisation.docker.enable = true; services.udev.extraRules = '' + # Monitor plugged in + KERNEL=="card0", SUBSYSTEM=="drm", ENV{DISPLAY}=":0", ENV{XAUTHORITY}="/home/anish/.Xauthority", RUN+="/home/anish/bin/hotplug-monitor.sh" # TODO: add this file to nix home-manager + # Qualcomm EDL SUBSYSTEMS=="usb", ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9008", MODE="0666", GROUP="plugdev" diff --git a/profiles/core/default.nix b/profiles/core/default.nix index 0f581f10..e5cbc095 100644 --- a/profiles/core/default.nix +++ b/profiles/core/default.nix @@ -118,7 +118,8 @@ in srch = "ns nixos"; orch = "ns override"; nrb = ifSudo "sudo nixos-rebuild switch --flake '/etc/nixos/#curve'"; - nedit = "vim /etc/nixos/"; + nedit = "cd /etc/nixos; vim"; + ncd = "cd /etc/nixos"; mn = '' manix "" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | sk --preview="manix '{}'" | xargs manix ''; diff --git a/profiles/mossnet-hosts/default.nix b/profiles/mossnet-hosts/default.nix index 2c0d6e3f..b3f255de 100644 --- a/profiles/mossnet-hosts/default.nix +++ b/profiles/mossnet-hosts/default.nix @@ -1,12 +1,12 @@ { networking.extraHosts = '' - 10.0.69.4 mossnet.lan - 10.0.69.4 links.mossnet.lan - 10.0.69.4 read.mossnet.lan - 10.0.69.4 stats.mossnet.lan + 192.168.1.240 mossnet.lan + 192.168.1.240 links.mossnet.lan + 192.168.1.240 read.mossnet.lan + 192.168.1.240 stats.mossnet.lan ''; - #172.16.11.240 mossnet.lan - #172.16.11.240 links.mossnet.lan - #172.16.11.240 read.mossnet.lan - #172.16.11.240 stats.mossnet.lan + #10.0.69.4 mossnet.lan + #10.0.69.4 links.mossnet.lan + #10.0.69.4 read.mossnet.lan + #10.0.69.4 stats.mossnet.lan } diff --git a/profiles/nvim/nvim.nix b/profiles/nvim/nvim.nix index 031b46a3..b7a1e28e 100644 --- a/profiles/nvim/nvim.nix +++ b/profiles/nvim/nvim.nix @@ -2,68 +2,68 @@ 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 - #pyls-mypy - #pyls-isort - #pyls-black - # other python packages you want - ]; - python-with-my-packages = pkgs.python3.withPackages my-python-packages; + 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 + #pyls-mypy + #pyls-isort + #pyls-black + # 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 // customPlugins; [ - nodejs - python-with-my-packages - clojure-lsp - rnix-lsp - #python3Packages.pynvim - #python3Packages.six - #python3Packages.tasklib - #python3 - ( neovim.override { - vimAlias = true; - withPython3 = true; - extraPython3Packages = pkgs: with pkgs; [ tasklib six ]; - configure = { + { + environment.variables.EDITOR = "nvim"; + environment.shellAliases = { + k = "vim -c :VimwikiIndex"; + kz = "vim -c :VimwikiIndex -c :ZettelNew"; + }; + environment.systemPackages = with pkgs // customPlugins; [ + nodejs + python-with-my-packages + clojure-lsp + rnix-lsp + #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 = [ vim-nix @@ -78,7 +78,7 @@ in vimwiki coc-nvim coc-json - ale + ale coc-pyright coc-pairs coc-emmet @@ -87,6 +87,7 @@ in rainbow_parentheses-vim vim-surround vim-fugitive + vim-signify #nvim-colorizer vim-devicons # testing @@ -95,46 +96,51 @@ in taskwiki vim-zettel #vimwiki-sync - telescope-nvim - plenary-nvim - # Clojure stuff - conjure - vim-sexp - vim-sexp-mappings-for-regular-people + telescope-nvim + plenary-nvim + # Clojure stuff + conjure + vim-sexp + vim-sexp-mappings-for-regular-people ]; }; - customRC = '' - set tabstop=2 - set showmatch - set shiftwidth=2 - set noexpandtab - set autoindent - " set foldmethod=indent " fold based on indent - set number - set nocompatible - set relativenumber - set showtabline=2 - set autowriteall + customRC = '' + set tabstop=2 + set showmatch + set shiftwidth=2 + set noexpandtab + set autoindent + + " set foldmethod=indent " fold based on indent + set number + set nocompatible + set relativenumber + set showtabline=2 + set noexpandtab + set autowriteall syntax on - set list lcs=tab:\|\ - filetype plugin on + set list lcs=tab:\|\ + filetype plugin on - set termguicolors - let ayucolor="mirage" - colorscheme ayu + set termguicolors + let ayucolor="mirage" + colorscheme ayu - " set spell - set spelllang=en_gb + " set spell + set spelllang=en_gb - " window - nmap wh :topleft vnew - nmap wl :botright vnew - nmap wk :topleft new - nmap wj :botright new + " window + nmap wh :topleft vnew + nmap wl :botright vnew + nmap wk :topleft new + nmap wj :botright new + + " tabs + nmap rt :retab! let mapleader = "\" - let maplocalleader = "," + let maplocalleader = "," " lightline colorscheme let g:lightline = { @@ -157,49 +163,49 @@ in :nnoremap "=strftime("%Y-%m-%d %H:%M:") :inoremap =strftime("%Y-%m-%d %H:%M:") - " telescope - " Find files using Telescope command-line sugar. - nnoremap ff Telescope find_files - nnoremap fg Telescope live_grep - nnoremap fb Telescope buffers - nnoremap fh Telescope help_tags + " telescope + " Find files using Telescope command-line sugar. + nnoremap ff Telescope find_files + nnoremap fg Telescope live_grep + nnoremap fb Telescope buffers + nnoremap fh Telescope help_tags - " exit normal mode in terminal - :tnoremap + " exit normal mode in terminal + :tnoremap let g:syntastic_always_populate_loc_list = 1 let g:syntastic_auto_loc_list = 1 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" ] + " Sexp in Conjure (since it's fennel) + " let g:sexp_filetypes = [ "fennel" ] - let g:rainbow_active = 0 - autocmd BufReadPost,BufNewFile c,py,nix RainbowParenthesesToggleAll + let g:rainbow_active = 0 + autocmd BufReadPost,BufNewFile c,py,nix RainbowParenthesesToggleAll " keyboard commands map t :NERDTreeToggle map s :w map q :wq - map r :RainbowParenthesesToggleAll - map zs :ZettelSearch - map zo :ZettelOpen - map zn :ZettelNew + map r :RainbowParenthesesToggleAll + map zs :ZettelSearch + map zo :ZettelOpen + map zn :ZettelNew " NERDTree " open on directory autocmd StdinReadPre * let s:std_in=1 - " ALE + clj-kondo - let g:ale_linters = {'clojure': ['clj-kondo']} + " ALE + clj-kondo + let g:ale_linters = {'clojure': ['clj-kondo']} " coc - " - " conjure extension - let g:coc_global_extensions = ['coc-conjure'] + " + " conjure extension + let g:coc_global_extensions = ['coc-conjure'] " if hidden is not set, TextEdit might fail. set hidden @@ -220,24 +226,12 @@ in " always show signcolumns set signcolumn=yes - " note that if you are using Plug mapping you should not use `noremap` mappings. - nmap (lcn-menu) - " Or map each action separately - nmap K (lcn-hover) - nmap gd (lcn-definition) - nmap (lcn-r - - " COC INSTALL - { - "languageserver": { - "nix": { - "command": "rnix-lsp", - "filetypes": [ - "nix" - ] - } - } - } + " note that if you are using Plug mapping you should not use `noremap` mappings. + nmap (lcn-menu) + " Or map each action separately + nmap K (lcn-hover) + nmap gd (lcn-definition) + nmap (lcn-r " Use tab for trigger completion with characters ahead and navigate. " Use command ':verbose imap ' to make sure tab is not mapped by other plugin. @@ -249,7 +243,7 @@ in function! s:check_back_space() abort let col = col('.') - 1 - return !col || getline('.')[col - 1] =~# '\s' + return !col || getline('.')[col - 1] =~# '\s' endfunction " Use to trigger completion. @@ -289,8 +283,8 @@ in nmap rn (coc-rename) " Remap for format selected region - xmap f (coc-format-selected) - nmap f (coc-format-selected) + xmap f (coc-format-selected) + nmap f (coc-format-selected) augroup mygroup autocmd! @@ -301,8 +295,8 @@ in augroup end " Remap for do codeAction of selected region, ex: `aap` for current paragraph - xmap a (coc-codeaction-selected) - nmap a (coc-codeaction-selected) + xmap a (coc-codeaction-selected) + nmap a (coc-codeaction-selected) " Remap for do codeAction of current line nmap ac (coc-codeaction) @@ -323,38 +317,38 @@ in command! -nargs=0 Format :call CocAction('format') " Use `:Fold` to fold current buffer - command! -nargs=? Fold :call CocAction('fold', ) + command! -nargs=? Fold :call CocAction('fold', ) " use `:OR` for organize import of current buffer - command! -nargs=0 OR :call CocAction('runCommand', 'editor.action.organizeImport') + command! -nargs=0 OR :call CocAction('runCommand', 'editor.action.organizeImport') " Add status line support, for integration with other plugin, checkout `:h coc-status` " set statusline^=%{coc#status()}%{get(b:,'coc_current_function',"")} " Using CocList " Show all diagnostics - nnoremap a :CocList diagnostics + nnoremap a :CocList diagnostics " Manage extensions - nnoremap e :CocList extensions + nnoremap e :CocList extensions " Show commands - nnoremap c :CocList commands + nnoremap c :CocList commands " Find symbol of current document - nnoremap o :CocList outline + nnoremap o :CocList outline " Search workspace symbols - nnoremap s :CocList -I symbols + nnoremap s :CocList -I symbols " Do default action for next item. - nnoremap j :CocNext + nnoremap j :CocNext " Do default action for previous item. - nnoremap k :CocPrev + nnoremap k :CocPrev " Resume latest coc list - nnoremap p :CocListResume + nnoremap p :CocListResume au BufNewFile,BufRead *.frag,*.vert,*.fp,*.vp,*.glsl setf glsl - " TODO Ugly map - :map :!xclip -i - :vmap "*y - :map :r!xclip -o + " TODO Ugly map + :map :!xclip -i + :vmap "*y + :map :r!xclip -o ''; }; } diff --git a/users/profiles/desktop/default.nix b/users/profiles/desktop/default.nix index da02c8b8..ea64c88b 100644 --- a/users/profiles/desktop/default.nix +++ b/users/profiles/desktop/default.nix @@ -52,6 +52,7 @@ in scrot ripcord feh + xkblayout-state mupdf sublime-music vcv-rack @@ -85,6 +86,7 @@ in }; xserver = { enable = true; + layout = "us,dvorak"; desktopManager.wallpaper.mode = "fill"; displayManager = { defaultSession = "none+bspwm"; diff --git a/users/profiles/desktop/sxhkdrc b/users/profiles/desktop/sxhkdrc index e38e5603..7544e2f3 100644 --- a/users/profiles/desktop/sxhkdrc +++ b/users/profiles/desktop/sxhkdrc @@ -27,10 +27,6 @@ super + grave super + shift + grave emacsclient --eval "(open-scratch-frame)" -# Invoke emacs-everywhere at point. -super + e - emacsclient --eval "(emacs-everywhere)" - super + space rofi -show drun -modi drun,run -show-icons -theme theme/appmenu.rasi @@ -49,6 +45,8 @@ super + s super + Escape pkill -USR1 -x sxhkd +super + n + xkblayout-state set +1 # ##