From ba843259902b128fc4a7b0ab88d5d43684711e88 Mon Sep 17 00:00:00 2001
From: unexplrd <unexplrd@linerds.us>
Date: Tue, 18 Mar 2025 02:01:50 +0200
Subject: [PATCH] flake.nix: structure overhaul hosts/dunamis/disko.nix: add
 tmpfs mount for /tmp (nix builds fail because of noexec on /)
 modules/home/desktop/default.nix: remove walker

Signed-off-by: unexplrd <unexplrd@linerds.us>
---
 flake.nix                        | 80 +++++++++++---------------------
 hosts/dunamis/disko.nix          |  6 +++
 modules/home/desktop/default.nix |  3 +-
 3 files changed, 35 insertions(+), 54 deletions(-)

diff --git a/flake.nix b/flake.nix
index bdb4719..5a91fb6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,60 +2,36 @@
   description = "unexplrd's personal configuration";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
-    nix-flatpak.url = "github:gmodena/nix-flatpak";
-    stylix.url = "github:danth/stylix";
-    nixvim.url = "github:nix-community/nixvim";
-    nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic";
-    disko = {
-      url = "github:nix-community/disko/latest";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    lix = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    blueprint = {
-      url = "github:numtide/blueprint";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    chaotic = {
-      url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    home-manager = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    hyprland = {
-      url = "github:hyprwm/Hyprland";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    hyprsunset = {
-      url = "github:hyprwm/hyprsunset"; # vaxry make a damn release
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.hyprutils.follows = "hyprland/hyprutils";
-      inputs.hyprland-protocols.follows = "hyprland/hyprland-protocols";
-    };
-    neve = {
-      url = "git+https://gitea.linerds.us/unexplrd/Neve";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixvim.follows = "nixvim";
-    };
-    nix-index-database = {
-      url = "github:nix-community/nix-index-database";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    sops-nix = {
-      url = "github:mic92/sops-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    walker = {
-      url = "github:abenz1267/walker";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    blueprint.url = "github:numtide/blueprint";
+    chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
+    disko.url = "github:nix-community/disko/latest";
+    home-manager.url = "github:nix-community/home-manager";
+    hyprland.url = "github:hyprwm/Hyprland";
+    hyprsunset.url = "github:hyprwm/hyprsunset";
+    lix.url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
     mysecrets.url = "git+ssh://gitea@gitea.linerds.us/unexplrd/nix-secrets";
+    neve.url = "git+https://gitea.linerds.us/unexplrd/Neve";
+    nix-flatpak.url = "github:gmodena/nix-flatpak";
+    nix-index-database.url = "github:nix-community/nix-index-database";
+    nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic";
+    nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
+    nixvim.url = "github:nix-community/nixvim";
+    sops-nix.url = "github:mic92/sops-nix";
+    stylix.url = "github:danth/stylix";
+    # TODO: somehow reduce the number of *.inputs.nixpkgs.follows = "nixpkgs" stuff, mb a function?
+    blueprint.inputs.nixpkgs.follows = "nixpkgs";
+    chaotic.inputs.nixpkgs.follows = "nixpkgs";
+    disko.inputs.nixpkgs.follows = "nixpkgs";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    hyprland.inputs.nixpkgs.follows = "nixpkgs";
+    hyprsunset.inputs.hyprland-protocols.follows = "hyprland/hyprland-protocols";
+    hyprsunset.inputs.hyprutils.follows = "hyprland/hyprutils";
+    hyprsunset.inputs.nixpkgs.follows = "nixpkgs";
+    lix.inputs.nixpkgs.follows = "nixpkgs";
     mysecrets.flake = false;
+    neve.inputs.nixvim.follows = "nixvim";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
+    sops-nix.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = inputs: inputs.blueprint {inherit inputs;};
diff --git a/hosts/dunamis/disko.nix b/hosts/dunamis/disko.nix
index a040a92..9c732e7 100644
--- a/hosts/dunamis/disko.nix
+++ b/hosts/dunamis/disko.nix
@@ -2,6 +2,12 @@
   imports = with inputs; [
     disko.nixosModules.disko
   ];
+  disko.devices.disk.nodev = {
+    "/tmp" = {
+      fsType = "tmpfs";
+      mountOptions = ["rw" "nosuid" "nodev"];
+    };
+  };
   disko.devices.disk.main = {
     type = "disk";
     device = "/dev/nvme0n1";
diff --git a/modules/home/desktop/default.nix b/modules/home/desktop/default.nix
index 6f3a927..57a9121 100644
--- a/modules/home/desktop/default.nix
+++ b/modules/home/desktop/default.nix
@@ -1,6 +1,5 @@
-{inputs, ...}: {
+{
   imports = [
-    inputs.walker.homeManagerModules.default
     ./common/xdg-userdirs.nix
     ./hyprland/default.nix
     ./niri/default.nix