diff --git a/core/configuration.nix b/core/configuration.nix index 1295acd..448adde 100644 --- a/core/configuration.nix +++ b/core/configuration.nix @@ -14,7 +14,7 @@ inputs.home-manager.nixosModules.home-manager # also split up configuration.nix and import pieces: - ../home/users/default.nix + ../home/users/users.nix ./packages.nix ]; diff --git a/core/packages.nix b/core/packages.nix index 6f6e186..d857568 100644 --- a/core/packages.nix +++ b/core/packages.nix @@ -3,7 +3,6 @@ { programs = { - # hyprland.enable = true; traceroute.enable = true; starship.enable = true; fish.enable = true; @@ -15,7 +14,7 @@ environment.systemPackages = with pkgs; [ - ## nixos + # # nixos appimage-run # nix-tree # nix-init @@ -23,25 +22,12 @@ # nixpkgs-review # nix-output-monitor - ## filsesystem + # # filsesystem udiskie ntfs3g xfsprogs - - ## compositor - waybar - swww - - ## terminal - kitty - micro - pipes - cbonsai - hyfetch - cmatrix - peaclock - ## tools + # # tools file fd bc @@ -63,16 +49,6 @@ libsecret git-crypt - ## web browsers - # tor-browser-bundle-bin - # lagrange - # firefox - - ## misc, libraries, maybe more, - # qt5-wayland - # qt6-wayland - glib - ]; fonts = { diff --git a/home/home.nix b/home/home.nix index 11c888e..084b4ab 100644 --- a/home/home.nix +++ b/home/home.nix @@ -8,30 +8,41 @@ }: { imports = [ - ./hyprland - ./theme - ./kitty.nix ./git.nix ]; home = { - username = "serenity"; - homeDirectory = "/home/serenity"; packages = with pkgs; [ + ## nixos + appimage-run + + ## web browsers firefox lagrange tor-browser-bin + + ## chat & comms discord + # fractal + # schildichat + + ## personal obsidian + + ## terminal & coding vscode - kitty micro + kitty + ## utility + # insert terminal utility here + ## novelty pipes cbonsai hyfetch cmatrix peaclock + ]; stateVersion = "23.11"; diff --git a/home/users/-coffee.nix b/home/users/-coffee.nix index 8861e62..1f2db0b 100644 --- a/home/users/-coffee.nix +++ b/home/users/-coffee.nix @@ -17,7 +17,6 @@ ]; - stateVersion = "23.11"; }; } diff --git a/home/users/-serenity.nix b/home/users/-serenity.nix index 8861e62..05aea91 100644 --- a/home/users/-serenity.nix +++ b/home/users/-serenity.nix @@ -16,8 +16,7 @@ packages = with pkgs; [ ]; - - stateVersion = "23.11"; + }; } diff --git a/home/users/-template.nix b/home/users/-template.nix index 430c898..a38b344 100644 --- a/home/users/-template.nix +++ b/home/users/-template.nix @@ -19,7 +19,6 @@ ]; - stateVersion = "23.11"; }; } diff --git a/home/users/default.nix b/home/users/default.nix deleted file mode 100644 index 2541a8c..0000000 --- a/home/users/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: - -{ - - imports = [ - inputs.home-manager.nixosModules.default - ./users.nix - ]; - -} diff --git a/home/users/users.nix b/home/users/users.nix index d60cdb0..d1dcae6 100644 --- a/home/users/users.nix +++ b/home/users/users.nix @@ -74,7 +74,6 @@ # home = { # username = "TEMPLATE"; # homeDirectory = "/home/TEMPLATE"; - # stateVersion = "23.11"; # }; # }; @@ -83,7 +82,6 @@ home = { username = "coffee"; homeDirectory = "/home/coffee"; - stateVersion = "23.11"; }; }; @@ -92,7 +90,6 @@ home = { username = "serenity"; homeDirectory = "/home/serenity"; - stateVersion = "23.11"; }; };