From 2e247f21ab185b8fbffaa920ba5b64120db50120 Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Wed, 31 Jan 2024 22:26:46 +0100 Subject: [PATCH] "Adding further neovim configuration; flake update" --- flake.lock | 6 +++--- flake.nix | 3 +++ home/lambda/config-files/wezterm.lua | 2 +- home/lambda/default.nix | 19 ++++++++++++++++++- hosts/lambda/default.nix | 25 ++++++++++++++++--------- 5 files changed, 41 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 4a3d00f..981447c 100644 --- a/flake.lock +++ b/flake.lock @@ -138,11 +138,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706098335, - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", + "lastModified": 1706515015, + "narHash": "sha256-eFfY5A7wlYy3jD/75lx6IJRueg4noE+jowl0a8lIlVo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", + "rev": "f4a8d6d5324c327dcc2d863eb7f3cc06ad630df4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 601f0c7..9b1a11f 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,9 @@ inputs.nixpkgs.follows = "nixpkgs"; }; }; + #inputs.nvidia_pinned = { + # inputs.nixpkgs.follows = "nixos-unstable"; + #}; inputs.nixvim = { # If you are not running an unstable channel of nixpkgs, select the corresponding branch of nixvim. url = "github:nix-community/nixvim/nixos-23.11"; diff --git a/home/lambda/config-files/wezterm.lua b/home/lambda/config-files/wezterm.lua index fb4ee0c..96d6f78 100644 --- a/home/lambda/config-files/wezterm.lua +++ b/home/lambda/config-files/wezterm.lua @@ -39,7 +39,7 @@ config.text_background_opacity = .4 config.enable_scroll_bar = false config.enable_tab_bar = true config.tab_bar_at_bottom = true -config.enable_wayland = true +config.enable_wayland = false config.front_end = "OpenGL" config.warn_about_missing_glyphs = false return config diff --git a/home/lambda/default.nix b/home/lambda/default.nix index 332d698..3406c31 100644 --- a/home/lambda/default.nix +++ b/home/lambda/default.nix @@ -56,9 +56,16 @@ colorschemes.catppuccin.enable = true; plugins = { + lualine.enable = true; + lsp-format = { + enable = true; + }; lsp = { enable = true; servers = { + svelte.enable = true; + tsserver.enable = true; + eslint.enable = true; rust-analyzer = { enable = true; installLanguageServer = false; @@ -113,6 +120,10 @@ }; }; telescope.enable = true; + telescope.extensions = { + file_browser.enable = true; + }; + which-key.enable = true; cmp-nvim-lsp.enable = true; cmp-nvim-lua.enable = true; noice.enable = true; @@ -132,7 +143,13 @@ mode = "n"; key = "ff"; options.silent = true; - action = "Telescope find_files"; + action = "Telescope file_browser"; + } + { + mode = "n"; + key = "bb"; + options.silent = true; + action = "Telescope buffers"; } { mode = "n"; diff --git a/hosts/lambda/default.nix b/hosts/lambda/default.nix index e0fc9b1..727fc3e 100644 --- a/hosts/lambda/default.nix +++ b/hosts/lambda/default.nix @@ -4,8 +4,6 @@ ⠀⠀⠀⠀⣠⣾⣿⣿⡿⠛⠉⠀⠀⠀⠀⠀⠀⠀⠀⠉⠛⢿⣿⣿⣶⡀⠀⠀⠀⠀ ⠀⠀⠀⣴⣿⣿⠟⠁⠀⠀⠀⣶⣶⣶⣶⡆⠀⠀⠀⠀⠀⠀⠈⠻⣿⣿⣦⠀⠀⠀ ⠀⠀⣼⣿⣿⠋⠀⠀⠀⠀⠀⠛⠛⢻⣿⣿⡀⠀⠀⠀⠀⠀⠀⠀⠙⣿⣿⣧⠀⠀ -⠀⢸⣿⣿⠃⠀⠀⠀⠀⠀⠀⠀⠀⢀⣿⣿⣷⠀⠀⠀⠀⠀⠀⠀⠀⠸⣿⣿⡇⠀ -⠀⣿⣿⡿⠀⠀⠀⠀⠀⠀⠀⠀⢀⣾⣿⣿⣿⣇⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⠀ ⠀⣿⣿⡇⠀⠀⠀⠀⠀⠀⠀⢠⣿⣿⡟⢹⣿⣿⡆⠀⠀⠀⠀⠀⠀⠀⣹⣿⣿⠀ ⠀⣿⣿⣷⠀⠀⠀⠀⠀⠀⣰⣿⣿⠏⠀⠀⢻⣿⣿⡄⠀⠀⠀⠀⠀⠀⣿⣿⡿⠀ ⠀⢸⣿⣿⡆⠀⠀⠀⠀⣴⣿⡿⠃⠀⠀⠀⠈⢿⣿⣷⣤⣤⡆⠀⠀⣰⣿⣿⠇⠀ @@ -26,6 +24,8 @@ nixpkgs.config.allowUnfree = true; + security.pam.services.swaylock = {}; + hardware.opengl = { enable = true; driSupport = true; @@ -42,7 +42,7 @@ nvidiaSettings = true; - package = config.boot.kernelPackages.nvidiaPackages.stable; + package = config.boot.kernelPackages.nvidiaPackages.production; }; hardware.bluetooth = { @@ -82,12 +82,12 @@ # }; # Enable the X11 windowing system. - services.xserver.enable = true; - services.xserver.displayManager.gdm.enable = true; - #services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; - services.xserver.displayManager.defaultSession = "plasmawayland"; - services.xserver.videoDrivers = ["nvidia"]; + #services.xserver.enable = true; + #services.xserver.displayManager.gdm.enable = true; + #services.xserver.displayManager.ly.enable = true; + #services.xserver.desktopManager.gnome.enable = true; + #services.xserver.displayManager.defaultSession = "plasmawayland"; + #services.xserver.videoDrivers = ["nvidia"]; services.blueman.enable = true; @@ -129,6 +129,13 @@ neovim gcc13 cargo + sway + swaylock + swaylock-effects + tofi + waybar + wl-clipboard + wdisplays ]; # Some programs need SUID wrappers, can be configured further or are