summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/basic.nix2
-rw-r--r--modules/desktop-environment.nix2
-rw-r--r--modules/emacs/default.nix2
-rw-r--r--modules/fonts.nix3
4 files changed, 5 insertions, 4 deletions
diff --git a/modules/basic.nix b/modules/basic.nix
index 71404a8..7698c7a 100644
--- a/modules/basic.nix
+++ b/modules/basic.nix
@@ -6,7 +6,7 @@
};
config = mkIf config.santi-modules.basic.enable {
nix = {
- package = pkgs.lib.mkForce pkgs.nixVersions.nix_2_20;
+ package = pkgs.lib.mkForce pkgs.nixVersions.nix_2_25;
settings = {
trusted-users = [ "root" "leonardo" ];
auto-optimise-store = true;
diff --git a/modules/desktop-environment.nix b/modules/desktop-environment.nix
index 14dd7d6..8df3ea8 100644
--- a/modules/desktop-environment.nix
+++ b/modules/desktop-environment.nix
@@ -13,7 +13,7 @@
};
services.printing.enable = false; # disabled until CUPS CVE is fixed
- hardware.pulseaudio.enable = false;
+ services.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix
index 37b8951..9081014 100644
--- a/modules/emacs/default.nix
+++ b/modules/emacs/default.nix
@@ -47,7 +47,7 @@ in with lib; {
emacs
] ++ outside-emacs;
fonts.packages = with pkgs; [
- (nerdfonts.override { fonts = ["Iosevka"]; })
+ nerd-fonts.iosevka
];
};
}
diff --git a/modules/fonts.nix b/modules/fonts.nix
index 286f670..f1cad22 100644
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@@ -14,7 +14,8 @@
};
};
packages = with pkgs; [
- (nerdfonts.override { fonts = [ "Iosevka" "FiraCode" ]; })
+ nerd-fonts.iosevka
+ nerd-fonts.fira-code
ipafont
kochi-substitute
dejavu_fonts