From 7cea231a80b491940703f41c96b0c58b7830b3ce Mon Sep 17 00:00:00 2001 From: autumn Date: Mon, 25 Aug 2025 12:01:34 -0600 Subject: [PATCH 1/7] buncha shit tbh --- flake.nix | 4 +--- home-manager/autumn/{home.nix => yukigekko-home.nix} | 0 home-manager/packages/waybar/waybar.nix | 6 +++++- 3 files changed, 6 insertions(+), 4 deletions(-) rename home-manager/autumn/{home.nix => yukigekko-home.nix} (100%) diff --git a/flake.nix b/flake.nix index 9981d02..d645c21 100644 --- a/flake.nix +++ b/flake.nix @@ -21,8 +21,6 @@ homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.${system}; extraSpecialArgs = {inherit inputs;}; - modules = [ ./home-manager/autumn/home.nix ]; - }; nixosConfigurations."yukigekko" = nixpkgs.lib.nixosSystem{ @@ -34,7 +32,7 @@ inherit locale; }; modules = [ - ./system/nixos/configuration.nix + ./system/nixos/configuration.nix ./home-manager/autumn/yukigekko-home.nix ]; }; }; diff --git a/home-manager/autumn/home.nix b/home-manager/autumn/yukigekko-home.nix similarity index 100% rename from home-manager/autumn/home.nix rename to home-manager/autumn/yukigekko-home.nix diff --git a/home-manager/packages/waybar/waybar.nix b/home-manager/packages/waybar/waybar.nix index 5506144..55b87ed 100644 --- a/home-manager/packages/waybar/waybar.nix +++ b/home-manager/packages/waybar/waybar.nix @@ -15,8 +15,12 @@ position = "top"; height = 30; spacing = 4; - + # Module layout + # + modules-center = [ + "river/window" + ]; modules-right = [ "pulseaudio" "network#wifi" From 39450f3b3cc983d83ef8935858e9f202756748be Mon Sep 17 00:00:00 2001 From: autumn Date: Mon, 25 Aug 2025 12:49:50 -0600 Subject: [PATCH 2/7] ouch --- flake.nix | 37 +++++++++++++++++--------- home-manager/autumn/yukigekko-home.nix | 5 ++-- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/flake.nix b/flake.nix index d645c21..bcc9513 100644 --- a/flake.nix +++ b/flake.nix @@ -11,28 +11,39 @@ outputs = { self, nixpkgs, home-manager }@inputs: let - username = "autumn"; + user = "autumn"; system = "x86_64-linux"; timezone = "America/Denver"; locale = "en_US.UTF-8"; - + specialArgs = { + inherit inputs; + inherit user; + inherit system; + inherit timezone; + inherit locale; + }; in { - - homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration { + + homeConfigurations.${user} = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.${system}; - extraSpecialArgs = {inherit inputs;}; }; nixosConfigurations."yukigekko" = nixpkgs.lib.nixosSystem{ - specialArgs = { - inherit inputs; - inherit system; - inherit username; - inherit timezone; - inherit locale; - }; + specialArgs = specialArgs; modules = [ - ./system/nixos/configuration.nix ./home-manager/autumn/yukigekko-home.nix + ./system/nixos/configuration.nix home-manager.nixosModules.home-manager{ + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = specialArgs; + users.${user} = { + home.stateVersion = "25.11"; + imports = [ + ./home-manager/${user}/yukigekko-home.nix + ]; + }; + }; + } ]; }; }; diff --git a/home-manager/autumn/yukigekko-home.nix b/home-manager/autumn/yukigekko-home.nix index 54d9472..ea5eb5a 100644 --- a/home-manager/autumn/yukigekko-home.nix +++ b/home-manager/autumn/yukigekko-home.nix @@ -1,14 +1,15 @@ -{ config, lib, pkgs, ... }: +{ 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; - home.stateVersion = "25.05"; # Please read the comment before changing. nixpkgs.config = { alowUnfree = true; From 8b1c2f1d7204e6c08c7ee39421e8e584a620c54d Mon Sep 17 00:00:00 2001 From: autumn Date: Mon, 25 Aug 2025 14:55:05 -0600 Subject: [PATCH 3/7] fixes or not --- flake.nix | 16 +++--- home-manager/autumn/home.nix | 68 ++++++++++++++++++++++++++ home-manager/autumn/yukigekko-home.nix | 4 +- home-manager/packages/fish/fish.nix | 4 ++ 4 files changed, 84 insertions(+), 8 deletions(-) create mode 100644 home-manager/autumn/home.nix diff --git a/flake.nix b/flake.nix index bcc9513..57b8e10 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { - description = "Autumn's laptop config"; + description = "Autumn's multi-system configs"; inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; @@ -24,21 +24,25 @@ }; in { - homeConfigurations.${user} = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.${system}; - }; + # homeConfigurations.${user} = home-manager.lib.homeManagerConfiguration { + # extraSpecialArgs = specialArgs; + # pkgs = nixpkgs.legacyPackages.${system}; + # modules = [ ./home-manager/${user}/home.nix ]; + # }; nixosConfigurations."yukigekko" = nixpkgs.lib.nixosSystem{ specialArgs = specialArgs; modules = [ - ./system/nixos/configuration.nix home-manager.nixosModules.home-manager{ + ./system/nixos/configuration.nix + home-manager.nixosModules.home-manager{ home-manager = { + pkgs = nixpkgs.legacyPackages.${system}; useGlobalPkgs = true; useUserPackages = true; extraSpecialArgs = specialArgs; users.${user} = { - home.stateVersion = "25.11"; imports = [ + ./home-manager/${user}/home.nix ./home-manager/${user}/yukigekko-home.nix ]; }; diff --git a/home-manager/autumn/home.nix b/home-manager/autumn/home.nix new file mode 100644 index 0000000..8196804 --- /dev/null +++ b/home-manager/autumn/home.nix @@ -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 + ]; + +} diff --git a/home-manager/autumn/yukigekko-home.nix b/home-manager/autumn/yukigekko-home.nix index ea5eb5a..50e743f 100644 --- a/home-manager/autumn/yukigekko-home.nix +++ b/home-manager/autumn/yukigekko-home.nix @@ -1,11 +1,11 @@ -{ pkgs, ... }: +{ 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. + home.stateVersion = "25.05"; # Please read the comment before changing. programs.home-manager.enable = true; diff --git a/home-manager/packages/fish/fish.nix b/home-manager/packages/fish/fish.nix index d8f0eb3..45d2923 100644 --- a/home-manager/packages/fish/fish.nix +++ b/home-manager/packages/fish/fish.nix @@ -4,10 +4,14 @@ home.packages = with pkgs; [ fish + oh-my-fish ]; programs.fish = { enable = true; + interactiveShellInit = '' + set fish_greeting "" + ''; shellAliases = { ".." = "cd .."; "..." = "cd ../.."; From 772b6a9e0ea0f5954e1571e07e68e65ecd0c339e Mon Sep 17 00:00:00 2001 From: autumn Date: Mon, 25 Aug 2025 15:08:40 -0600 Subject: [PATCH 4/7] bleh --- flake.nix | 41 ++++++------ home-manager/autumn/yukigekko-home.nix | 92 +++++++++++++------------- 2 files changed, 68 insertions(+), 65 deletions(-) diff --git a/flake.nix b/flake.nix index 57b8e10..bb0a672 100644 --- a/flake.nix +++ b/flake.nix @@ -24,30 +24,33 @@ }; in { - # homeConfigurations.${user} = home-manager.lib.homeManagerConfiguration { - # extraSpecialArgs = specialArgs; - # pkgs = nixpkgs.legacyPackages.${system}; - # modules = [ ./home-manager/${user}/home.nix ]; - # }; + homeConfigurations.${user} = home-manager.lib.homeManagerConfiguration { + extraSpecialArgs = specialArgs; + pkgs = nixpkgs.legacyPackages.${system}; + modules = [ + ./home-manager/${user}/home.nix + ./home-manager/${user}/yukigekko-home.nix + ]; + }; nixosConfigurations."yukigekko" = nixpkgs.lib.nixosSystem{ specialArgs = specialArgs; modules = [ ./system/nixos/configuration.nix - home-manager.nixosModules.home-manager{ - home-manager = { - pkgs = nixpkgs.legacyPackages.${system}; - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs = specialArgs; - users.${user} = { - imports = [ - ./home-manager/${user}/home.nix - ./home-manager/${user}/yukigekko-home.nix - ]; - }; - }; - } + # home-manager.nixosModules.home-manager{ + # home-manager = { + # #pkgs = nixpkgs.legacyPackages.${system}; + # useGlobalPkgs = true; + # useUserPackages = true; + # extraSpecialArgs = specialArgs; + # users.${user} = { + # imports = [ + # ./home-manager/${user}/home.nix + # ./home-manager/${user}/yukigekko-home.nix + # ]; + # }; + # }; + # } ]; }; }; diff --git a/home-manager/autumn/yukigekko-home.nix b/home-manager/autumn/yukigekko-home.nix index 50e743f..89f8b3e 100644 --- a/home-manager/autumn/yukigekko-home.nix +++ b/home-manager/autumn/yukigekko-home.nix @@ -3,66 +3,66 @@ { # 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. + # home.username = "autumn"; + # home.homeDirectory = "/home/autumn"; + # home.stateVersion = "25.05"; # Please read the comment before changing. - programs.home-manager.enable = true; + # programs.home-manager.enable = true; - nixpkgs.config = { - alowUnfree = true; - allowUnfreePredicate = (_: 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 - ]; + # 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 - "; + # programs.htop.enable = true; + # programs.starship.enable = true; + # programs.bash.initExtra = " + # fish + # "; wayland.windowManager.river.enable = true; - home.sessionVariables = { - EDITOR = "helix"; - TERM = "alacritty"; - }; + # home.sessionVariables = { + # EDITOR = "helix"; + # TERM = "alacritty"; + # }; imports = [ - ../packages/fish/fish.nix + # ../packages/fish/fish.nix ../packages/river/river.nix - ../packages/alacritty/alacritty.nix - ../packages/helix/helix.nix - ../packages/fuzzel/fuzzel.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 + # ../packages/git/git.nix + # ../packages/starship/starship.nix ]; } From 82344c55a9ad1af0995ec1730f5be763c62fecbc Mon Sep 17 00:00:00 2001 From: autumn Date: Mon, 25 Aug 2025 16:01:38 -0600 Subject: [PATCH 5/7] undoing stupid changes --- flake.nix | 22 +++--- home-manager/autumn/yukigekko-home.nix | 93 +++++++++++++------------- 2 files changed, 57 insertions(+), 58 deletions(-) diff --git a/flake.nix b/flake.nix index bb0a672..f391545 100644 --- a/flake.nix +++ b/flake.nix @@ -24,14 +24,14 @@ }; in { - homeConfigurations.${user} = home-manager.lib.homeManagerConfiguration { - extraSpecialArgs = specialArgs; - pkgs = nixpkgs.legacyPackages.${system}; - modules = [ - ./home-manager/${user}/home.nix - ./home-manager/${user}/yukigekko-home.nix - ]; - }; + homeConfigurations.${user} = home-manager.lib.homeManagerConfiguration { + extraSpecialArgs = specialArgs; + pkgs = nixpkgs.legacyPackages.${system}; + modules = [ + # ./home-manager/${user}/home.nix + ./home-manager/${user}/yukigekko-home.nix + ]; + }; nixosConfigurations."yukigekko" = nixpkgs.lib.nixosSystem{ specialArgs = specialArgs; @@ -39,14 +39,14 @@ ./system/nixos/configuration.nix # home-manager.nixosModules.home-manager{ # home-manager = { - # #pkgs = nixpkgs.legacyPackages.${system}; # useGlobalPkgs = true; # useUserPackages = true; # extraSpecialArgs = specialArgs; # users.${user} = { + # # pkgs = nixpkgs.legacyPackages.${system}; # imports = [ - # ./home-manager/${user}/home.nix - # ./home-manager/${user}/yukigekko-home.nix + # #./home-manager/${user}/home.nix + # ./home-manager/autumn/yukigekko-home.nix # ]; # }; # }; diff --git a/home-manager/autumn/yukigekko-home.nix b/home-manager/autumn/yukigekko-home.nix index 89f8b3e..b4292e2 100644 --- a/home-manager/autumn/yukigekko-home.nix +++ b/home-manager/autumn/yukigekko-home.nix @@ -3,66 +3,65 @@ { # 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. + home.username = "autumn"; + home.homeDirectory = "/home/autumn"; + home.stateVersion = "25.05"; # Please read the comment before changing. - # programs.home-manager.enable = true; + programs.home-manager.enable = true; - # nixpkgs.config = { - # alowUnfree = true; - # allowUnfreePredicate = (_: 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 - # "; + 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"; - # }; + home.sessionVariables = { + EDITOR = "helix"; + TERM = "alacritty"; + }; imports = [ - # ../packages/fish/fish.nix + ../packages/fish/fish.nix ../packages/river/river.nix - # ../packages/alacritty/alacritty.nix - # ../packages/helix/helix.nix - # ../packages/fuzzel/fuzzel.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 + ../packages/git/git.nix + ../packages/starship/starship.nix ]; } From 1cf993589c85670bd48a6f9703cb038aff2f65ff Mon Sep 17 00:00:00 2001 From: autumn Date: Mon, 25 Aug 2025 17:51:28 -0600 Subject: [PATCH 6/7] new user on laptop --- flake.nix | 8 +-- home-manager/ruby/home.nix | 67 +++++++++++++++++++ system/{nixos => yukigekko}/configuration.nix | 6 +- system/{nixos => yukigekko}/flake.nix | 0 .../hardware-configuration.nix | 0 5 files changed, 73 insertions(+), 8 deletions(-) create mode 100644 home-manager/ruby/home.nix rename system/{nixos => yukigekko}/configuration.nix (97%) rename system/{nixos => yukigekko}/flake.nix (100%) rename system/{nixos => yukigekko}/hardware-configuration.nix (100%) diff --git a/flake.nix b/flake.nix index f391545..0456df0 100644 --- a/flake.nix +++ b/flake.nix @@ -11,32 +11,30 @@ outputs = { self, nixpkgs, home-manager }@inputs: let - user = "autumn"; system = "x86_64-linux"; timezone = "America/Denver"; locale = "en_US.UTF-8"; specialArgs = { inherit inputs; - inherit user; inherit system; inherit timezone; inherit locale; }; in { - homeConfigurations.${user} = home-manager.lib.homeManagerConfiguration { + homeConfigurations.ruby= home-manager.lib.homeManagerConfiguration { extraSpecialArgs = specialArgs; pkgs = nixpkgs.legacyPackages.${system}; modules = [ # ./home-manager/${user}/home.nix - ./home-manager/${user}/yukigekko-home.nix + ./home-manager/ruby/home.nix ]; }; nixosConfigurations."yukigekko" = nixpkgs.lib.nixosSystem{ specialArgs = specialArgs; modules = [ - ./system/nixos/configuration.nix + ./system/yukigekko/configuration.nix # home-manager.nixosModules.home-manager{ # home-manager = { # useGlobalPkgs = true; diff --git a/home-manager/ruby/home.nix b/home-manager/ruby/home.nix new file mode 100644 index 0000000..b4292e2 --- /dev/null +++ b/home-manager/ruby/home.nix @@ -0,0 +1,67 @@ +{ 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 + ]; + +} diff --git a/system/nixos/configuration.nix b/system/yukigekko/configuration.nix similarity index 97% rename from system/nixos/configuration.nix rename to system/yukigekko/configuration.nix index 2fa5371..db2fa84 100644 --- a/system/nixos/configuration.nix +++ b/system/yukigekko/configuration.nix @@ -69,15 +69,15 @@ # services.xserver.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.autumn = { + users.users.ruby= { isNormalUser = true; - description = "Autumn"; + description = "Autumn on laptop"; extraGroups = [ "networkmanager" "wheel" ]; }; # Install firefox. programs.firefox.enable = true; - programs.bash.interactiveShellInit = "fish"; + # programs.bash.interactiveShellInit = "fish"; programs.appimage.enable = true; programs.openvpn3.enable = true; diff --git a/system/nixos/flake.nix b/system/yukigekko/flake.nix similarity index 100% rename from system/nixos/flake.nix rename to system/yukigekko/flake.nix diff --git a/system/nixos/hardware-configuration.nix b/system/yukigekko/hardware-configuration.nix similarity index 100% rename from system/nixos/hardware-configuration.nix rename to system/yukigekko/hardware-configuration.nix From dcba024593e8ea87ce3200f810e5727a086d7b8f Mon Sep 17 00:00:00 2001 From: autumn Date: Mon, 25 Aug 2025 18:29:57 -0600 Subject: [PATCH 7/7] unfucked it --- flake.nix | 17 +++++++++-------- home-manager/ruby/home.nix | 7 ++----- system/yukigekko/configuration.nix | 4 ++-- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/flake.nix b/flake.nix index 0456df0..5d18e60 100644 --- a/flake.nix +++ b/flake.nix @@ -22,15 +22,16 @@ }; in { - homeConfigurations.ruby= home-manager.lib.homeManagerConfiguration { - extraSpecialArgs = specialArgs; - pkgs = nixpkgs.legacyPackages.${system}; - modules = [ + homeConfigurations.ruby= home-manager.lib.homeManagerConfiguration { + extraSpecialArgs = specialArgs; + pkgs = nixpkgs.legacyPackages.${system}; + modules = [ # ./home-manager/${user}/home.nix - ./home-manager/ruby/home.nix - ]; - }; - + ./home-manager/ruby/home.nix + ]; + }; + + nixosConfigurations."yukigekko" = nixpkgs.lib.nixosSystem{ specialArgs = specialArgs; modules = [ diff --git a/home-manager/ruby/home.nix b/home-manager/ruby/home.nix index b4292e2..1dfbcd0 100644 --- a/home-manager/ruby/home.nix +++ b/home-manager/ruby/home.nix @@ -3,8 +3,8 @@ { # Home Manager needs a bit of information about you and the paths it should # manage. - home.username = "autumn"; - home.homeDirectory = "/home/autumn"; + home.username = "ruby"; + home.homeDirectory = "/home/ruby"; home.stateVersion = "25.05"; # Please read the comment before changing. @@ -41,9 +41,6 @@ ]; programs.htop.enable = true; programs.starship.enable = true; - programs.bash.initExtra = " - fish - "; wayland.windowManager.river.enable = true; diff --git a/system/yukigekko/configuration.nix b/system/yukigekko/configuration.nix index db2fa84..509649f 100644 --- a/system/yukigekko/configuration.nix +++ b/system/yukigekko/configuration.nix @@ -71,13 +71,13 @@ # Define a user account. Don't forget to set a password with ‘passwd’. users.users.ruby= { isNormalUser = true; - description = "Autumn on laptop"; + description = "Ruby"; extraGroups = [ "networkmanager" "wheel" ]; }; # Install firefox. programs.firefox.enable = true; - # programs.bash.interactiveShellInit = "fish"; + programs.bash.interactiveShellInit = "fish"; programs.appimage.enable = true; programs.openvpn3.enable = true;