update

10 files changed, 30 insertions, 44 deletions

diff --git a/profiles/core/configuration.nix b/profiles/core/configuration.nix
index 1062850..3d000f1 100644
--- a/profiles/core/configuration.nix
+++ b/profiles/core/configuration.nix
@@ -32,7 +32,7 @@
         uid = mkIf (!machine.isDarwin) 1000;
         description = my.realName;
         openssh.authorizedKeys.keys = my.sshKeys;
-        extraGroups = ["wheel" "networkmanager" "docker" "transmission" "dialout" "test"];
+        extraGroups = ["wheel" "networkmanager" "docker" "transmission" "dialout" "test" "libvirtd"];
         isNormalUser = true;
       };
       root = {
diff --git a/profiles/core/lf.nix b/profiles/core/lf.nix
index c21a0d7..ab7d686 100644
--- a/profiles/core/lf.nix
+++ b/profiles/core/lf.nix
@@ -1,4 +1,5 @@
 {pkgs,...}: {
+  hm.home.packages = [pkgs.ueberzugpp pkgs.lf pkgs.nsxiv];
   hm.xdg.configFile = {
     # "lf/cleaner".source = config.lib.meta.mkMutableSymlink /mut/lf/cleaner;
     # "lf/scope".source = config.lib.meta.mkMutableSymlink /mut/lf/scope;
diff --git a/profiles/core/meta.nix b/profiles/core/meta.nix
index 439b678..0cf0c1c 100644
--- a/profiles/core/meta.nix
+++ b/profiles/core/meta.nix
@@ -1,6 +1,6 @@
-{machine, inputs,lib,config, ...}: with lib; {
+{inputs,lib,config, ...}: with lib; {
   lib.meta = {
-    configPath = if hasAttrByPath ["configPath"] machine then machine.configPath else "/nix-config";
+    configPath = "/nix-config";
     mkMutableSymlink = path:
       config.hm.lib.file.mkOutOfStoreSymlink
         (config.lib.meta.configPath + removePrefix (toString inputs.self) (toString path));
diff --git a/profiles/core/packages.nix b/profiles/core/packages.nix
index 4350680..7793c95 100644
--- a/profiles/core/packages.nix
+++ b/profiles/core/packages.nix
@@ -32,16 +32,14 @@ with lib;
     # gcc
     gnumake
     file
-    # psmisc
+    psmisc
     bc
-    # mediainfo
+    mediainfo
     bat
     openpomodoro-cli
     coreutils
     killall
   ] ++ (optionals (!machine.isDarwin) [
-    nsxiv
-    ueberzugpp
     man-pages
     man-pages-posix
     # pkgsi686Linux.glibc
diff --git a/profiles/graphical/suckless.nix b/profiles/graphical/suckless.nix
index 47d989e..fa12d06 100644
--- a/profiles/graphical/suckless.nix
+++ b/profiles/graphical/suckless.nix
@@ -77,7 +77,8 @@
 
       (nerdfonts.override {fonts = ["FiraCode" "JetBrainsMono"];})
       dmenu
-      librewolf
+      # librewolf
+      ungoogled-chromium
       xclip
       xdotool
       maim
diff --git a/profiles/homeserver/radicale.nix b/profiles/homeserver/radicale.nix
index fd2d985..6f07245 100644
--- a/profiles/homeserver/radicale.nix
+++ b/profiles/homeserver/radicale.nix
@@ -9,6 +9,5 @@
   services.radicale = {
     enable = true;
     settings.server.hosts = [ "0.0.0.0:5232" ];
-    settings.storage.filesystem_folder = "/data/radicale/collections";
   };
 }
diff --git a/profiles/homeserver/tailscale.nix b/profiles/homeserver/tailscale.nix
index 1f47960..0fb821f 100644
--- a/profiles/homeserver/tailscale.nix
+++ b/profiles/homeserver/tailscale.nix
@@ -4,7 +4,6 @@
     enable = true;
     useRoutingFeatures = "server";
     extraUpFlags = ["--advertise-exit-node" "--advertise-routes=${builtins.head machine.ipv4}/32"];
-    extraDaemonFlags = ["--statedir=/data/tailscaled"];
     authKeyFile = config.secrets.tailscale.path;
   };
 
diff --git a/profiles/homeserver/transmission.nix b/profiles/homeserver/transmission.nix
index 7f4c031..4be0d1b 100644
--- a/profiles/homeserver/transmission.nix
+++ b/profiles/homeserver/transmission.nix
@@ -45,6 +45,14 @@
       "jellyfin.${my.domain}"  = { locations."/" = { proxyPass = "http://127.0.0.1:8096"; }; };
     };
   };
+  # services = {
+  #   jellyfin = { enable = true; group = "multimedia"; };
+  #   sonarr = { enable = true; group = "multimedia"; };
+  #   radarr = { enable = true; group = "multimedia"; };
+  #   bazarr = { enable = true; group = "multimedia"; };
+  #   readarr = { enable = true; group = "multimedia"; };
+  #   prowlarr = { enable = true; };
+  # };
   virtualisation.oci-containers = {
     backend = "docker";
     containers = {
diff --git a/profiles/netboot/system.nix b/profiles/netboot/system.nix
index 7dfa6d5..b0e7945 100644
--- a/profiles/netboot/system.nix
+++ b/profiles/netboot/system.nix
@@ -1,49 +1,29 @@
-# sys: { pkgs, lib, ... }: let
-#   run-pixiecore = let
-#       build = sys.config.system.build;
-#     in pkgs.writeShellApplication {
-#       name = "run-pixiecore";
-#       text = ''
-#         sudo ${pkgs.pixiecore}/bin/pixiecore \
-#           boot kernel/bzImage initrd/initrd \
-#           --cmdline "init=init/init loglevel=4" \
-#           --debug --dhcp-no-bind \
-#           --port 64172 --status-port 64172 "$@"
-#       '';
-#     };
-#   build-pixie = pkgs.writeShellApplication {
-#       name = "build-pixie";
-#       text = ''
-#         nix build /nix-config\#nixosConfigurations."$1".config.system.build.kernel --impure -o kernel
-#         nix build /nix-config\#nixosConfigurations."$1".config.system.build.toplevel --impure -o init
-#         nix build /nix-config\#nixosConfigurations."$1".config.system.build.netbootRamdisk --impure -o initrd
-#       '';
-#     };
-# in {
-#   networking.firewall.allowedUDPPorts = [ 67 69 4011 ];
-#   networking.firewall.allowedTCPPorts = [ 64172 ];
-#   environment.systemPackages = [
-#     run-pixiecore
-#     build-pixie
-#   ];
-# }
 sys: { pkgs, lib, ... }: let
   run-pixiecore = let
       build = sys.config.system.build;
     in pkgs.writeShellApplication {
       name = "run-pixiecore";
       text = ''
-        exec ${pkgs.pixiecore}/bin/pixiecore \
-          boot ${build.kernel}/bzImage ${build.netbootRamdisk}/initrd \
-          --cmdline "init=${build.toplevel}/init loglevel=4" \
+        sudo ${pkgs.pixiecore}/bin/pixiecore \
+          boot kernel/bzImage initrd/initrd \
+          --cmdline "init=init/init loglevel=4" \
           --debug --dhcp-no-bind \
           --port 64172 --status-port 64172 "$@"
       '';
     };
+  build-pixie = pkgs.writeShellApplication {
+      name = "build-pixie";
+      text = ''
+        nix build /nix-config\#nixosConfigurations."$1".config.system.build.kernel --impure -o kernel
+        nix build /nix-config\#nixosConfigurations."$1".config.system.build.toplevel --impure -o init
+        nix build /nix-config\#nixosConfigurations."$1".config.system.build.netbootRamdisk --impure -o initrd
+      '';
+    };
 in {
   networking.firewall.allowedUDPPorts = [ 67 69 4011 ];
   networking.firewall.allowedTCPPorts = [ 64172 ];
   environment.systemPackages = [
     run-pixiecore
+    build-pixie
   ];
 }
diff --git a/profiles/station/caldav.nix b/profiles/station/caldav.nix
index 16397d6..98674e4 100644
--- a/profiles/station/caldav.nix
+++ b/profiles/station/caldav.nix
@@ -27,7 +27,7 @@
           type = "caldav";
           url = "https://cal.${my.domain}";
           userName = "mike";
-          passwordCommand = ["${pkgs.bashInteractive}/bin/bash" "-c" "echo 'hi'"];
+          passwordCommand = ["echo" "''"];
         };
         vdirsyncer = {
           enable = true;
@@ -52,7 +52,7 @@
           type = "carddav";
           url = "https://cal.${my.domain}";
           userName = "mike";
-          passwordCommand = ["${pkgs.bashInteractive}/bin/bash" "-c" "echo 'hi'"];
+          passwordCommand = ["echo" "''"];
         };
         vdirsyncer = {
           enable = true;