From 69242277a163edace8a16da36e444af4c74479c4 Mon Sep 17 00:00:00 2001
From: martyTF <marty@marty.tf>
Date: Wed, 17 Dec 2025 16:22:42 +0100
Subject: [PATCH] rip my laptop lol

https://fedi.marty.tf/@marty/statuses/01KCPDS6PHR6R0BFF9XXFRTJD1
---
 flake.nix        |  3 ++
 marty-pc.nix     |  6 ++--
 marty-server.nix |  6 ++--
 modules/home.nix | 78 +++++++++++++++++++++++++++++++++++++++++++-----
 4 files changed, 80 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index dd3a953..5d4ff09 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,6 +24,7 @@
           modules = [
             ./marty-pc.nix
             ./configuration.nix
+            ./user/marty.nix
             home-manager.nixosModules.default
           ];
         };
@@ -32,6 +33,7 @@
           modules = [
             ./marty-server.nix
             ./configuration.nix
+            ./user/marty.nix
             home-manager.nixosModules.default
 
           ];
@@ -41,6 +43,7 @@
           modules = [
             ./marty-latitude.nix
             ./configuration.nix
+            ./user/marty.nix
             home-manager.nixosModules.default
 
           ];
diff --git a/marty-pc.nix b/marty-pc.nix
index d2fbef5..c9e7bf8 100644
--- a/marty-pc.nix
+++ b/marty-pc.nix
@@ -22,9 +22,9 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    users = {
-      marty = ./nixos/modules/home.nix;
-    };
+    # users = {
+    #   marty = ./nixos/modules/home.nix;
+    # };
   };
 
   # PREVIOUSLY HARDWARE-CONFIGURATION.NIX
diff --git a/marty-server.nix b/marty-server.nix
index 88492e6..02a2294 100644
--- a/marty-server.nix
+++ b/marty-server.nix
@@ -22,9 +22,9 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    users = {
-      marty = ./nixos/modules/home.nix;
-    };
+    # users = {
+    #   marty = ./nixos/modules/home.nix;
+    # };
   };
 
   # PREVIOUSLY HARDWARE-CONFIGURATION.NIX
diff --git a/modules/home.nix b/modules/home.nix
index 8147731..be90d55 100644
--- a/modules/home.nix
+++ b/modules/home.nix
@@ -1,12 +1,76 @@
-{
-  config,
-  pkgs,
-  ...
-}:
+{ config, pkgs, ... }:
 
 {
+  # Home Manager needs a bit of information about you and the paths it should
+  # manage.
   home.username = "marty";
-  import = [
-    ./development/import_development.nix
+  home.homeDirectory = "/home/marty";
+
+  # This value determines the Home Manager release that your configuration is
+  # compatible with. This helps avoid breakage when a new Home Manager release
+  # introduces backwards incompatible changes.
+  #
+  # You should not change this value, even if you update Home Manager. If you do
+  # want to update the value, then make sure to first check the Home Manager
+  # release notes.
+  home.stateVersion = "25.11"; # Please read the comment before changing.
+
+  # The home.packages option allows you to install Nix packages into your
+  # environment.
+  home.packages = [
+    # # Adds the 'hello' command to your environment. It prints a friendly
+    # # "Hello, world!" when run.
+    # pkgs.hello
+
+    # # It is sometimes useful to fine-tune packages, for example, by applying
+    # # overrides. You can do that directly here, just don't forget the
+    # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
+    # # fonts?
+    # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
+
+    # # You can also create simple shell scripts directly inside your
+    # # configuration. For example, this adds a command 'my-hello' to your
+    # # environment:
+    # (pkgs.writeShellScriptBin "my-hello" ''
+    #   echo "Hello, ${config.home.username}!"
+    # '')
   ];
+
+  # Home Manager is pretty good at managing dotfiles. The primary way to manage
+  # plain files is through 'home.file'.
+  home.file = {
+    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
+    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
+    # # symlink to the Nix store copy.
+    # ".screenrc".source = dotfiles/screenrc;
+
+    # # You can also set the file content immediately.
+    # ".gradle/gradle.properties".text = ''
+    #   org.gradle.console=verbose
+    #   org.gradle.daemon.idletimeout=3600000
+    # '';
+  };
+
+  # Home Manager can also manage your environment variables through
+  # 'home.sessionVariables'. These will be explicitly sourced when using a
+  # shell provided by Home Manager. If you don't want to manage your shell
+  # through Home Manager then you have to manually source 'hm-session-vars.sh'
+  # located at either
+  #
+  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
+  #
+  # or
+  #
+  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
+  #
+  # or
+  #
+  #  /etc/profiles/per-user/marty/etc/profile.d/hm-session-vars.sh
+  #
+  home.sessionVariables = {
+    EDITOR = "codium";
+  };
+
+  # Let Home Manager install and manage itself.
+  programs.home-manager.enable = true;
 }