Compare commits

..

No commits in common. "ee8d39034d4f0b35edd2db2a70a2f2e3d2fe7d12" and "c1ebfbd5cb8e425ecf33e5d03fdd8dbc864e8b86" have entirely different histories.

3 changed files with 6 additions and 7 deletions

View file

@ -127,7 +127,7 @@
"editor.semanticHighlighting.enabled" = true; "editor.semanticHighlighting.enabled" = true;
"workbench.colorTheme" = "Catppuccin Mocha"; "workbench.colorTheme" = "Catppuccin Mocha";
"haskell.manageHLS" = "PATH"; "haskell.manageHLS" = "PATH";
"editor.fontFamily" = "monospace"; "editor.fontFamily" = "Berkeley Mono, DejaVu Sans Mono, monospace, Unifont";
"terminal.integrated.minimumContrastRatio" = 1; "terminal.integrated.minimumContrastRatio" = 1;
"terminal.integrated.shellIntegration.enabled" = false; "terminal.integrated.shellIntegration.enabled" = false;
"terminal.integrated.profiles.linux" = { "terminal.integrated.profiles.linux" = {

View file

@ -3,6 +3,7 @@
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, lib, emacs-overlay, ... }: { config, pkgs, lib, emacs-overlay, ... }:
{ {
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
@ -18,9 +19,6 @@
}; };
}; };
# Docker
virtualisation.docker.enable = true;
services.emacs.package = pkgs.emacs29-pgtk; services.emacs.package = pkgs.emacs29-pgtk;
services.emacs.enable = true; services.emacs.enable = true;
@ -121,7 +119,7 @@
users.users.leonv = { users.users.leonv = {
isNormalUser = true; isNormalUser = true;
description = "Leon Vatthauer"; description = "Leon Vatthauer";
extraGroups = [ "networkmanager" "wheel" "docker" ]; extraGroups = [ "networkmanager" "wheel" ];
initialPassword = "leonv"; # just for setup initialPassword = "leonv"; # just for setup
}; };
@ -166,6 +164,7 @@
## disable logging when direnv changes ## disable logging when direnv changes
DIRENV_LOG_FORMAT = []; DIRENV_LOG_FORMAT = [];
}; };
# fonts # fonts
fonts = { fonts = {
packages = with pkgs; [ packages = with pkgs; [
@ -181,7 +180,7 @@
enableDefaultPackages = true; enableDefaultPackages = true;
fontconfig = { fontconfig = {
defaultFonts = { defaultFonts = {
monospace = [ "BerkeleyMono Nerd Font Mono" ]; monospace = [ "Berkeley Mono Nerd Font" ];
sansSerif = [ "NotoSans Nerd Font" ]; sansSerif = [ "NotoSans Nerd Font" ];
serif = [ "NotoSans Nerd Font" ]; serif = [ "NotoSans Nerd Font" ];
emoji = [ "Noto Color Emoji" ]; emoji = [ "Noto Color Emoji" ];

@ -1 +1 @@
Subproject commit 746bcd68837fcf66650f415f33d1f1bc0339228a Subproject commit 5300eb9253d6de59fdf53111912bfe66f36dd7c6