diff --git a/dotfiles/neovim/lua/my/paq.lua b/dotfiles/neovim/lua/my/paq.lua index cd08732..2bba4c7 100644 --- a/dotfiles/neovim/lua/my/paq.lua +++ b/dotfiles/neovim/lua/my/paq.lua @@ -42,7 +42,9 @@ function M.setup() "folke/which-key.nvim", -- shows what other keys I can press to finish a command "psliwka/vim-smoothie", -- smooth scrolling "easymotion/vim-easymotion", -- removes the need for spamming w or e - "tpope/vim-surround" -- work with brackets, quotes, tags, etc + "tpope/vim-surround", -- work with brackets, quotes, tags, etc + "MunifTanjim/nui.nvim", -- ui stuff required by idris2 + "ShinKage/idris2-nvim" -- idris2 support } for _, v in ipairs(themePackages) do diff --git a/dotfiles/neovim/lua/my/plugins/idris.lua b/dotfiles/neovim/lua/my/plugins/idris.lua index 8a23048..282597e 100644 --- a/dotfiles/neovim/lua/my/plugins/idris.lua +++ b/dotfiles/neovim/lua/my/plugins/idris.lua @@ -4,32 +4,32 @@ local lspconfig = require("my.plugins.lspconfig") local M = {} local idrisChords = { - sc = "case_split", - mc = "make_case", - ml = "make_lemma", - es = "expr_search", - gd = "generate_def", - rh = "refine_hole", - ac = "add_clause" + sc = "case_split", + mc = "make_case", + ml = "make_lemma", + es = "expr_search", + gd = "generate_def", + rh = "refine_hole", + ac = "add_clause" } function M.setup() - local idris2 = require("idris2") + local idris2 = require("idris2") - idris2.setup({ - server = { - on_attach = function(client, bufnr) - lspconfig.on_attach(client, bufnr) + idris2.setup({ + server = { + on_attach = function(client, bufnr) + lspconfig.on_attach(client, bufnr) - for key, value in pairs(idrisChords) do - arpeggio.chord("n", "i" .. key, - ":lua require('idris2.code_action')." .. - value .. "()", {settings = "b"}) - end - end - }, - client = {hover = {use_split = true}} - }) + for key, value in pairs(idrisChords) do + arpeggio.chord("n", "i" .. key, + ":lua require('idris2.code_action')." .. + value .. "()", { settings = "b" }) + end + end + }, + client = { hover = { use_split = true } } + }) end return M diff --git a/flake.lock b/flake.lock index 17554d9..70c04f9 100644 --- a/flake.lock +++ b/flake.lock @@ -128,22 +128,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1638122382, @@ -189,21 +173,6 @@ "type": "github" } }, - "flake-utils_4": { - "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "frex": { "flake": false, "locked": { @@ -517,11 +486,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1653533365, - "narHash": "sha256-tPFBnXXBf2fxHtk5e9//7BL6LbxthtYkgznjNMrx9Ls=", + "lastModified": 1660114525, + "narHash": "sha256-u0cIHXZREfc5h0r1qDYHXswPAoXfYNRE01twXkYyUgw=", "owner": "neovim", "repo": "neovim", - "rev": "7b952793d5c46e862a9cdec3d6ac4762370296ed", + "rev": "3ee6c05b4b5fa253bdf64fff68c71763b5d816b7", "type": "github" }, "original": { @@ -540,11 +509,11 @@ ] }, "locked": { - "lastModified": 1653553105, - "narHash": "sha256-jyWSZMHmaGUmHq3Susugsf6a1/ejR9aaUaZHJ+qoOcs=", + "lastModified": 1660119382, + "narHash": "sha256-DMeHVU8bH03js932AU14mfEEIMJvr/DnrgyG0xtLhZc=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "548165a9d107cb9d4ac84ede0ec6ff5dc815a447", + "rev": "39a5400f30c95c04805df8f6f8fc5527decd49af", "type": "github" }, "original": { @@ -555,11 +524,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1658161305, - "narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=", + "lastModified": 1660071133, + "narHash": "sha256-XX6T9wcvEZIVWY4TO5O1d2MgFyFrF2v4TpCFs7fjdn8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4d49de45a3b5dbcb881656b4e3986e666141ea9", + "rev": "36cc29d837e7232e3176e4651e8e117a6f231793", "type": "github" }, "original": { @@ -571,11 +540,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1658237535, - "narHash": "sha256-z3Ff9oSXEPSZMfXdM+r29oJxtyKUnlUOc18U9E6Q48g=", + "lastModified": 1660187857, + "narHash": "sha256-+Qmz6wx9qVGpbodRUOFs+ROTXlG/LbasiH+IikF1OQ8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e732e1fdbf79bec59f7ade4a3675b091b4a9f6d6", + "rev": "b946a106c1c62988c69832faae10e491a7817e0b", "type": "github" }, "original": { @@ -587,11 +556,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1658150454, - "narHash": "sha256-dhyOQvRT8oYWN0SwsNyujohBsJqwF5W7fnhEcfgBk7E=", + "lastModified": 1660137652, + "narHash": "sha256-L92gcG6Ya4bqjJmStl/HTENhc0PR9lmVgTmeVpk13Os=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3110964916469ad6ed9fea72a0a3119a0959a14e", + "rev": "a7f89ddd6313ef88fc9c6534ac2511ba9da85fdb", "type": "github" }, "original": { @@ -601,22 +570,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1642130244, - "narHash": "sha256-/5FhZkZFQCRQIRFosUQW1zmDrsNHVOJIB/+XgRPHiPU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bc59ba15b64d0a0ee1d1764f18b4f3480d2c3e5a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "odf": { "flake": false, "locked": { @@ -705,8 +658,7 @@ "neovim-nightly-overlay": "neovim-nightly-overlay", "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable", - "vim-extra-plugins": "vim-extra-plugins" + "nixpkgs-unstable": "nixpkgs-unstable" } }, "snocvect": { @@ -757,26 +709,6 @@ "type": "github" } }, - "vim-extra-plugins": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1648995798, - "narHash": "sha256-+JVei13lElBfx/4XsS/zFplmAbU14zUIGjatGE6Ktrc=", - "owner": "m15a", - "repo": "nixpkgs-vim-extra-plugins", - "rev": "5059176cb8f8c460c885f334883520972d1c05ae", - "type": "github" - }, - "original": { - "owner": "m15a", - "repo": "nixpkgs-vim-extra-plugins", - "type": "github" - } - }, "xml": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index d894c8e..42e4461 100644 --- a/flake.nix +++ b/flake.nix @@ -27,8 +27,6 @@ url = "github:nix-community/neovim-nightly-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; - - vim-extra-plugins.url = "github:m15a/nixpkgs-vim-extra-plugins"; }; outputs = inputs@{ self, nixpkgs, ... }: @@ -40,7 +38,6 @@ overlays = { ... }: { nix.registry.nixpkgs.flake = nixpkgs; nixpkgs.overlays = [ - inputs.vim-extra-plugins.overlay inputs.neovim-nightly-overlay.overlay inputs.idris2-pkgs.overlay provideInputs diff --git a/modules/applications/default.nix b/modules/applications/default.nix index 7062f0a..9b2416a 100644 --- a/modules/applications/default.nix +++ b/modules/applications/default.nix @@ -12,6 +12,7 @@ ./steam.nix ./docker.nix ./misc.nix + ./discord.nix ./locale.nix # ./memes.nix ./alacritty.nix diff --git a/modules/applications/discord.nix b/modules/applications/discord.nix new file mode 100644 index 0000000..810e8d2 --- /dev/null +++ b/modules/applications/discord.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: { + home-manager.users.adrielus = { + xdg.configFile."discord/settings.json".text = '' + { + "BACKGROUND_COLOR": "#ffffff", + "SKIP_HOST_UPDATE": true + } + ''; + home.packages = with pkgs; [ + unstable.discord + ]; + }; +} diff --git a/modules/applications/misc.nix b/modules/applications/misc.nix index 377fd62..9f2b2c3 100644 --- a/modules/applications/misc.nix +++ b/modules/applications/misc.nix @@ -40,7 +40,6 @@ vimclip # use neovim anywhere # chat apps - unstable.discord slack signal-desktop tdesktop # telegram for the desktop diff --git a/modules/dev/idris.nix b/modules/dev/idris.nix index c9a122c..8ca1b21 100644 --- a/modules/dev/idris.nix +++ b/modules/dev/idris.nix @@ -5,11 +5,5 @@ idris2 idris2-pkgs.lsp # idris2 ]; - - programs.neovim.plugins = with pkgs.vimPlugins; - with pkgs.vimExtraPlugins; with pkgs.myVimPlugins; [ - nui-nvim # ui lib required by idris plugin - idris2-nvim # idris2 support - ]; }; } diff --git a/modules/overlays/flakes.nix b/modules/overlays/flakes.nix index d1947c6..1e463c1 100644 --- a/modules/overlays/flakes.nix +++ b/modules/overlays/flakes.nix @@ -8,12 +8,6 @@ }: self: super: let foreign = self.callPackage (import ../foreign.nix) { }; - - # installs a vim plugin from git with a given tag / branch - plugin = name: src: self.vimUtils.buildVimPluginFrom2Nix { - inherit name; - inherit src; - }; in { unstable = import nixpkgs-unstable { @@ -61,17 +55,6 @@ in # Vim plugins myVimPlugins = { githubNvimTheme = foreign.githubNvimTheme; - - telescope-file-browser-nvim = plugin "file_browser" - foreign.vimPlugins.telescope-file-browser-nvim; - agda-nvim = plugin "agda" - foreign.vimPlugins.agda-nvim; - idris2-nvim = plugin "idris" - foreign.vimPlugins.idris2-nvim; - arpeggio = plugin "arpeggio" - foreign.vimPlugins.arpeggio; - kmonad = plugin "kmonad-vim" - foreign.vimPlugins.kmonad; }; sddm-theme-chili = foreign.sddm-theme-chili;