From 02a2157733961b48210532c47077f4aebdc3ad45 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Josh)" Date: Mon, 5 Aug 2024 15:13:10 -0500 Subject: [PATCH] signal on joe --- hosts/_common/configuration.nix | 2 +- hosts/joe/configuration.nix | 26 ++++++++++++++++--- users/_common/home_manager/ssh.nix | 3 +++ .../josh/by_hosts/joe/home_manager/signal.nix | 4 +++ users/josh/home_manager/file_browser.nix | 3 ++- 5 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 users/josh/by_hosts/joe/home_manager/signal.nix diff --git a/hosts/_common/configuration.nix b/hosts/_common/configuration.nix index d2dce6f..9b94d50 100644 --- a/hosts/_common/configuration.nix +++ b/hosts/_common/configuration.nix @@ -65,7 +65,6 @@ in nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ # Basics - # neovim in TODO nix file in common, to split out into its own flake eventually vim wget curl @@ -76,6 +75,7 @@ in git fzf ripgrep + lsof # TODO keep in common or move to specific machines, I want this for my pocket 3 video KDM module but I use ffmpeg on most machines anyways? ffmpeg_5-full diff --git a/hosts/joe/configuration.nix b/hosts/joe/configuration.nix index 9958bf1..9608316 100644 --- a/hosts/joe/configuration.nix +++ b/hosts/joe/configuration.nix @@ -1,10 +1,9 @@ { config, - lib, pkgs, settings, ... -}@args: +}: { imports = [ # Common components this machine uses @@ -23,6 +22,12 @@ (settings.usersDir + "/josh/configuration.nix") ]; +# test + + networking.firewall.allowedTCPPorts = [ + 34733 # sshd + ]; + # machine specific configuration # ============================== hardware.enableAllFirmware = true; @@ -45,10 +50,23 @@ }; # Load nvidia driver for Xorg and Wayland - virtualisation.docker.enableNvidia = true; virtualisation.docker = { - extraOptions = "--experimental"; + enableNvidia = true; + extraOptions = '' + --experimental + --add-runtime=nvidia=${pkgs.nvidia-docker}/bin/nvidia-container-runtime + ''; }; + environment.etc."docker/daemon.json".text = '' + { + "runtimes": { + "nvidia": { + "path": "${pkgs.nvidia-docker}/bin/nvidia-container-runtime", + "runtimeArgs": [] + } + } + } + ''; services.xserver.videoDrivers = [ "nvidia" ]; hardware.nvidia = { # Modesetting is required. diff --git a/users/_common/home_manager/ssh.nix b/users/_common/home_manager/ssh.nix index 33684f9..b8609f5 100644 --- a/users/_common/home_manager/ssh.nix +++ b/users/_common/home_manager/ssh.nix @@ -47,6 +47,9 @@ host.address = "localhost"; } ]; + setEnv = { + TERM = "vt100"; + }; }; "l001" = { identityFile = age.secrets.nix2l001.path; diff --git a/users/josh/by_hosts/joe/home_manager/signal.nix b/users/josh/by_hosts/joe/home_manager/signal.nix new file mode 100644 index 0000000..afc1113 --- /dev/null +++ b/users/josh/by_hosts/joe/home_manager/signal.nix @@ -0,0 +1,4 @@ +{ pkgs, ... }: +{ + home.packages = [ pkgs.signal-desktop ]; +} diff --git a/users/josh/home_manager/file_browser.nix b/users/josh/home_manager/file_browser.nix index 5b6b41d..26cbab4 100644 --- a/users/josh/home_manager/file_browser.nix +++ b/users/josh/home_manager/file_browser.nix @@ -1,5 +1,6 @@ -{ settings, pkgs, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ gnome.nautilus qimgv ]; + }