fixes or not

This commit is contained in:
autumn
2025-08-25 14:55:05 -06:00
parent 39450f3b3c
commit 8b1c2f1d72
4 changed files with 84 additions and 8 deletions

View File

@@ -1,6 +1,6 @@
{ {
description = "Autumn's laptop config"; description = "Autumn's multi-system configs";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
@@ -24,21 +24,25 @@
}; };
in { in {
homeConfigurations.${user} = home-manager.lib.homeManagerConfiguration { # homeConfigurations.${user} = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.${system}; # extraSpecialArgs = specialArgs;
}; # pkgs = nixpkgs.legacyPackages.${system};
# modules = [ ./home-manager/${user}/home.nix ];
# };
nixosConfigurations."yukigekko" = nixpkgs.lib.nixosSystem{ nixosConfigurations."yukigekko" = nixpkgs.lib.nixosSystem{
specialArgs = specialArgs; specialArgs = specialArgs;
modules = [ modules = [
./system/nixos/configuration.nix home-manager.nixosModules.home-manager{ ./system/nixos/configuration.nix
home-manager.nixosModules.home-manager{
home-manager = { home-manager = {
pkgs = nixpkgs.legacyPackages.${system};
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = specialArgs; extraSpecialArgs = specialArgs;
users.${user} = { users.${user} = {
home.stateVersion = "25.11";
imports = [ imports = [
./home-manager/${user}/home.nix
./home-manager/${user}/yukigekko-home.nix ./home-manager/${user}/yukigekko-home.nix
]; ];
}; };

View File

@@ -0,0 +1,68 @@
{ config, pkgs, ... }:
{
# Home Manager needs a bit of information about you and the paths it should
# manage.
home.username = "autumn";
home.homeDirectory = "/home/autumn";
home.stateVersion = "25.05"; # Please read the comment before changing.
programs.home-manager.enable = true;
nixpkgs.config = {
alowUnfree = true;
allowUnfreePredicate = (_: true);
};
home.packages = with pkgs; [
neofetch
vscodium-fhs
nerd-fonts.hack
vesktop
obsidian
ccls
docker-language-server
nil
ty
rustc
rustup
htop
gnumake
python314Full
eza
gleam
ruff
ruby
vscode-extensions.castwide.solargraph
nim-2_0
nimlangserver
];
programs.htop.enable = true;
programs.starship.enable = true;
programs.bash.initExtra = "
fish
";
# wayland.windowManager.river.enable = true;
home.sessionVariables = {
EDITOR = "helix";
TERM = "alacritty";
};
imports = [
../packages/fish/fish.nix
# ../packages/river/river.nix
../packages/alacritty/alacritty.nix
../packages/helix/helix.nix
../packages/fuzzel/fuzzel.nix
# ../packages/waybar/waybar.nix
../packages/git/git.nix
../packages/starship/starship.nix
];
}

View File

@@ -1,11 +1,11 @@
{ pkgs, ... }: { config, pkgs, ... }:
{ {
# Home Manager needs a bit of information about you and the paths it should # Home Manager needs a bit of information about you and the paths it should
# manage. # manage.
home.username = "autumn"; home.username = "autumn";
home.homeDirectory = "/home/autumn"; home.homeDirectory = "/home/autumn";
# home.stateVersion = "25.05"; # Please read the comment before changing. home.stateVersion = "25.05"; # Please read the comment before changing.
programs.home-manager.enable = true; programs.home-manager.enable = true;

View File

@@ -4,10 +4,14 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
fish fish
oh-my-fish
]; ];
programs.fish = { programs.fish = {
enable = true; enable = true;
interactiveShellInit = ''
set fish_greeting ""
'';
shellAliases = { shellAliases = {
".." = "cd .."; ".." = "cd ..";
"..." = "cd ../.."; "..." = "cd ../..";