pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Switch to zsh, use specialArgs to pass shell name around to update everywhere at the same time

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-07-19 08:55:53 +01:00
parent 865e47f0ce
commit a317ac6f05
3 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
flake.nix
View file

@ -23,17 +23,19 @@
nixpkgs, nixpkgs,
home-manager, home-manager,
... ...
} @ inputs: { } @ inputs: let
shell = "zsh";
in {
nixosConfigurations = let nixosConfigurations = let
userConfig = { userConfig = {
isNormalUser = true; isNormalUser = true;
description = "Evie Litherland-Smith"; description = "Evie Litherland-Smith";
group = "users"; group = "users";
extraGroups = ["networkmanager" "wheel" "video"]; extraGroups = ["networkmanager" "wheel" "video"];
shell = pkgs.fish; shell = pkgs.${shell};
openssh.authorizedKeys.keys = import ./auth/authorized_keys.nix; openssh.authorizedKeys.keys = import ./auth/authorized_keys.nix;
}; };
specialArgs = {inherit inputs userConfig;}; specialArgs = {inherit inputs shell userConfig;};
waybar-experimental-overlay = final: prev: { waybar-experimental-overlay = final: prev: {
waybar = prev.waybar.overrideAttrs (oldAttrs: { waybar = prev.waybar.overrideAttrs (oldAttrs: {
mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"]; mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"];
@ -72,7 +74,10 @@
}; };
}; };
homeConfigurations = let homeConfigurations = let
extraSpecialArgs = {inherit inputs;}; extraSpecialArgs = {
inherit inputs;
shellConfig = ./home/shell/${shell}.nix;
};
in { in {
# NixOS home configurations # NixOS home configurations
"xenia@Vanguard" = let "xenia@Vanguard" = let

8
hosts/Ronin/home.nix
View file

@ -1,9 +1,13 @@
{pkgs, ...}: let {
pkgs,
shellConfig,
...
}: let
username = "elitherl"; username = "elitherl";
homeDirectory = "/home/${username}"; homeDirectory = "/home/${username}";
in { in {
imports = [ imports = [
../../home/shell/fish.nix shellConfig
../../home/git/work.nix ../../home/git/work.nix
../../home/ssh/work.nix ../../home/ssh/work.nix
../../home/tui ../../home/tui

10
hosts/common.nix
View file

@ -1,4 +1,8 @@
{pkgs, ...}: let {
pkgs,
shell,
...
}: let
flakeURL = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main"; flakeURL = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main";
in { in {
nix = { nix = {
@ -21,7 +25,7 @@ in {
localBinInPath = true; localBinInPath = true;
shellAliases = { shellAliases = {
ll = "ls -laF"; ll = "ls -laF";
gg = "gitui"; gg = "${pkgs.gitui}/bin/gitui";
nosu = "sudo nixos-rebuild switch --flake ${flakeURL}"; nosu = "sudo nixos-rebuild switch --flake ${flakeURL}";
hms = "${pkgs.home-manager}/bin/home-manager switch --flake ${flakeURL}"; hms = "${pkgs.home-manager}/bin/home-manager switch --flake ${flakeURL}";
}; };
@ -31,9 +35,9 @@ in {
services.power-profiles-daemon.enable = true; services.power-profiles-daemon.enable = true;
virtualisation.podman.enable = true; virtualisation.podman.enable = true;
programs = { programs = {
${shell}.enable = true;
ssh.startAgent = true; ssh.startAgent = true;
dconf.enable = true; dconf.enable = true;
fish.enable = true;
}; };
fonts = { fonts = {
fonts = with pkgs; [ fonts = with pkgs; [