From 6dc9cb9dbf90fffe561a14727c64be9f195d1702 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Mon, 13 Mar 2023 13:50:07 +0100 Subject: [PATCH] nvim lsp fixes and a new wifi password --- flake.lock | 42 ++++++++++----------- secrets/thinkpad.yaml | 6 +-- users/rouven/modules/hyprland/hyprland.conf | 2 + users/rouven/modules/neovim/default.nix | 24 +++++++----- 4 files changed, 41 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 38c1ad0..79d6152 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1678271387, - "narHash": "sha256-H2dv/i1LRlunRtrESirELzfPWdlG/6ElDB1ksO529H4=", + "lastModified": 1678662458, + "narHash": "sha256-BW+C3Pln6LVrGMVEN2Py0cY+a+VEEddhW86cNj8GB3E=", "owner": "nix-community", "repo": "home-manager", - "rev": "36999b8d19eb6eebb41983ef017d7e0095316af2", + "rev": "46f637bd801b4d6d2afa06e13b6776e9fbfb0a79", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1678371846, - "narHash": "sha256-fOFX0PASpIpU4NK9Wen9yJKwg5RYe5jFIu1H0OUzglE=", + "lastModified": 1678669625, + "narHash": "sha256-xf8yX72QeotdFpM2Mu8s5/ZtYYM+dzfnH7FrEI6UGNI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "c9167d96467f0c1546f337828e874d7dd849f900", + "rev": "17deeb07ad4ce1b34bfe22524f9b248c5c6e01e6", "type": "github" }, "original": { @@ -218,11 +218,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1678350133, - "narHash": "sha256-sUxDtERkqq0oGU5eGtlem5zE5ga801yXfpc3XlPfC4k=", + "lastModified": 1678397099, + "narHash": "sha256-5xq8YJe+h19TlD+EI4AE/3H3jcCcQ2AWU6CWBVc5tRc=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "6e303a505ad31a8e68a7f0d43e2170e81c16919b", + "rev": "556101ff85bd6e20900ec73ee525b935154bc8ea", "type": "github" }, "original": { @@ -233,11 +233,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1678293141, - "narHash": "sha256-lLlQHaR0y+q6nd6kfpydPTGHhl1rS9nU9OQmztzKOYs=", + "lastModified": 1678654296, + "narHash": "sha256-aVfw3ThpY7vkUeF1rFy10NAkpKDS2imj3IakrzT0Occ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c90c4025bb6e0c4eaf438128a3b2640314b1c58d", + "rev": "5a1dc8acd977ff3dccd1328b7c4a6995429a656b", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1677948530, - "narHash": "sha256-BkQjq8AGHD55RJe4PUnrWRZZ8jS64p/k0bGDck5wKwY=", + "lastModified": 1678582009, + "narHash": "sha256-J8QzUOOv3/y97q19pGOz28gLC3lAUy1c4bWpsi5D460=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d51554151a91cd4543a7620843cc378e3cbc767e", + "rev": "c34fc09c77172c4189df4594a0749e25a23cdd9b", "type": "github" }, "original": { @@ -306,11 +306,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1678367030, - "narHash": "sha256-hiDPs0V7PwsBVYux2VSgExFOkeT9SSGpczRmxxQSOQ4=", + "lastModified": 1678701483, + "narHash": "sha256-RLIsp/nChcsUHsmGxolaHQupQI174AsVLwhDSlqVNDw=", "owner": "pta2002", "repo": "nixvim", - "rev": "ecfa870c7a37fdc4c50ff4efc73faa42bc1b8660", + "rev": "1ac27edf2ea2fd8a04a070e7305f892ec713d2ec", "type": "github" }, "original": { @@ -394,11 +394,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1678264398, - "narHash": "sha256-COgbuQH/oAQZUBFTTQgSifabzZ5/GRCCbBIqZJjR3s0=", + "lastModified": 1678590185, + "narHash": "sha256-scvu8HegWwbcvPKjh6M1DnpPYAv4EnP1krsRPItoQ+E=", "owner": "Mic92", "repo": "sops-nix", - "rev": "00e9e9cd46600d68dd98a392025d4894c3711b58", + "rev": "9e98f7a442b0e318de9cce757675c2ab922bdf2b", "type": "github" }, "original": { diff --git a/secrets/thinkpad.yaml b/secrets/thinkpad.yaml index 6f769b4..aa69527 100644 --- a/secrets/thinkpad.yaml +++ b/secrets/thinkpad.yaml @@ -1,4 +1,4 @@ -wireless-env: ENC[AES256_GCM,data:i4+LsCCN0vBwoZg2IV2d7N9wg5J6GrET0JR9XGGKBht/JLiTly974bsGxbOXou7P4APxo+nrot8nP2XtRlQZRGTp0nNMbG2vN6BDcDCCQtbaEKCJHhsrHT5mg2XldxvNc19/AOimP14KsXXSTuOXe0eqKSro8tlzOnUh6QpEUomUiovPq5xvD99TWqyXkSw0OAljLNdmjw/owHby/RnUzjctHFEohqJXRdhxoMAFYqNqZ4CTgZP80R9L0LB4hLRQpS7xZs60KRO89ENIYRDybVWiE5f4IIlYnJgHRo7gNOz0qao=,iv:jvcO8Al08LBadKWy4SdNynVAxx5hD1IexJQgv4tH0Ew=,tag:fRGF4xXfgADq9DyzS3eqiA==,type:str] +wireless-env: ENC[AES256_GCM,data:Nzc6LP2QkXny5C6c4bqLlVxmGrTwLSG6AZV9lnwBVk4/PWkOjCQdxbTYk+yLYHIbd7mETyAip4/Mob209OHpQdlphcKBxy3v7WZq3Kz/KizqLu41RbITDbR0lTwKB4Skh8CdpzVeNe+qzsxfVLgw10E2eWZk+XShOqdoP3KINoATTbHEODKFmg6b0Nl6hLh8fUJIzlTpsOzriFzioOgPb6PhUPUHxagitTkvHrxolpR4EJ+HXWYPrfTbwAW88YDLg4eIC1unBTnG0zHQk/MlHsGDBwQ=,iv:z8oI1hZGNlLKW/cXUbBWDmvdE4eXm2gujyj+neXHn2Y=,tag:52GyUWVbsJikgk8Rp6ClaA==,type:str] uni: zih: ENC[AES256_GCM,data:KoiT/w5SsUEFAC5beCs3R5o=,iv:qQRZfdtbiAIWUAkdgrpdR8AWDdedn9yl9NcRm0ymE2A=,tag:uyhy5n40PgsWuaEofJjmog==,type:str] wireguard: @@ -20,8 +20,8 @@ sops: d1J5UHJDYjlZWEV1aEVDSmxhWDB0anMKMNzyd465AdMyX0o9NxF+hcLyROcd8xoJ 39K5xIDzcqpu6HfoZk1kZ/TT1DS2Xiw0rDuJHWdfpnS8zNe6DL3a7Q== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-03-08T12:03:05Z" - mac: ENC[AES256_GCM,data:H+E5ll+r5ZxPuyA3npRjyOKE/bTowRM1JVGVEROfOqKuc0sKNFx0g5kCRISihKNcPvrM/PXJ3/xlGYKup+1SVf1EvM+3RZdfCVVgNt2WIzBrtEJfNMXvWiHi+IJZwelzcVzM6c1s2VSXRmpROoPJ28tms+uUyM9F15MNAFkgfg0=,iv:OK5PtLeBY3SziaXlSH9+u7ShQCgIQWHmJ2P2+TPMKFg=,tag:Ctu967eDmUqa8S1VXwsLkQ==,type:str] + lastmodified: "2023-03-10T14:38:35Z" + mac: ENC[AES256_GCM,data:JQwYsoIW1af17Xn4wXk2vGzaaFIZLufFHHSjbs5tgV3bZbbdi0bXtpK+2NXCSFKlf0H+7T7k1puBk64OLRtx3gOKfb445Y8yPDERzVAMbofih4MRw6MessTCAPXuKD+TIN9kw8CACqIrAn0zyStzZV6pg0ohNrk2SuAS/khCo7U=,iv:HhoG40c0lP00jYdPzsKPJ5A3M2HrU7DA8wi7bJ9//cA=,tag:7ynuu5WMBbpucDrxHTe0FA==,type:str] pgp: - created_at: "2023-02-16T20:53:51Z" enc: |- diff --git a/users/rouven/modules/hyprland/hyprland.conf b/users/rouven/modules/hyprland/hyprland.conf index 83f119e..011c64f 100644 --- a/users/rouven/modules/hyprland/hyprland.conf +++ b/users/rouven/modules/hyprland/hyprland.conf @@ -81,7 +81,9 @@ windowrulev2 = opacity 1.0 0.5, class:^Alacritty$ windowrulev2 = opacity 1.0 0.5, class:^google-chrome$ windowrulev2 = opacity 1.0 1.0, class:^mpv$ windowrulev2 = opacity 1.0 1.0, class:^Gimp-2.10$ +windowrulev2 = opacity 1.0 1.0, class:^com.obsproject.Studio$ windowrulev2 = opacity 1.0 1.0, fullscreen:1 +windowrulev2 = opacity 1.0 1.0, floating:1 # See https://wiki.hyprland.org/Configuring/Keywords/ for more $mainMod = SUPER diff --git a/users/rouven/modules/neovim/default.nix b/users/rouven/modules/neovim/default.nix index ac612b7..5a656af 100644 --- a/users/rouven/modules/neovim/default.nix +++ b/users/rouven/modules/neovim/default.nix @@ -1,13 +1,10 @@ { config, pkgs, ... }: { - home.packages = with pkgs; [ - ripgrep - black - ]; programs.nixvim = { enable = true; vimAlias = true; - colorscheme = "dracula"; options = + colorscheme = "dracula"; + options = { shiftwidth = 4; expandtab = false; @@ -94,12 +91,10 @@ ''; servers = { + # pylsp is broken pyright = { enable = true; }; - #pylsp = { - #enable = true; - #}; texlab = { enable = true; }; @@ -108,6 +103,17 @@ }; }; }; + null-ls = { + enable = true; + sources.formatting.black = { + enable = true; + withArgs = '' + ({ + extra_args = { "-l", "120" } + }) + ''; + }; + }; nvim-cmp = { enable = true; mappingPresets = [ "insert" ]; @@ -152,7 +158,7 @@ }; extraPlugins = with pkgs.vimPlugins; [ - vim-nix + vim-nix dracula-vim nerdcommenter ];