From 8ba879c72b3ef1fc30026edf39ddaa05e603af8b Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Sun, 11 Feb 2024 02:01:29 +0100 Subject: [PATCH] Switch to nixpkgs-unstable; minor config stuff --- flake.lock | 261 +++++++++++++++++----------------- flake.nix | 12 +- home/config-files/wezterm.lua | 48 ++++++- home/default.nix | 20 ++- hosts/antivirus.nix | 1 - 5 files changed, 203 insertions(+), 139 deletions(-) diff --git a/flake.lock b/flake.lock index 60e8773..4c6b827 100644 --- a/flake.lock +++ b/flake.lock @@ -1,26 +1,24 @@ { "nodes": { - "beautysh": { + "firefox-addons": { "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ], - "poetry2nix": "poetry2nix", - "utils": "utils" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1680308980, - "narHash": "sha256-aUEHV0jk2qIFP3jlsWYWhBbm+w/N9gzH3e4I5DcdB5s=", - "owner": "lovesegfault", - "repo": "beautysh", - "rev": "9845efc3ea3e86cc0d41465d720a47f521b2799c", - "type": "github" + "dir": "pkgs/firefox-addons", + "lastModified": 1707602717, + "narHash": "sha256-mLEziZaYS1G9Q2l7L1/HU+PyScfBGwgh1R4Mov7x5iY=", + "owner": "rycee", + "repo": "nur-expressions", + "rev": "8e23ca5dcbcd202ceb790598b38a68d7d292ef38", + "type": "gitlab" }, "original": { - "owner": "lovesegfault", - "repo": "beautysh", - "type": "github" + "dir": "pkgs/firefox-addons", + "owner": "rycee", + "repo": "nur-expressions", + "type": "gitlab" } }, "flake-compat": { @@ -39,7 +37,43 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { + "locked": { + "lastModified": 1629284811, + "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": "systems" }, @@ -57,27 +91,9 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1685518550, @@ -118,24 +134,66 @@ "home-manager": { "inputs": { "nixpkgs": [ - "nixpkgs-unstable" + "nixpkgs" ] }, "locked": { - "lastModified": 1706981411, - "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", + "lastModified": 1707607386, + "narHash": "sha256-hj/RgQMTvCWQVInkZwiMMieumkfOjHXhtWhfuXHop/8=", "owner": "nix-community", "repo": "home-manager", - "rev": "652fda4ca6dafeb090943422c34ae9145787af37", + "rev": "bfd0ae29a86eff4603098683b516c67e22184511", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "master", "repo": "home-manager", "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1707607386, + "narHash": "sha256-hj/RgQMTvCWQVInkZwiMMieumkfOjHXhtWhfuXHop/8=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "bfd0ae29a86eff4603098683b516c67e22184511", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706833576, + "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1707211557, @@ -154,32 +212,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707514827, - "narHash": "sha256-Y+wqFkvikpE1epCx57PsGw+M1hX5aY5q/xgk+ebDwxI=", - "owner": "NixOS", + "lastModified": 1627814220, + "narHash": "sha256-P+MDgdZw2CBk9X1ZZaUgHgN+32pTfLFf3XVIBOXirI4=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "20f65b86b6485decb43c5498780c223571dd56ef", + "rev": "ab5b6828af26215bf2646c31961da5d3749591ef", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", + "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -200,57 +242,46 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1707268954, + "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { - "beautysh": "beautysh", - "flake-utils": "flake-utils_2", + "flake-parts": "flake-parts", + "home-manager": "home-manager_2", + "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1704297403, - "narHash": "sha256-g7+4SiXDGzIlWIfANyH1J5CeEaY+Alah6KOm6IO4nIk=", + "lastModified": 1707595282, + "narHash": "sha256-F96hGG5ZCJiwZFBvlUrW8uLyhhz1/QJiqk+vaCjtWjw=", "owner": "nix-community", "repo": "nixvim", - "rev": "b3ea5256e07ee9105060cffa075028402946bd63", + "rev": "e0926bc41bd06e0f4e86631872ec1a1aa41a4ba2", "type": "github" }, "original": { "owner": "nix-community", - "ref": "nixos-23.11", "repo": "nixvim", "type": "github" } }, - "poetry2nix": { - "inputs": { - "flake-utils": [ - "nixvim", - "beautysh", - "utils" - ], - "nixpkgs": [ - "nixvim", - "beautysh", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1658665240, - "narHash": "sha256-/wkx7D7enyBPRjIkK0w7QxLQhzEkb3UxNQnjyc3FTUI=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "8b8edc85d24661d5a6d0d71d6a7011f3e699780f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -260,7 +291,10 @@ "nixvim", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" + ] }, "locked": { "lastModified": 1703939133, @@ -278,10 +312,11 @@ }, "root": { "inputs": { - "flake-utils": "flake-utils", + "firefox-addons": "firefox-addons", + "flake-utils": "flake-utils_2", "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim" } @@ -315,36 +350,6 @@ "repo": "default", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "utils": { - "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index bad8b90..a919c29 100644 --- a/flake.nix +++ b/flake.nix @@ -1,20 +1,18 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-23.11"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; + url = "github:nix-community/home-manager/master"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; - #inputs.nvidia_pinned = { - # inputs.nixpkgs.follows = "nixos-unstable"; - #}; + inputs.firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master"; 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"; + url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/config-files/wezterm.lua b/home/config-files/wezterm.lua index be67238..ee59580 100644 --- a/home/config-files/wezterm.lua +++ b/home/config-files/wezterm.lua @@ -29,14 +29,48 @@ config.window_background_opacity = .8 -- -- You can adjust the saturation also. -- saturation = 1, --} - +local arrowkeys = { + [1] = { "LeftArrow", "left" }, + [2] = "RightArrow", + [3] = "UpArrow", + [4] = "DownArrow", +} config.keys = { { key = 't', mods = 'CTRL', action = wezterm.action.SpawnTab 'DefaultDomain', - } + }, + { + key = "LeftArrow", + mods = 'CTRL | SHIFT', + action = wezterm.action.SplitPane { + direction = 'Left', + }, + }, + { + key = "RightArrow", + mods = 'CTRL | SHIFT', + action = wezterm.action.SplitPane { + direction = 'Right', + }, + }, + { + key = "UpArrow", + mods = 'CTRL | SHIFT', + action = wezterm.action.SplitPane { + direction = 'Up', + }, + }, + { + key = "DownArrow", + mods = 'CTRL | SHIFT', + action = wezterm.action.SplitPane { + direction = 'Down', + }, + }, } + for i = 1, 8 do -- CTRL+ALT + number to activate that tab table.insert(config.keys, { @@ -46,10 +80,20 @@ for i = 1, 8 do }) end + +for i in pairs(arrowkeys) do + table.insert(config.keys, { + key = tostring(i), + mods = 'CTRL', + action = wezterm.action.ActivateTab(i - 1), + }) +end + config.text_background_opacity = .4 config.enable_scroll_bar = false config.enable_tab_bar = true config.tab_bar_at_bottom = true +config.hide_mouse_cursor_when_typing = false config.enable_wayland = true config.front_end = "OpenGL" config.warn_about_missing_glyphs = false diff --git a/home/default.nix b/home/default.nix index c80a887..dbe5621 100644 --- a/home/default.nix +++ b/home/default.nix @@ -78,7 +78,7 @@ package = pkgs.catppuccin-gtk.override { accents = [ "pink" ]; size = "compact"; - tweaks = [ "rimless" "black" ]; + tweaks = [ "rimless" ]; variant = "mocha"; }; }; @@ -94,6 +94,8 @@ enable = true; globals.mapleader = " "; extraConfigLua = builtins.readFile ./config-files/nvim/init.lua; + + clipboard.providers.wl-copy.enable = true; options = { number = true; # Show line numbers @@ -197,6 +199,7 @@ fidget.enable = true; alpha = { enable = true; + theme = "startify"; }; bufferline.enable = true; }; @@ -243,6 +246,21 @@ key = "nt"; action = "Neotree toggle left"; } + { + mode = "n"; + key = "P"; + action = "\"+p"; + } + { + mode = [ "n" "v" ]; + key = "y"; + action = "[[\"+y]]"; + } + { + mode = [ "n" ]; + key = "Y"; + action = "[[\"+Y]]"; + } ]; }; wayland.windowManager.hyprland = { diff --git a/hosts/antivirus.nix b/hosts/antivirus.nix index 35966aa..e15b17b 100644 --- a/hosts/antivirus.nix +++ b/hosts/antivirus.nix @@ -9,4 +9,3 @@ daemon.enable = true; }; } -