Update NixOS to 23.11
This commit is contained in:
parent
83fd9a8ea6
commit
eea9e47197
8 changed files with 59 additions and 52 deletions
|
|
@ -7,7 +7,7 @@ in {
|
|||
config = mkIf config.services.xserver.enable {
|
||||
|
||||
fonts = {
|
||||
fonts = with pkgs.unstable; [
|
||||
packages = with pkgs.unstable; [
|
||||
corefonts # Microsoft free fonts
|
||||
(nerdfonts.override { fonts = [ "Meslo" "NerdFontsSymbolsOnly" ]; })
|
||||
];
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ in {
|
|||
};
|
||||
enableCompletion = true;
|
||||
enableAutosuggestions = true;
|
||||
enableSyntaxHighlighting = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
initExtra = ''
|
||||
autoload -Uz up-line-or-beginning-search down-line-or-beginning-search
|
||||
zle -N up-line-or-beginning-search
|
||||
|
|
|
|||
|
|
@ -2,7 +2,16 @@
|
|||
|
||||
with lib;
|
||||
with lib.my;
|
||||
let cfg = config.modules.editor.emacs;
|
||||
let
|
||||
cfg = config.modules.editor.emacs;
|
||||
myEmacs = pkgs.unstable.emacs29.override {
|
||||
withNativeCompilation = true;
|
||||
withSQLite3 = true;
|
||||
withTreeSitter = true;
|
||||
withWebP = true;
|
||||
};
|
||||
myEmacsWithPackages = myEmacs.pkgs.withPackages
|
||||
(epkgs: with epkgs; [ vterm pdf-tools treesit-grammars.with-all-grammars ]);
|
||||
in {
|
||||
options.modules.editor.emacs = { enable = mkBoolOpt false; };
|
||||
|
||||
|
|
@ -23,7 +32,7 @@ in {
|
|||
cmake
|
||||
nodejs
|
||||
|
||||
terraform
|
||||
opentofu
|
||||
pandoc
|
||||
|
||||
# Formatters and linters
|
||||
|
|
@ -68,17 +77,13 @@ in {
|
|||
services.emacs = {
|
||||
enable = true;
|
||||
client.enable = true;
|
||||
package = with pkgs;
|
||||
((emacsPackagesFor emacsNativeComp).emacsWithPackages
|
||||
(epkgs: [ epkgs.vterm ]));
|
||||
package = myEmacsWithPackages;
|
||||
};
|
||||
|
||||
# Use either this or nix-doom-emacs
|
||||
programs.emacs = {
|
||||
enable = true;
|
||||
package = with pkgs;
|
||||
((emacsPackagesFor emacsNativeComp).emacsWithPackages
|
||||
(epkgs: [ epkgs.vterm ]));
|
||||
package = myEmacs;
|
||||
};
|
||||
xdg.configFile = { "doom" = { source = ./doom.d; }; };
|
||||
home.sessionPath = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ in {
|
|||
|
||||
config = {
|
||||
user.packages = with pkgs; [
|
||||
(mkIf cfg.psx.enable epsxe)
|
||||
(mkIf cfg.psx.enable duckstation)
|
||||
(mkIf cfg.ds.enable desmume)
|
||||
(mkIf cfg.gc.enable dolphinEmu)
|
||||
(mkIf (cfg.gba.enable || cfg.gb.enable || cfg.snes.enable) higan)
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ in {
|
|||
user.packages = with pkgs; [
|
||||
(mkIf cfg.steam.enable steam)
|
||||
(mkIf cfg.lutris.enable lutris)
|
||||
(mkIf cfg.lutris.enable wine)
|
||||
(mkIf (cfg.steam.enable || cfg.lutris.enable) protontricks)
|
||||
];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ in {
|
|||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
||||
config.common.default = "*";
|
||||
};
|
||||
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue