5 files changed, 16 insertions, 26 deletions
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 51274f9..d3a996a 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -1,8 +1,8 @@
-{ config, pkgs, ... }:
+{ config, pkgs, username, hostname, ... }:
 {
   imports =
     [
-      ./hardware-configuration.nix
+      ../hardware-configuration.nix
       ./cachix.nix
       ./boot.nix
       ./services.nix
@@ -14,20 +14,24 @@
       ./languages
       ./apps.nix
       ./tmux.nix
-      <home-manager/nixos>
     ];
 
   nix.settings = {
     cores = 6;
     max-jobs = 2;
+    experimental-features = "nix-command flakes";
+    trusted-users = [ "root" username ];
+  };
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 7d";
   };
 
-  networking.hostName = "pegasus";
+  networking.hostName = hostname;
   networking.networkmanager.enable = true;
 
   nixpkgs.config.allowUnfree = true;
-  nix.settings.experimental-features = "nix-command flakes";
-  nix.settings.trusted-users = [ "root" "aargh" ];
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
diff --git a/nixos/home.nix b/nixos/home.nix
index 0a5fdd4..054d002 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -1,8 +1,8 @@
-{ config, pkgs, ... }:
+{ config, pkgs, username, ... }:
 {
-  users.users.aargh = {
+  users.users.${username} = {
     isNormalUser = true;
-    description = "Aargh";
+    description = "User";
     extraGroups = [ "networkmanager" "wheel" "kvm" "adbusers" ];
     packages = with pkgs; [];
     shell = pkgs.fish;
@@ -10,15 +10,6 @@
   programs.adb.enable = true;
   programs.fish.enable = true;
   programs.firefox.enable = true;
-  home-manager.users.aargh = { pkgs, ... }: {
-    home.stateVersion = "25.05";
-  };
-  home-manager.backupFileExtension = "hm-backup";
-  nix.gc = {
-    automatic = true;
-    dates = "weekly";
-    options = "--delete-older-than 10d";
-  };
   environment.systemPackages = with pkgs; [
     home-manager
   ];
diff --git a/nixos/nix-channel.txt b/nixos/nix-channel.txt
deleted file mode 100644
index 133e61f..0000000
--- a/nixos/nix-channel.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-home-manager https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz
-nix-ld https://github.com/Mic92/nix-ld/archive/main.tar.gz
-nixos-unstable https://nixos.org/channels/nixos-unstable
diff --git a/nixos/nvidia.nix b/nixos/nvidia.nix
index 14a4f2c..63db5b2 100644
--- a/nixos/nvidia.nix
+++ b/nixos/nvidia.nix
@@ -1,6 +1,5 @@
 { config, pkgs, ... }:
-let unstable = import <nixos-unstable> { config.allowUnfree = true; };
-in {
+{
   hardware.graphics.enable = true;
   hardware.nvidia = {
     modesetting.enable = true;
diff --git a/nixos/nvim.nix b/nixos/nvim.nix
index 1a38a86..ffcbc26 100644
--- a/nixos/nvim.nix
+++ b/nixos/nvim.nix
@@ -1,6 +1,5 @@
-{ config, pkgs, ... }:
-let unstable = import <nixos-unstable> { config.allowUnfree = true; };
-in {
+{ config, pkgs, unstable, ... }:
+{
   environment.systemPackages = with pkgs; [
     unstable.neovim