Merge remote-tracking branch 'origin/nixos' into nixos
This commit is contained in:
commit
afff6e300a
|
@ -33,6 +33,12 @@
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
userName = "Evie Litherland-Smith";
|
userName = "Evie Litherland-Smith";
|
||||||
|
delta.enable = true;
|
||||||
|
extraConfig = {
|
||||||
|
pull = {
|
||||||
|
rebase = false;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
programs.starship = {
|
programs.starship = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -10,5 +10,6 @@
|
||||||
(nerdfonts.override { fonts = [ "FiraCode" ]; })
|
(nerdfonts.override { fonts = [ "FiraCode" ]; })
|
||||||
file
|
file
|
||||||
silver-searcher
|
silver-searcher
|
||||||
|
bat
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,8 +37,12 @@
|
||||||
# Set up home manager for user
|
# Set up home manager for user
|
||||||
home-manager.users.xenia = import ./home-manager/vanguard-xenia.nix;
|
home-manager.users.xenia = import ./home-manager/vanguard-xenia.nix;
|
||||||
|
|
||||||
|
# Extra hardware configuration
|
||||||
# For Steam support
|
# For Steam support
|
||||||
hardware.opengl.driSupport32Bit = true;
|
hardware.opengl.driSupport32Bit = true;
|
||||||
|
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
|
hardware.openrazer = {
|
||||||
|
enable = true;
|
||||||
|
users = [ "xenia" ];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue