From ea9a014319a127da484c728a12ffbba06f918f07 Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Mon, 31 Jan 2022 22:22:22 -0500 Subject: [PATCH] Add v4l2loopback --- common/packages.nix | 4 +++- flake.lock | 36 +++++++++++++++--------------- home/nvim/lua/init.lua | 38 -------------------------------- machines/hephaestus/hardware.nix | 2 +- 4 files changed, 22 insertions(+), 58 deletions(-) diff --git a/common/packages.nix b/common/packages.nix index 7b10fb9..5863400 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -38,6 +38,7 @@ in # containers docker docker-compose + kubectl podman # language servers @@ -98,7 +99,7 @@ in # video youtube-dl - # network + # networking arp-scan bandwhich dnsutils @@ -214,6 +215,7 @@ in steam tailscale teams + traceroute wireshark-qt zoom-us netdata diff --git a/flake.lock b/flake.lock index e0939cd..bccb468 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1643567433, - "narHash": "sha256-tyFgodcZRlt0ZshbgyLf4m/Sd/ys9p0AHfeVZQ50WKU=", + "lastModified": 1643579427, + "narHash": "sha256-tV4M4+Aqd/3ZjEz1Q07j89KIlkt1oFH34RzpBkUeO/0=", "owner": "nix-community", "repo": "home-manager", - "rev": "95d39e13a4a7a818c87f2701b59820d3ac0e674c", + "rev": "a52aed72c84a2a10102a92397339fa01fc0fe9cf", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1643591050, - "narHash": "sha256-tymKSBi5/ITW6+/u1hKDpWPI0Qx1Ibhu/rhtcVul17c=", + "lastModified": 1643700928, + "narHash": "sha256-CUkK0BY5HTwJjzluG/tkzgt91Zi84m4AT+dTYW+hTsc=", "owner": "neovim", "repo": "neovim", - "rev": "2870311a37314135b73e0ee54b41da86c9540a39", + "rev": "a562b5771ea91becd0a469378ec852feaf50d2d0", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1643616825, - "narHash": "sha256-b25RjpLzUgD2nqWfbcAsm+ik9nHYtAM7XO18hHv7gns=", + "lastModified": 1643703228, + "narHash": "sha256-nMUqkqTav6H9GFS/hut1QVTk0uecfpqH2OCbvG2fcyc=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "19311b9ef8f8f8c71b2f41b59ec9e436646b667c", + "rev": "1c8ac6e3b1c73b305977b30afcd81d8b0fdc3b71", "type": "github" }, "original": { @@ -130,11 +130,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1643347846, - "narHash": "sha256-O0tyXF//ppRpe9yT1Uu5n34yI2MWDyY6ZiJ4Qn5zIkE=", + "lastModified": 1643524588, + "narHash": "sha256-Qh5AazxdOQRORbGkkvpKoovDl6ej/4PhDabFsqnueqw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5bb20f9dc70e9ee16e21cc404b6508654931ce41", + "rev": "efeefb2af1469a5d1f0ae7ca8f0dfd9bb87d5cfb", "type": "github" }, "original": { @@ -146,11 +146,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1643347846, - "narHash": "sha256-O0tyXF//ppRpe9yT1Uu5n34yI2MWDyY6ZiJ4Qn5zIkE=", + "lastModified": 1643524588, + "narHash": "sha256-Qh5AazxdOQRORbGkkvpKoovDl6ej/4PhDabFsqnueqw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5bb20f9dc70e9ee16e21cc404b6508654931ce41", + "rev": "efeefb2af1469a5d1f0ae7ca8f0dfd9bb87d5cfb", "type": "github" }, "original": { @@ -162,11 +162,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1643347846, - "narHash": "sha256-O0tyXF//ppRpe9yT1Uu5n34yI2MWDyY6ZiJ4Qn5zIkE=", + "lastModified": 1643524588, + "narHash": "sha256-Qh5AazxdOQRORbGkkvpKoovDl6ej/4PhDabFsqnueqw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5bb20f9dc70e9ee16e21cc404b6508654931ce41", + "rev": "efeefb2af1469a5d1f0ae7ca8f0dfd9bb87d5cfb", "type": "github" }, "original": { diff --git a/home/nvim/lua/init.lua b/home/nvim/lua/init.lua index 196077b..78cbd8e 100644 --- a/home/nvim/lua/init.lua +++ b/home/nvim/lua/init.lua @@ -135,7 +135,6 @@ vim.cmd([[autocmd BufWritePre *.nix lua vim.lsp.buf.formatting_sync()]]) require("packer").startup(function() use({ "ms-jpq/coq_nvim", branch = "coq" }) -- main one use({ "ms-jpq/coq.artifacts", branch = "artifacts" }) -- 9000+ Snippets - use({ "petertriho/nvim-scrollbar", branch = "main" }) end) ------------------------------------------------------------------------------- @@ -157,43 +156,6 @@ require'nvim-tree'.setup {} -- gitsigns require('gitsigns').setup() --- nvim-scrollbar -require("scrollbar").setup({ - handle = { - text = " ", - color = "white", - }, - marks = { - Search = { text = { "-", "=" }, priority = 0, color = "orange" }, - Error = { text = { "-", "=" }, priority = 1, color = "red" }, - Warn = { text = { "-", "=" }, priority = 2, color = "yellow" }, - Info = { text = { "-", "=" }, priority = 3, color = "blue" }, - Hint = { text = { "-", "=" }, priority = 4, color = "green" }, - Misc = { text = { "-", "=" }, priority = 5, color = "purple" }, - }, - excluded_filetypes = { - "", - "prompt", - "TelescopePrompt", - }, - autocmd = { - render = { - "BufWinEnter", - "TabEnter", - "TermEnter", - "WinEnter", - "CmdwinLeave", - "TextChanged", - "VimResized", - "WinScrolled", - }, - }, - handlers = { - diagnostic = true, - search = true, - }, -}) - -- treesitter require("nvim-treesitter.configs").setup({ ensure_installed = "all", diff --git a/machines/hephaestus/hardware.nix b/machines/hephaestus/hardware.nix index 8b982a9..ca458b7 100644 --- a/machines/hephaestus/hardware.nix +++ b/machines/hephaestus/hardware.nix @@ -7,7 +7,7 @@ [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback.out ]; powerManagement.cpuFreqGovernor = "performance";