From 778b0b59bf0b45c6bd514dfca6886979a322b04a Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Mon, 3 Jun 2024 17:55:51 +0200 Subject: [PATCH] nixvim; flake update; wezterm --- flake.lock | 60 +++++++++++++++++------------------ home/config-files/wezterm.lua | 8 ++++- home/modules/nixvim.nix | 4 ++- home/modules/shell.nix | 2 +- 4 files changed, 41 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 023fe91..1e5b584 100644 --- a/flake.lock +++ b/flake.lock @@ -49,11 +49,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1716955393, - "narHash": "sha256-bLnqWy5TN9NAuc4cP6kFkQleNUx/W2zIokECfAoT64g=", + "lastModified": 1717387398, + "narHash": "sha256-f1UvCZdDlsmbEb/e9hn9KcxgFKS5Rf9u3IaSCh9zYkU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "836d7e911ac3c11017ccf23eac8b49ad60ebab1d", + "rev": "be0bd738f09e66ae042365fa328efee9160677b5", "type": "gitlab" }, "original": { @@ -269,11 +269,11 @@ ] }, "locked": { - "lastModified": 1716930911, - "narHash": "sha256-t4HT5j3Jy7skRB5PINnxcEBCkgE89rGBpwTI7YS4Ffo=", + "lastModified": 1717316182, + "narHash": "sha256-Xi0EpZcu39N0eW7apLjFfUOR9y80toyjYizez7J1wMI=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9b36cbe9292a649222b89fdb9ae9907e9c74086", + "rev": "9b53a10f4c91892f5af87cf55d08fba59ca086af", "type": "github" }, "original": { @@ -291,11 +291,11 @@ ] }, "locked": { - "lastModified": 1716457508, - "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", + "lastModified": 1717052710, + "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=", "owner": "nix-community", "repo": "home-manager", - "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", + "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae", "type": "github" }, "original": { @@ -309,11 +309,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1714905986, - "narHash": "sha256-Vj7iFkLrd7MDeeMVVol5uHTcaLwDq4a3vNx+6Sy1FLU=", + "lastModified": 1717227663, + "narHash": "sha256-f6wh1HMkW7Ks9PKOsS95odyCjZOMuiK6B9NJTRsMApg=", "owner": "viperML", "repo": "nh", - "rev": "127a23c82aa41091e97466092d2547c08c2a9a9d", + "rev": "0d76479fcdec0243ea560d1e2fde854337787e3a", "type": "github" }, "original": { @@ -330,11 +330,11 @@ ] }, "locked": { - "lastModified": 1716511055, - "narHash": "sha256-5Fe/DGgvMhPEMl9VdVxv3zvwRcwNDmW5eRJ0gk72w7U=", + "lastModified": 1716993688, + "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "0bea8222f6e83247dd13b055d83e64bce02ee532", + "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", "type": "github" }, "original": { @@ -363,11 +363,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1716987116, - "narHash": "sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8=", + "lastModified": 1717248095, + "narHash": "sha256-e8X2eWjAHJQT82AAN+mCI0B68cIDBJpqJ156+VRrFO0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8251761f93d6f5b91cee45ac09edb6e382641009", + "rev": "7b49d3967613d9aacac5b340ef158d493906ba79", "type": "github" }, "original": { @@ -395,11 +395,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1716995283, - "narHash": "sha256-BYi3KkrRhTCCG/O+QwBidlkYT6t11SPK0ros89Yzzio=", + "lastModified": 1717427950, + "narHash": "sha256-I1vz5z+4KwU6p1MbG5x4yqEMC2j+6OOhvbznPQuIPXg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd887df3f2f56d32fdb0340e6e7210d64e64bc32", + "rev": "58420269b459128e7b5453627b1614001aa4faef", "type": "github" }, "original": { @@ -427,11 +427,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1714409183, - "narHash": "sha256-Wacm/DrzLD7mjFGnSxxyGkJgg2unU/dNdNgdngBH+RU=", + "lastModified": 1716991068, + "narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "576ecd43d3b864966b4423a853412d6177775e8b", + "rev": "25cf937a30bf0801447f6bf544fc7486c6309234", "type": "github" }, "original": { @@ -459,11 +459,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1716769173, - "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { @@ -504,11 +504,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1716972603, - "narHash": "sha256-rfOOyiBW42bI+Nj3Cs7H3dZL4vdRelUWL5YSDniVcYM=", + "lastModified": 1717427806, + "narHash": "sha256-WiM5Ccu5vo/gUGjZujqbDA7XBbTt3v0BJzvxTx0x67w=", "owner": "nix-community", "repo": "nixvim", - "rev": "b113bc69ea5c04c37020a63afa687abfb2d43474", + "rev": "4b05fde8730b79501f4b53cf763e5b6368e0f67a", "type": "github" }, "original": { diff --git a/home/config-files/wezterm.lua b/home/config-files/wezterm.lua index fece8bb..520c0fc 100644 --- a/home/config-files/wezterm.lua +++ b/home/config-files/wezterm.lua @@ -7,6 +7,8 @@ function getHostname() return string.gsub(result, "\n$", "") end +local HOSTNAME = getHostname() + config.color_scheme = "Catppuccin Mocha" config.font = wezterm.font 'Hack Nerd Font Mono' if getHostname() == "lilith" then @@ -14,7 +16,11 @@ if getHostname() == "lilith" then else config.font_size = 11 end -config.window_background_opacity = .8 +if os.getenv("DESKTOP_SESSION") == "plasma" then + config.window_background_opacity = 1 +else + config.window_background_opacity = .8 +end config.keys = { { key = 't', diff --git a/home/modules/nixvim.nix b/home/modules/nixvim.nix index aba29e8..e26ccfe 100644 --- a/home/modules/nixvim.nix +++ b/home/modules/nixvim.nix @@ -10,7 +10,7 @@ enable = true; globals.mapleader = " "; extraConfigLua = builtins.readFile ../config-files/nvim/init.lua; - extraPlugins = with pkgs.vimPlugins; [headlines-nvim]; + # extraPlugins = with pkgs.vimPlugins; [headlines-nvim]; clipboard.providers.wl-copy.enable = true; @@ -23,6 +23,8 @@ colorschemes.catppuccin.enable = true; plugins = { + headlines.enable = true; + twilight.enable = true; comment-nvim = { enable = true; }; diff --git a/home/modules/shell.nix b/home/modules/shell.nix index cdc3ce8..3128318 100644 --- a/home/modules/shell.nix +++ b/home/modules/shell.nix @@ -8,7 +8,7 @@ zsh.enable = true; atuin = { enable = true; - enableNushellIntegration = false; + enableNushellIntegration = true; }; eza.enable = true; nushell = {