diff --git a/common/berkeley-mono.nix b/common/berkeley-mono.nix deleted file mode 100644 index 41bbbf5..0000000 --- a/common/berkeley-mono.nix +++ /dev/null @@ -1,24 +0,0 @@ -# make a derivation for berkeley-mono font installation -{ pkgs }: - -pkgs.stdenv.mkDerivation { - pname = "berkeley-mono"; - version = "1.009"; - - src = ../nix-secrets/resources/berkeley-mono/berkeley-mono-patched.zip; - - unpackPhase = '' - runHook preUnpack - ${pkgs.unzip}/bin/unzip $src - - runHook postUnpack - ''; - - installPhase = '' - runHook preInstall - - install -Dm644 berkeley-mono-patched/*.ttf -t $out/share/fonts/truetype - - runHook postInstall - ''; -} diff --git a/common/vscode.nix b/common/vscode.nix index cc7512e..6023c77 100755 --- a/common/vscode.nix +++ b/common/vscode.nix @@ -127,7 +127,7 @@ "editor.semanticHighlighting.enabled" = true; "workbench.colorTheme" = "Catppuccin Mocha"; "haskell.manageHLS" = "PATH"; - "editor.fontFamily" = "Berkeley Mono, DejaVu Sans Mono, monospace, Unifont"; + "editor.fontFamily" = "monospace"; "terminal.integrated.minimumContrastRatio" = 1; "terminal.integrated.shellIntegration.enabled" = false; "terminal.integrated.profiles.linux" = { diff --git a/gunther/configuration.nix b/gunther/configuration.nix index 7ea300d..887bf7d 100755 --- a/gunther/configuration.nix +++ b/gunther/configuration.nix @@ -3,7 +3,6 @@ # and in the NixOS manual (accessible by running ‘nixos-help’). { config, pkgs, lib, emacs-overlay, ... }: - { imports = [ # Include the results of the hardware scan. @@ -19,6 +18,9 @@ }; }; + # Docker + virtualisation.docker.enable = true; + services.emacs.package = pkgs.emacs29-pgtk; services.emacs.enable = true; @@ -119,7 +121,7 @@ users.users.leonv = { isNormalUser = true; description = "Leon Vatthauer"; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = [ "networkmanager" "wheel" "docker" ]; initialPassword = "leonv"; # just for setup }; @@ -164,7 +166,6 @@ ## disable logging when direnv changes DIRENV_LOG_FORMAT = []; }; - # fonts fonts = { packages = with pkgs; [ @@ -180,7 +181,7 @@ enableDefaultPackages = true; fontconfig = { defaultFonts = { - monospace = [ "Berkeley Mono Nerd Font" ]; + monospace = [ "BerkeleyMono Nerd Font Mono" ]; sansSerif = [ "NotoSans Nerd Font" ]; serif = [ "NotoSans Nerd Font" ]; emoji = [ "Noto Color Emoji" ]; diff --git a/nix-secrets b/nix-secrets index 5300eb9..746bcd6 160000 --- a/nix-secrets +++ b/nix-secrets @@ -1 +1 @@ -Subproject commit 5300eb9253d6de59fdf53111912bfe66f36dd7c6 +Subproject commit 746bcd68837fcf66650f415f33d1f1bc0339228a