From 88e869fd457afc407fec19a13e4ec2129de4fb62 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Thu, 16 Mar 2023 21:46:12 +0100 Subject: [PATCH] nix settings and nvim tweaks --- flake.lock | 24 +++++++++++------------ hosts/thinkpad/default.nix | 5 +++++ users/rouven/modules/hyprland/default.nix | 2 +- users/rouven/modules/neovim/default.nix | 4 ++-- users/rouven/modules/packages.nix | 2 -- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 261d978..f1bc301 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1678916824, - "narHash": "sha256-YPQAQ0x0wLvbQ/vaEj8o+0hRfbBNR0teTJ6QsG0yzw4=", + "lastModified": 1678967335, + "narHash": "sha256-oFppZaAVRA0G/aVPvjtWaQI5EQ2dZ5LgbEKfsBmKQgA=", "owner": "nix-community", "repo": "home-manager", - "rev": "c8cb60b8a15c90b2bbc416c182532620602edb48", + "rev": "b832390db376fbbf44115904cfab6680fb42e076", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1678928694, - "narHash": "sha256-IyMKsbwRP1+9KcPR9exTD3zkPW6ivykpvGAM25mdmoI=", + "lastModified": 1678984828, + "narHash": "sha256-fULVI69XchAnznXMtVet23li8Oi0RK8ZWBb50jA0rw4=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "d9d57ce39ac25fd8bbfe88ec9d3bccb1e2df8650", + "rev": "606cb2832aff2c7305da1f880ce732f7eb464d04", "type": "github" }, "original": { @@ -326,11 +326,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1678954423, - "narHash": "sha256-kaTyUwuG9k1Fo4fUKCXvDSWpG5w06sYtLnAX2WQ3oWY=", + "lastModified": 1678961974, + "narHash": "sha256-c1TZ+lQlWHjNJYiQZTtD0pZyXQjRlMl3GcTyLi4SF3Q=", "owner": "pta2002", "repo": "nixvim", - "rev": "f5f33b539031ec57c1869a63350176d7257f5f18", + "rev": "6544e323966d81306f74842781a4a8c00a53a077", "type": "github" }, "original": { @@ -471,11 +471,11 @@ ] }, "locked": { - "lastModified": 1676131170, - "narHash": "sha256-K2KLGfUHbasZQCeXTRIZMYcEEnW2exBXvJiXRmJZibM=", + "lastModified": 1678980115, + "narHash": "sha256-qed+BV0NBt1egGCBEM7d5MiZJevQb8jd1WybfFM53Ak=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "2fa7e345a4131fb9bddb5dc168475613c0684cf5", + "rev": "85f49f4d6c9c398428117e9bdb588f53f09e52e0", "type": "github" }, "original": { diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index 29ff79d..f01f2e0 100755 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -20,6 +20,11 @@ kernelPackages = pkgs.linuxPackages_latest; }; + nix.settings = { + cores = 6; # don't clutter the whole system when compiling stuff + auto-optimise-store = true; + }; + time.timeZone = "Europe/Berlin"; i18n.defaultLocale = "en_US.UTF-8"; console = { diff --git a/users/rouven/modules/hyprland/default.nix b/users/rouven/modules/hyprland/default.nix index 6956917..c31f835 100644 --- a/users/rouven/modules/hyprland/default.nix +++ b/users/rouven/modules/hyprland/default.nix @@ -27,7 +27,7 @@ xdg.configFile = { "wofi/config".text = '' allow_images = true - term = alacritty + term = foot ''; "wofi/style.css".text = '' diff --git a/users/rouven/modules/neovim/default.nix b/users/rouven/modules/neovim/default.nix index 226d26a..1d09e8f 100644 --- a/users/rouven/modules/neovim/default.nix +++ b/users/rouven/modules/neovim/default.nix @@ -35,7 +35,7 @@ "g" = ":Telescope git_files"; "r" = ":Telescope live_grep"; # diacnostics - "d" = ":Telescope diacnostics"; + "d" = ":Telescope diagnostics"; #quickfixlist binds "" = ":cnext"; @@ -86,7 +86,7 @@ vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts) vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, bufopts) - vim.keymap.set('n', 'rn', vim.lsp.buf.rename, bufopts) + vim.keymap.set('n', 'gn', vim.lsp.buf.rename, bufopts) vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, bufopts) vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) vim.keymap.set('n', 'b', function() vim.lsp.buf.format { async = true } end, bufopts) diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix index 410946f..54f1914 100644 --- a/users/rouven/modules/packages.nix +++ b/users/rouven/modules/packages.nix @@ -58,8 +58,6 @@ bat # better less duf # better df - jetbrains.pycharm-community # backup ide in case vim has a bad day again - powerline-fonts # libs