diff --git a/hosts/nixos/default.nix b/hosts/nixos/default.nix index 8e7434f..3fdd620 100644 --- a/hosts/nixos/default.nix +++ b/hosts/nixos/default.nix @@ -1,7 +1,15 @@ -{ config, inputs, pkgs, agenix, ... }: +{ + config, + inputs, + pkgs, + agenix, + ... +}: -let user = "olaf"; - keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOk8iAnIaa1deoc7jw8YACPNVka1ZFJxhnU4G74TmS+p" ]; in +let + user = "olaf"; + keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOk8iAnIaa1deoc7jw8YACPNVka1ZFJxhnU4G74TmS+p" ]; +in { imports = [ ../../modules/nixos/secrets.nix @@ -19,7 +27,14 @@ let user = "olaf"; }; efi.canTouchEfiVariables = true; }; - initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "nvme" + "usbhid" + "usb_storage" + "sd_mod" + ]; # Uncomment for AMD GPU # initrd.kernelModules = [ "amdgpu" ]; kernelPackages = pkgs.linuxPackages_latest; @@ -42,8 +57,14 @@ let user = "olaf"; nixPath = [ "nixos-config=/home/${user}/.local/share/src/nixos-config:/etc/nixos" ]; settings = { allowed-users = [ "${user}" ]; - trusted-users = [ "@admin" "${user}" ]; - substituters = [ "https://nix-community.cachix.org" "https://cache.nixos.org" ]; + trusted-users = [ + "@admin" + "${user}" + ]; + substituters = [ + "https://nix-community.cachix.org" + "https://cache.nixos.org" + ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; }; @@ -120,7 +141,7 @@ let user = "olaf"; overrideDevices = true; settings = { - devices = {}; + devices = { }; options.globalAnnounceEnabled = false; # Only sync on LAN }; }; @@ -154,8 +175,8 @@ let user = "olaf"; "class_g = 'i3lock'" ]; round-borders = 3; - round-borders-exclude = []; - round-borders-rule = []; + round-borders-exclude = [ ]; + round-borders-rule = [ ]; shadow = true; shadow-radius = 8; shadow-opacity = 0.4; @@ -206,12 +227,29 @@ let user = "olaf"; log-level = "info"; wintypes = { - normal = { fade = true; shadow = false; }; - tooltip = { fade = true; shadow = false; opacity = 0.75; focus = true; full-shadow = false; }; - dock = { shadow = false; }; - dnd = { shadow = false; }; - popup_menu = { opacity = 1.0; }; - dropdown_menu = { opacity = 1.0; }; + normal = { + fade = true; + shadow = false; + }; + tooltip = { + fade = true; + shadow = false; + opacity = 0.75; + focus = true; + full-shadow = false; + }; + dock = { + shadow = false; + }; + dnd = { + shadow = false; + }; + popup_menu = { + opacity = 1.0; + }; + dropdown_menu = { + opacity = 1.0; + }; }; }; }; @@ -251,8 +289,7 @@ let user = "olaf"; ledger.enable = true; }; - - # Add docker daemon + # Add docker daemon virtualisation.docker.enable = true; virtualisation.docker.logDriver = "json-file"; @@ -276,15 +313,17 @@ let user = "olaf"; # Don't require password for users in `wheel` group for these commands security.sudo = { enable = true; - extraRules = [{ - commands = [ - { - command = "${pkgs.systemd}/bin/reboot"; - options = [ "NOPASSWD" ]; - } - ]; - groups = [ "wheel" ]; - }]; + extraRules = [ + { + commands = [ + { + command = "${pkgs.systemd}/bin/reboot"; + options = [ "NOPASSWD" ]; + } + ]; + groups = [ "wheel" ]; + } + ]; }; fonts.packages = with pkgs; [ @@ -303,6 +342,5 @@ let user = "olaf"; inetutils ]; - system.stateVersion = "21.05"; # Don't change this } diff --git a/modules/darwin/packages.nix b/modules/darwin/packages.nix index 290dfe7..75a98a5 100644 --- a/modules/darwin/packages.nix +++ b/modules/darwin/packages.nix @@ -8,4 +8,5 @@ shared-packages ++ [ dockutil mas + ] diff --git a/modules/shared/home-manager.nix b/modules/shared/home-manager.nix index 1bb3665..1c3f182 100644 --- a/modules/shared/home-manager.nix +++ b/modules/shared/home-manager.nix @@ -37,7 +37,7 @@ in export PATH=$HOME/.pnpm-packages/bin:$HOME/.pnpm-packages:$PATH export PATH=$HOME/.npm-packages/bin:$HOME/bin:$PATH export PATH=$HOME/.local/share/bin:$PATH - + export PATH=$HOME/.cargo/bin:$PATH # Remove history data we don't want to see export HISTIGNORE="pwd:ls:cd" diff --git a/modules/shared/packages.nix b/modules/shared/packages.nix index 2c5549a..0134be6 100644 --- a/modules/shared/packages.nix +++ b/modules/shared/packages.nix @@ -20,6 +20,7 @@ with pkgs; zip htop ncdu + mtr nixfmt-rfc-style # Encryption and security tools @@ -59,7 +60,7 @@ with pkgs; tmux unrar unzip - zsh-powerlevel10k + # zsh-powerlevel10k # Python packages python3 @@ -85,6 +86,14 @@ with pkgs; tikzfill makecell bibunits + lualatex-math + selnolig + titling + upquote + microtype + footnotehyper + parskip + xurl ; })