feat(amy): migrate iceshrimp

common/generic-desktop.nix

@@ -29,5 +29,19 @@
   fonts.packages = with pkgs; [
     (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
     maple-mono-NF
+    atkinson-hyperlegible
+    liberation_ttf
+    ocr-a
+    (pkgs.stdenv.mkDerivation {
+      pname = "libre-barcode";
+      version = "1.008";
+      src = pkgs.fetchzip {
+        url = "https://github.com/graphicore/librebarcode/releases/download/v1.008/LibreBarcode_v1.008.zip";
+        hash = "sha256-2Tqpjb+wBrfawgdRdrL+rfJeYLsnwMhfDkwIBt2HWkE=";
+      };
+      installPhase = ''
+      install -D -m 0644 $src/LibreBarcode39-Regular.ttf $out/share/fonts/truetype/LibreBarcode39-Regular.ttf
+      '';
+    })
   ];
 }

flake.nix

@@ -9,12 +9,12 @@
     };
 
     lix-module-stable = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz";
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs-stable";
     };
 
     lix-module-unstable = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz";
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
 
@@ -114,6 +114,7 @@
               ./home/ash/emacs.nix
 #              ./home/ash/obs.nix
               ./home/ash/niri.nix
+              ./home/ash/syncthing.nix
               ./home/ash/tpm-fido.nix
               ./home/ash/vscodium.nix
               ./home/ash/zoom.nix
@@ -145,6 +146,7 @@
               ./home/ash/obs.nix
               ./home/ash/intellij.nix
               ./home/ash/lutris.nix
+              ./home/ash/syncthing.nix
 
               ./home/ash/vscodium.nix
               ./home/ash/zoom.nix
@@ -189,6 +191,7 @@
         ./roles/mc-proxy.nix
         ./roles/podman.nix
         ./roles/postgres.nix
+        ./roles/youtrack.nix
         ./roles/zulip.nix
         home-manager-stable.nixosModules.home-manager
         {

home/ash/desktop.nix

@@ -1,7 +1,7 @@
 { config, pkgs, ... }: {
   home.packages = with pkgs; [
     firefox
-    fluffychat
+#    fluffychat
     cachix
     prismlauncher
     gnome.gnome-sudoku
@@ -14,7 +14,7 @@
 
   programs.kitty = {
     enable = true;
-    theme = "Catppuccin-Mocha";
+    themeFile = "Catppuccin-Mocha";
     font.name = "JetBrainsMono Nerd Font";
   };
 

home/ash/intellij.nix

@@ -1,6 +1,7 @@
 { config, pkgs, ... }: {
   home.packages = with pkgs; [
     jetbrains.idea-ultimate
+    jetbrains.phpstorm
     android-studio
   ];
 }

home/ash/syncthing.nix

@@ -0,0 +1,6 @@
+{ ... }: {
+  services.syncthing = {
+    enable = true;
+    tray.enable = true;
+  };
+}

home/ash/vscodium.nix

@@ -35,6 +35,7 @@
         jakebecker.elixir-ls
         phoenixframework.phoenix
         bradlc.vscode-tailwindcss
+        myriad-dreamin.tinymist
       ]);
     })
   ];

hosts/alex/configuration.nix

@@ -80,5 +80,7 @@
 
   virtualisation.waydroid.enable = true;
 
+  services.logind.lidSwitch = "ignore";
+
   system.stateVersion = "22.11";
 }

hosts/amy/configuration.nix

@@ -43,6 +43,7 @@
       interface = "ens18";
     };
   };
+  services.resolved.enable = true;
 
   system.stateVersion = "23.11";
 }

hosts/loona/configuration.nix

@@ -15,7 +15,7 @@
   networking.hostId = "df9469a3";
   networking.firewall.enable = false;
 
-  boot.kernelPackages = pkgs.linuxPackages_6_8;
+  #boot.kernelPackages = pkgs.linuxPackages_6_8;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {

roles/iceshrimp.nix

@@ -6,5 +6,18 @@
     settings.protected-mode = "no";
   };
 
-  # TODO: move rest of iceshrimp to amy
+  virtualisation.oci-containers.containers.iceshrimp = {
+    image = "git.ashhhleyyy.dev/shorks-gay/iceshrimp:2023.12.11.shorks1";
+    autoStart = false;
+    environment = {
+      NODE_ENV = "production";
+    };
+    ports = [
+      "3000:3000"
+    ];
+    volumes = [
+      "/home/ash/shorks-gay/files:/iceshrimp/files"
+      "/home/ash/shorks-gay/.config:/iceshrimp/.config:ro"
+    ];
+  };
 }

roles/podman.nix

@@ -1,5 +1,8 @@
 { config, pkgs, ... }: {
-  virtualisation.podman.enable = true;
+  virtualisation.podman = {
+    enable = true;
+    dockerSocket.enable = true;
+  };
   virtualisation.oci-containers.backend = "podman";
   environment.systemPackages = with pkgs; [
     podman-compose

roles/postgres.nix

@@ -31,7 +31,7 @@
       # ipv4
       host  all      all     127.0.0.1/32   scram-sha-256
       host  all      all     100.64.0.0/10  scram-sha-256
-      host  all      all     10.0.0.0/8     scram-sha-256
+      host  all      all     0.0.0.0/0     scram-sha-256
       # ipv6
       host all       all     ::1/128        scram-sha-256
     '';

roles/youtrack.nix

@@ -0,0 +1,13 @@
+{
+  config
+, pkgs
+, ...
+}:
+
+{
+  services.youtrack = {
+    enable = true;
+    environmentalParameters.listen-port = 3002;
+    package = pkgs.youtrack;
+  };
+}