ISO/iso.nix

@@ -1,8 +0,0 @@
-{ lib, ... }:
-
-{
-  boot.supportedFilesystems = {
-    f2fs = true;
-    zfs = lib.mkForce false; # Pulled by ISO build for some reason, and it's broken as of writing
-  };
-}

configuration.nix

@@ -12,8 +12,8 @@
   To fix problems sometimes:
   sudo nixos-rebuild switch -I nixos-config=/etc/nixos/configuration.nix
 
-  To make an ISO: (https://nixos.org/manual/nixos/stable/#sec-image-nixos-rebuild-build-image)
+  To make an ISO:
-  sudo nixos-rebuild build-image --image-variant iso-installer
+  sudo nixos-rebuild build-image
 */
 let
   nixtamal = import ./tamal {
@@ -60,9 +60,6 @@ in
       ./modules/ccache.nix
       ./modules/networking.nix
       ./modules/mesa.nix
-
-      # ISO installer building stuff:
-      ./ISO/iso.nix
     ];
   
   home-manager.useUserPackages = true; # Puts user packages in /etc/profiles

home/doggo/doggo.nix

@@ -57,8 +57,7 @@
     jetbrains.idea
     jetbrains.clion
     #androidStudioPackages.canary.full
-    #androidStudioForPlatformPackages.canary # Android studio but better for AOSP dev
+    androidStudioForPlatformPackages.canary # Android studio but better for AOSP dev
-    #git-repo # Android dev tool
     lmms-full
     gnome-feeds
     vulkan-tools mesa-demos # vkcube & glxgears
@@ -87,7 +86,6 @@
     ./discord-config.nix
     ./firefox-config.nix
     ./mpv-config.nix
-    ./ollama-config.nix
   ];
 
   qt = {

home/doggo/ollama-config.nix

@@ -1,18 +0,0 @@
-{ pkgs, config, ... }:
-
-{
-  services.ollama = {
-    enable = false; # TODO Enable when odysseus package supports non-flake installation
-    package = pkgs.ollama-vulkan;
-  };
-  /*
-  services.odysseus = {
-    enable = true;
-    xdg.dataHome."odysseus/odysseus-env".source = ./odysseus/.env;
-    # https://github.com/pewdiepie-archdaemon/odysseus/blob/dev/.env.example
-    environmentFile = "${config.xdg.dataHome}}/odysseus/odysseus-env";
-    host = "127.0.0.1";
-    port = 8008;
-  };
-  */
-}

modules/bootloader.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 
 {
   catppuccin.plymouth.enable = false;
@@ -20,7 +20,7 @@
       # 0 = Hide the OS choice for bootloaders.
       # It would still be possible to open the bootloader list by pressing any key
       # It just would not appear on screen unless a key is pressed
-      timeout = lib.mkForce 5; # Forced, else it doesn't work when making an ISO
+      timeout = 5;
     };
 
     plymouth = {

modules/filesystems.nix

@@ -20,10 +20,6 @@
 
   services.fstrim.enable = true;
 
-  boot.tmp = {
-    useTmpfs = true; # I'll need to disable this or make it bigger if nix builds fail because of it
-  };
-
   # Link to nix-hardware configs in case I get a new laptop some day:
   # https://github.com/NixOS/nixos-hardware
 }

modules/system-packages.nix

@@ -16,7 +16,7 @@ in
   home-manager.extraSpecialArgs = { inherit functions; };
 
   environment.systemPackages = with pkgs; [
-    git git-lfs
+    git
     curl
     wget
     neovim

tamal/lock.json

@@ -2,15 +2,15 @@
 ,"i":{
 "nixpkgs":{"sn":"nixpkgs-src","kd":[1,{"ft":0,"ur":"https://github.com/NixOS/nixpkgs/archive/3e41b24abd260e8f71dbe2f5737d24122f972158.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-BSTBNVIizq+HVWhxRQidoUSBhRS3DYrbbW3IOF4ZMqo="},"fv":"3e41b24abd260e8f71dbe2f5737d24122f972158","ps":[]}
 ,"ani-cli-git":{"sn":"ani-cli-git-src","kd":[1,{"ft":0,"ur":"https://github.com/pystardust/ani-cli/archive/b8032b72901721a1ce859ca2816e8e2c914bc616.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-vmoD/YCoSBHABOYyYNxqY5+W4YMSZ5yBoIRA6msHaHA="},"fv":"b8032b72901721a1ce859ca2816e8e2c914bc616","ps":[]}
-,"catppuccin":{"sn":"catppuccin-src","kd":[1,{"ft":0,"ur":"https://github.com/catppuccin/nix/archive/e98afe2dfd950bda4e6a8ef32bb563ec2f04505a.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-gG34VKkAcc3Lf9zR4dsocbjj+G73PiGURS9rjInTkTw="},"fv":"e98afe2dfd950bda4e6a8ef32bb563ec2f04505a","ps":[]}
+,"catppuccin":{"sn":"catppuccin-src","kd":[1,{"ft":0,"ur":"https://github.com/catppuccin/nix/archive/8b943da8a0f8628f3446d2517ea39babcfaf27f3.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-Ok/y9/GHp/WOe3zR1DShlSBQMoa9WOM1Fk07HJ98c0o="},"fv":"8b943da8a0f8628f3446d2517ea39babcfaf27f3","ps":[]}
 ,"catppuccin-godot":{"sn":"catppuccin-godot-src","kd":[0,{"ft":0,"ur":"https://raw.githubusercontent.com/catppuccin/godot/d8b72b679078f0103a5e5c1ef793c1d698a563b1/themes/Catppuccin%20Mocha.tet","ms":[]}],"ha":{"al":2,"vl":"blake3-WVY58qsBKJlGvir08RYlS+RcjdhFvXz+7YHVfEr6tes="},"fv":"d8b72b679078f0103a5e5c1ef793c1d698a563b1","ps":[]}
 ,"dolphin-overlay":{"sn":"dolphin-overlay-src","kd":[1,{"ft":0,"ur":"https://github.com/rumboon/dolphin-overlay/archive/65dd612c8d72d4cf5cb0eb4d9188ed7a16a042dd.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-PCS3mMGsTYXadc/DDU/EQv2T/0YORMigwUP6NEeOJW4="},"fv":"65dd612c8d72d4cf5cb0eb4d9188ed7a16a042dd","ps":["kservice_fix"]}
-,"home-manager":{"sn":"home-manager-src","kd":[1,{"ft":0,"ur":"https://github.com/nix-community/home-manager/archive/471a1d2f840eb7fcbdfd541d99c13a64096f46db.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-WbOm3JyJLjbkOeLRz/1iUFnlv1BjV2JcczjQPy9+mTo="},"fv":"471a1d2f840eb7fcbdfd541d99c13a64096f46db","ps":[]}
+,"home-manager":{"sn":"home-manager-src","kd":[1,{"ft":0,"ur":"https://github.com/nix-community/home-manager/archive/d8dac1f668fd861369571be3678ec75b1573e7e3.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-FuhCg7veOS/u+vo7uB8y8wO/vpB8X/Es9DgbyCcSZ1o="},"fv":"d8dac1f668fd861369571be3678ec75b1573e7e3","ps":[]}
 ,"mesa-git":{"sn":"mesa-git-src","kd":[1,{"ft":0,"ur":"https://gitlab.freedesktop.org/mesa/mesa/-/archive/364ae9647756d9045a632c32370181fd1606fd82/mesa-364ae9647756d9045a632c32370181fd1606fd82.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-VgJgh2pD8fsGL3zil0r71AbvfRm1QbRekrddsNOvMdo="},"fv":"364ae9647756d9045a632c32370181fd1606fd82","ps":[]}
 ,"mpv":{"sn":"mpv-src","kd":[1,{"ft":0,"ur":"https://github.com/mpv-player/mpv/archive/refs/tags/v0.41.0.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-4u9KCKKEvSoOSO/7oZGIpnuSGcFc2rVmcJfdpFzwc5w="},"fv":"e04638a4b4eac258e679673d2a4171bde3f6c41eacb7e3d860c9a435f07eb9da","ps":["mpv_buffers_fix"]}
-,"nix-cachyos-kernel":{"sn":"nix-cachyos-kernel-src","kd":[1,{"ft":0,"ur":"https://github.com/xddxdd/nix-cachyos-kernel/archive/f0b6b9acd227ed4822b0dfa55998919a55d466e6.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-a2gLo0lGrfmwZMEEo5JgGY/nWjiJqXkcacgb2JMDDak="},"fv":"f0b6b9acd227ed4822b0dfa55998919a55d466e6","ps":[]}
+,"nix-cachyos-kernel":{"sn":"nix-cachyos-kernel-src","kd":[1,{"ft":0,"ur":"https://github.com/xddxdd/nix-cachyos-kernel/archive/756ed060ca6adcdf3e65371e3725b89c58a1354d.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-Fe0eyieRpR2wg5mSTU+1rWBLuDMbAFlBaq2ZyRLDrLU="},"fv":"756ed060ca6adcdf3e65371e3725b89c58a1354d","ps":[]}
 ,"nix-cachyos-settings":{"sn":"nix-cachyos-settings-src","kd":[1,{"ft":0,"ur":"https://github.com/Daaboulex/cachyos-settings-nix/archive/b10930df067b3774ea2a1a79a4cc31480d8471ab.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-tz6jBM/WrxbxBnNB2v7P/jW1A066j0a+kMgallqOKtM="},"fv":"b10930df067b3774ea2a1a79a4cc31480d8471ab","ps":["adios"]}
-,"nix-citizen":{"sn":"nix-citizen-src","kd":[1,{"ft":0,"ur":"https://github.com/LovingMelody/nix-citizen/archive/dc7fd3444c9326121ad7b1b88ff5cede2198c94f.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-2QwuQLRMzGxi9OjP4H7O2zvWbhZIcbBGBBplMh3KKrY="},"fv":"dc7fd3444c9326121ad7b1b88ff5cede2198c94f","ps":[]}
+,"nix-citizen":{"sn":"nix-citizen-src","kd":[1,{"ft":0,"ur":"https://github.com/LovingMelody/nix-citizen/archive/44a4711c00680d12e807344ad1488564ceab129f.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-BVV1kdZp1Jpxw84MGiDuY1p7i423LF7pXhHSO8UnQUQ="},"fv":"44a4711c00680d12e807344ad1488564ceab129f","ps":[]}
 }
 ,"p":{
 "mpv_buffers_fix":{"ur":"https://patch-diff.githubusercontent.com/raw/mpv-player/mpv/pull/17303.patch","ha":{"al":2,"vl":"blake3-/y4M5tEZmuhh6q5zvg1lbf/jjdnRulPEoycCBcZm/cQ="}}

tamal/manifest.kdl

@@ -5,7 +5,6 @@ patches {
   adios "./patches/adios.patch"
   kservice_fix "./patches/kservice_fix.patch"
   mpv_buffers_fix "https://patch-diff.githubusercontent.com/raw/mpv-player/mpv/pull/17303.patch" // TODO: Remove this and mpv from manifest when mpv 0.42 is released
-  //nix_odysseus "https://patch-diff.githubusercontent.com/raw/pewdiepie-archdaemon/odysseus/pull/2568.patch" // See 2567 also
 }
 
 inputs {
@@ -80,18 +79,7 @@ inputs {
       | cut -f1
     }
   }
-/*
+
-  odysseus {
-    archive {
-      url "https://github.com/pewdiepie-archdaemon/odysseus/archive/{{fresh_value}}.tar.gz"
-    }
-    patches nix_odysseus
-    fresh-cmd {
-      $ git ls-remote --branches "https://github.com/pewdiepie-archdaemon/odysseus.git" --refs "refs/heads/dev"
-      | cut -f1
-    }
-  }
-*/
   // Packages
   ani-cli-git {
     archive {