23.05 -> 23.11

This commit is contained in:
Sean Buckley 2023-11-27 15:21:55 -05:00
parent ad204ccf2e
commit edc0d2fb9b
5 changed files with 11 additions and 24 deletions

View file

@ -25,8 +25,8 @@ in
]; ];
users.mutableUsers = false; users.mutableUsers = false;
users.users.sean.passwordFile = "${persist}/shadow_sean"; users.users.sean.hashedPasswordFile = "${persist}/shadow_sean";
users.users.root.passwordFile = "${persist}/shadow_sean"; users.users.root.hashedPasswordFile = "${persist}/shadow_sean";
boot = { boot = {
loader.systemd-boot.enable = true; loader.systemd-boot.enable = true;

View file

@ -48,8 +48,8 @@ in
}; };
users.mutableUsers = false; users.mutableUsers = false;
users.users.sean.passwordFile = "${persist}/shadow_sean"; users.users.sean.hashedPasswordFile = "${persist}/shadow_sean";
users.users.root.passwordFile = "${persist}/shadow_sean"; users.users.root.hashedPasswordFile = "${persist}/shadow_sean";
services.zfs.trim.interval = "03:05"; services.zfs.trim.interval = "03:05";

View file

@ -37,7 +37,7 @@ with lib;
MOUSE_DPI=600@1000 MOUSE_DPI=600@1000
''; '';
fonts.fonts = [ fonts.packages = [
(pkgs.nerdfonts.override { fonts = [ "DejaVuSansMono" ]; }) (pkgs.nerdfonts.override { fonts = [ "DejaVuSansMono" ]; })
]; ];

View file

@ -3,9 +3,14 @@
environment.variables.EDITOR = "vim"; environment.variables.EDITOR = "vim";
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
lunarvim
nodePackages.prettier nodePackages.prettier
(lunarvim.override (_: {
viAlias = true;
vimAlias = true;
globalConfig = builtins.readFile ./init.lua;
}))
(writeShellScriptBin "black" '' (writeShellScriptBin "black" ''
exec ${pkgs.python3.pkgs.black}/bin/black "$@" exec ${pkgs.python3.pkgs.black}/bin/black "$@"
'') '')

View file

@ -1,18 +0,0 @@
#
# https://github.com/NixOS/nixpkgs/pull/261103
#
{ pkgs }:
(
pkgs.callPackage
(pkgs.fetchurl {
url = "https://raw.githubusercontent.com/NixOS/nixpkgs/99dadc5f534b7ba85582c8ee492599585069d20e/pkgs/by-name/lu/lunarvim/package.nix";
sha256 = "211d9cf8d5d352d220785ba90c7800d588c34e6e1c4a3dcbf02013d1fa49977c";
})
{ }
).override (_: {
viAlias = true;
vimAlias = true;
globalConfig = builtins.readFile ../modules/vim/init.lua;
})