From 000808b45c86eddf7c3d4afcbe3f5b0910899735 Mon Sep 17 00:00:00 2001
From: Dominik Kaiser
Date: Sat, 16 Aug 2025 17:50:41 +0200
Subject: Move home-manager config

---
 flake.nix             |   2 +-
 home-manager/home.nix | 116 --------------------------------------------------
 home/dk/sol.nix       | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 117 insertions(+), 117 deletions(-)
 delete mode 100644 home-manager/home.nix
 create mode 100644 home/dk/sol.nix

diff --git a/flake.nix b/flake.nix
index 4e4fab0..083d67c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,7 +61,7 @@
         extraSpecialArgs = {inherit inputs outputs;};
         modules = [
            inputs.nix-flatpak.homeManagerModules.nix-flatpak
-          ./home-manager/home.nix
+          ./home/dk/sol.nix
         ];
       };
     };
diff --git a/home-manager/home.nix b/home-manager/home.nix
deleted file mode 100644
index 64adc7a..0000000
--- a/home-manager/home.nix
+++ /dev/null
@@ -1,116 +0,0 @@
-# This is your home-manager configuration file
-# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
-{
-  inputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
-  # You can import other home-manager modules here
-  imports = [
-    # If you want to use home-manager modules from other flakes (such as nix-colors):
-    # inputs.nix-colors.homeManagerModule
-
-    # You can also split up your configuration and import pieces of it here:
-    # ./nvim.nix
-  ];
-
-  nixpkgs = {
-    # You can add overlays here
-    overlays = [
-      # If you want to use overlays exported from other flakes:
-      # neovim-nightly-overlay.overlays.default
-
-      # Or define it inline, for example:
-      # (final: prev: {
-      #   hi = final.hello.overrideAttrs (oldAttrs: {
-      #     patches = [ ./change-hello-to-hi.patch ];
-      #   });
-      # })
-    ];
-    # Configure your nixpkgs instance
-    config = {
-      # Disable if you don't want unfree packages
-      allowUnfree = true;
-      # Workaround for https://github.com/nix-community/home-manager/issues/2942
-      allowUnfreePredicate = _: true;
-      permittedInsecurePackages = [
-        "electron-33.4.11"
-      ];
-    };
-  };
-
-  home = {
-    username = "dk";
-    homeDirectory = "/home/dk";
-  };
-
-  # Add stuff for your user as you see fit:
-  # programs.neovim.enable = true;
-  home.packages = with pkgs; [
-    discord
-    prismlauncher
-    guitarix
-    teamspeak5_client
-    godot_4
-    gimp
-    blender
-    audacity
-    musescore
-    qjackctl
-    inkscape
-    texliveFull
-    itch
-    heroic
-    lutris
-    wine
-  ];
-
-    # Install firefox.
-  programs.firefox.enable = true;
-
-  services.flatpak = {
-    enable = true;
-    packages = [
-      "org.ardour.Ardour"
-      "org.freedesktop.LinuxAudio.Plugins.guitarixvst/x86_64/24.08"
-      "app.zen_browser.zen"
-      "at.vintagestory.VintageStory/x86_64/stable"
-    ];
-    overrides = {
-      "org.ardour.Ardour" = {
-        Environment = {
-          LV2_PATH = "/app/extensions/Plugins/lv2";
-        };
-      };
-    };
-  };
-
-  programs.bash.enable = true;
-  programs.zoxide.enable = true;
-
-  home.shellAliases = {
-    hm-switch = "home-manager switch --flake ~/dotfiles#dk@sol";
-    nix-switch = "sudo nixos-rebuild switch --flake ~/dotfiles#sol";
-    cd = "echo Use z instead! && cd";
-  };
-
-  # Enable home-manager and git
-  programs.home-manager.enable = true;
-  programs.git = {
-    enable = true;
-    userName = "Dominik Kaiser";
-    userEmail = "dkaisr@proton.me";
-    ignores = [
-      ".direnv"
-      ".envrc"
-    ];
-  };
-
-  # Nicely reload system units when changing configs
-  systemd.user.startServices = "sd-switch";
-
-  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  home.stateVersion = "24.11";
-}
diff --git a/home/dk/sol.nix b/home/dk/sol.nix
new file mode 100644
index 0000000..64adc7a
--- /dev/null
+++ b/home/dk/sol.nix
@@ -0,0 +1,116 @@
+# This is your home-manager configuration file
+# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
+{
+  inputs,
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  # You can import other home-manager modules here
+  imports = [
+    # If you want to use home-manager modules from other flakes (such as nix-colors):
+    # inputs.nix-colors.homeManagerModule
+
+    # You can also split up your configuration and import pieces of it here:
+    # ./nvim.nix
+  ];
+
+  nixpkgs = {
+    # You can add overlays here
+    overlays = [
+      # If you want to use overlays exported from other flakes:
+      # neovim-nightly-overlay.overlays.default
+
+      # Or define it inline, for example:
+      # (final: prev: {
+      #   hi = final.hello.overrideAttrs (oldAttrs: {
+      #     patches = [ ./change-hello-to-hi.patch ];
+      #   });
+      # })
+    ];
+    # Configure your nixpkgs instance
+    config = {
+      # Disable if you don't want unfree packages
+      allowUnfree = true;
+      # Workaround for https://github.com/nix-community/home-manager/issues/2942
+      allowUnfreePredicate = _: true;
+      permittedInsecurePackages = [
+        "electron-33.4.11"
+      ];
+    };
+  };
+
+  home = {
+    username = "dk";
+    homeDirectory = "/home/dk";
+  };
+
+  # Add stuff for your user as you see fit:
+  # programs.neovim.enable = true;
+  home.packages = with pkgs; [
+    discord
+    prismlauncher
+    guitarix
+    teamspeak5_client
+    godot_4
+    gimp
+    blender
+    audacity
+    musescore
+    qjackctl
+    inkscape
+    texliveFull
+    itch
+    heroic
+    lutris
+    wine
+  ];
+
+    # Install firefox.
+  programs.firefox.enable = true;
+
+  services.flatpak = {
+    enable = true;
+    packages = [
+      "org.ardour.Ardour"
+      "org.freedesktop.LinuxAudio.Plugins.guitarixvst/x86_64/24.08"
+      "app.zen_browser.zen"
+      "at.vintagestory.VintageStory/x86_64/stable"
+    ];
+    overrides = {
+      "org.ardour.Ardour" = {
+        Environment = {
+          LV2_PATH = "/app/extensions/Plugins/lv2";
+        };
+      };
+    };
+  };
+
+  programs.bash.enable = true;
+  programs.zoxide.enable = true;
+
+  home.shellAliases = {
+    hm-switch = "home-manager switch --flake ~/dotfiles#dk@sol";
+    nix-switch = "sudo nixos-rebuild switch --flake ~/dotfiles#sol";
+    cd = "echo Use z instead! && cd";
+  };
+
+  # Enable home-manager and git
+  programs.home-manager.enable = true;
+  programs.git = {
+    enable = true;
+    userName = "Dominik Kaiser";
+    userEmail = "dkaisr@proton.me";
+    ignores = [
+      ".direnv"
+      ".envrc"
+    ];
+  };
+
+  # Nicely reload system units when changing configs
+  systemd.user.startServices = "sd-switch";
+
+  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
+  home.stateVersion = "24.11";
+}
-- 
cgit v1.2.3