Squash bugs and make aspi config work

homes/julian/aspi.nix

@@ -1,5 +1,4 @@
 {
-  config,
   ...
 }:
 {
@@ -24,6 +23,8 @@
 
   ];
 
-  config.terminal = "kitty"; # TODO: only terminal = ???
+  hostName = "aspi";
+  is-nixos = true;
+  terminal = "kitty"; # TODO: only terminal = ???
 
 }

homes/julian/features/desktop/default.nix

@@ -1,30 +1,28 @@
 {
   config,
-  lib,
   pkgs,
   inputs,
   ...
 }:
 let
   inherit (inputs.nix-colors.lib-contrib { inherit pkgs; }) gtkThemeFromScheme;
-  cfg = config.modules.desktop;
 in
 {
   # Do not make conditional, just toggle things on and off
   imports = [ inputs.nix-colors.homeManagerModules.default ]; # TODO: what does this do
 
-  config = lib.mkIf cfg.enable {
-    # home.sessionVariables.GTK_THEME = "Catppuccin-Mocha-Compact-Blue-dark";
-    gtk = {
-      enable = true;
-      theme = {
-        name = inputs.nix-colors.colorschemes.${config.colorscheme}.slug;
-        package = gtkThemeFromScheme { scheme = inputs.nix-colors.colorschemes.${config.colorscheme}; };
-      };
-      iconTheme = {
-        name = "Papirus-Dark";
-        package = pkgs.papirus-icon-theme;
+  # home.sessionVariables.GTK_THEME = "Catppuccin-Mocha-Compact-Blue-dark";
+  gtk = {
+    enable = true;
+    theme = {
+      name = inputs.nix-colors.colorschemes.${config.colorscheme.name}.slug;
+      package = gtkThemeFromScheme {
+        scheme = inputs.nix-colors.colorschemes.${config.colorscheme.name};
       };
     };
+    iconTheme = {
+      name = "Papirus-Dark";
+      package = pkgs.papirus-icon-theme;
+    };
   };
 }

homes/julian/features/emacs/default.nix

@@ -62,9 +62,9 @@ in
 
       emacs-all-the-icons-fonts
     ]
-    ++ lib.optional config.modules.non-nixos.is-nixos emacs;
+    ++ lib.optional config.is-nixos emacs;
 
-  home.activation.installDoomEmacs = lib.home-manager.hm.dag.entryAfter [ "writeBoundary" ] ''
+  home.activation.installDoomEmacs = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
     if [ ! -d "/home/julian/.config/emacs" ]; then
        $DRY_RUN_CMD ${pkgs.git}/bin/git clone --depth=1 --single-branch "${doomRepoUrl}" "/home/julian/.config/emacs"
     fi

homes/julian/features/i3/default.nix

@@ -1,11 +1,11 @@
 {
   lib,
   pkgs,
-  host,
+  config,
   ...
 }:
 {
-  modules.rofi.enable = true;
+  imports = [ ../rofi ];
 
   services.dunst.enable = true;
 
@@ -36,7 +36,7 @@
 
   # Overwrite default home-manager config file
   xdg.configFile."i3/config".source = lib.mkForce (
-    if host == "kardorf" then ./i3/config-kardorf else ./i3/config
+    if config.hostName == "kardorf" then ./i3/config-kardorf else ./i3/config
   );
 
   home.file = {

homes/julian/features/suites/desktop/default.nix

@@ -43,7 +43,7 @@
     libreoffice
     mate.engrampa
     nomacs # Image viewer
-    okular # Pdf reader with many features, good for commenting documents
+    kdePackages.okular # Pdf reader with many features, good for commenting documents
     pavucontrol
     pdfsam-basic # Split, merge, etc for pdfs
     qalculate-gtk # Nice gui calculator

homes/julian/features/suites/development/default.nix

@@ -40,7 +40,7 @@
     maven
     nodejs
     pkg-config # Often needed to build something
-    pwndbg # improved gdb (debugger)
+    # pwndbg # improved gdb (debugger)
     python3
     rust-analyzer
     rustc

homes/julian/global/default.nix

@@ -8,8 +8,8 @@
 }:
 {
   imports = [
-    ../features/cli
-    ../features/helix
+    # ../features/cli
+    # ../features/helix
   ] ++ (builtins.attrValues outputs.homeManagerModules);
 
   nix = {
@@ -24,6 +24,8 @@
     };
   };
 
+  colorscheme.name = "catppuccin-mocha";
+
   # systemd.user.startServices = "sd-switch"; # TODO: what is this
 
   programs = {
@@ -37,9 +39,6 @@
     stateVersion = lib.mkDefault "23.11";
 
     sessionPath = [ "$HOME/.local/bin" ];
-    sessionVariables = {
-      FLAKE = "$HOME/Documents/NixConfig";
-    };
   };
 
   # TODO: colorscheme

homes/julian/hm-standalone-config.nix

@@ -0,0 +1,47 @@
+# Only apply this to home-manager standalone
+{
+  outputs,
+  ...
+}:
+{
+  # Apply overlays
+  nixpkgs = {
+    overlays = builtins.attrValues outputs.overlays;
+    config = {
+      allowUnfree = true;
+      allowUnfreePredicate = _: true; # TODO: what is this
+      permittedInsecurePackages = [
+        "olm-3.2.16"
+      ];
+    };
+  };
+
+  # Setup binary caches
+  nix.settings = {
+    substituters = [
+      "https://nix-community.cachix.org"
+      "https://cache.nixos.org/"
+      "https://hyprland.cachix.org"
+      "http://binarycache.julian-mutter.de"
+    ];
+    trusted-public-keys = [
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+      "binarycache.julian-mutter.de:oJ67uRFwRhNPKL58CHzy3QQLv38Kx7OA1K+6xlEPu7E="
+    ];
+
+    trusted-users = [
+      "root"
+      "@wheel"
+    ];
+
+    experimental-features = [
+      "nix-command"
+      "flakes"
+      "ca-derivations"
+    ];
+
+    # nix.settings. # warn-dirty = false; # TODO: do I want this
+
+  };
+}