From a1dfe29b3fa1c40105dce20a886e0148909805d8 Mon Sep 17 00:00:00 2001 From: Morten Olsen Date: Tue, 20 Feb 2024 00:01:02 +0100 Subject: [PATCH] update --- modules/basic/default.nix | 1 + modules/basic/udev.nix | 30 ++++++++++++++++++++++++++++++ user/default.nix | 6 +++++- user/programs/neovim/default.nix | 4 ++-- 4 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 modules/basic/udev.nix diff --git a/modules/basic/default.nix b/modules/basic/default.nix index 42736b5..5d406a3 100644 --- a/modules/basic/default.nix +++ b/modules/basic/default.nix @@ -6,6 +6,7 @@ ./nix.nix ./network.nix ./security.nix + ./udev.nix ]; environment.systemPackages = [ pkgs.nfs-utils diff --git a/modules/basic/udev.nix b/modules/basic/udev.nix new file mode 100644 index 0000000..cf049c0 --- /dev/null +++ b/modules/basic/udev.nix @@ -0,0 +1,30 @@ +{ config, pkgs, ... }: + +{ + services.udev.packages = [ + (pkgs.writeTextFile { + name = "streamdeck-udev"; + text = '' + SUBSYSTEM=="input", GROUP="input", MODE="0666" + SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0060", MODE:="666", GROUP="plugdev" + SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0063", MODE:="666", GROUP="plugdev" + SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="006c", MODE:="666", GROUP="plugdev" + SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="006d", MODE:="666", GROUP="plugdev" + SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0080", MODE:="666", GROUP="plugdev" + SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0084", MODE:="666", GROUP="plugdev" + SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0086", MODE:="666", GROUP="plugdev" + SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0090", MODE:="666", GROUP="plugdev" + KERNEL=="hidraw*", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0060", MODE:="666", GROUP="plugdev" + KERNEL=="hidraw*", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0063", MODE:="666", GROUP="plugdev" + KERNEL=="hidraw*", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="006c", MODE:="666", GROUP="plugdev" + KERNEL=="hidraw*", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="006d", MODE:="666", GROUP="plugdev" + KERNEL=="hidraw*", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0080", MODE:="666", GROUP="plugdev" + KERNEL=="hidraw*", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0084", MODE:="666", GROUP="plugdev" + KERNEL=="hidraw*", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0086", MODE:="666", GROUP="plugdev" + KERNEL=="hidraw*", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0090", MODE:="666", GROUP="plugdev" + ''; + + destination = "/etc/udev/rules.d/50-elgato.rules"; + }) + ]; +} diff --git a/user/default.nix b/user/default.nix index 74290ed..a594861 100644 --- a/user/default.nix +++ b/user/default.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: { - environment.sessionVariables.NIXOS_OZONE_WL = "1"; + # environment.sessionVariables.NIXOS_OZONE_WL = "1"; programs.zsh.enable = true; users.users.alice = { @@ -11,6 +11,10 @@ shell = pkgs.zsh; }; +networking.firewall = { + enable = true; + allowedTCPPorts = [ 8081 5001 ]; +}; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "1password-gui" diff --git a/user/programs/neovim/default.nix b/user/programs/neovim/default.nix index f028025..9fdd7ef 100644 --- a/user/programs/neovim/default.nix +++ b/user/programs/neovim/default.nix @@ -3,11 +3,11 @@ let astronvim = builtins.fetchGit { url = "https://github.com/AstroNvim/AstroNvim"; - rev = "7f087b2ea45073be3386a29e805143f0a1f896e8"; + rev = "ba0fbdf974eb63639e43d6467f7232929b8b9b4c"; }; astronvimUser = builtins.fetchGit { url = "https://foo:foo@github.com/morten-olsen/astrovim"; - rev = "44b38567fe3adedd972b5b07f5883d47600a9078"; + rev = "295278f715810a2917e0eb38c304cfc290e796d7"; }; in { programs.neovim.enable = true;