refresh mac install

nixos/boxes/form3/default.nix

@@ -1,21 +1,14 @@
-{
+{ config, pkgs, inputs, lib, nixpkgs-nixos-unstable-and-unfree, ... }:
-  config,
+let
-  pkgs,
-  inputs,
-  lib,
-  nixpkgs-nixos-unstable-and-unfree,
-  ...
-}: let
   system_cert_bundle_path = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
   form3_cert_path = ./form3-palo-alto.pem;
-  form3_cert_bundle =
+  form3_cert_bundle = builtins.toFile "form3-cert-bundle.crt"
-    builtins.toFile "form3-cert-bundle.crt"
     (builtins.readFile system_cert_bundle_path
       + builtins.readFile form3_cert_path);
 in {
-  environment.systemPackages = with pkgs; [vim nixfmt];
+  environment.systemPackages = with pkgs; [ vim nixfmt ];
 
-  imports = [../../git ../../mercurial];
+  imports = [ ../../git ../../mercurial ];
   services.nix-daemon.enable = true;
   nix = {
     useDaemon = true;
@@ -27,14 +20,8 @@ in {
   };
 
   fonts.fontDir.enable = true;
-  fonts.fonts = with pkgs; [
-    (runCommand "berkeley-fonts" {} ''
-      mkdir -vp "$out/share/fonts/opentype"
-      mkdir -vp "$out/share/fonts/truetype"
-      ${pkgs.unzip}/bin/unzip ${../../fonts.zip} \*.otf -d $out/share/fonts/opentype
-      ${pkgs.unzip}/bin/unzip ${../../fonts.zip} \*.ttf -d $out/share/fonts/truetype
 
-    '')
+  fonts.fonts = with pkgs; [
     nerdfonts
     fira-code
     font-awesome
@@ -43,7 +30,7 @@ in {
     source-code-pro
     weather-icons
   ];
-  security.pki.certificateFiles = [form3_cert_path system_cert_bundle_path];
+  security.pki.certificateFiles = [ form3_cert_path system_cert_bundle_path ];
   environment.variables = {
     SSL_CERT_FILE = form3_cert_bundle;
     NIX_SSL_CERT_FILE = form3_cert_bundle;
@@ -54,13 +41,15 @@ in {
 
   system.stateVersion = 4;
 
-  home-manager.users.cyryl = {...}: {
+  home-manager.users.cyryl = { ... }: {
-    imports = [];
+    imports = [ ];
-    home.packages = with pkgs; [awscli kubectl cargo-update];
+    home.packages = with pkgs; [ awscli kubectl cargo-update ];
     programs.git.userEmail = lib.mkForce "cyryl.plotnicki@form3.tech";
-    programs.git.extraConfig.user.signingkey = "6441B1BC81F8FB1561C9AFF5534222210FE423ED";
+    programs.git.extraConfig = {
-    programs.git.extraConfig.commit.gpgsign = true;
+      user.signingkey = "6441B1BC81F8FB1561C9AFF5534222210FE423ED";
-    programs.git.extraConfig."url \"git@github.com:\"".insteadOf = "https://github.com/";
+      commit.gpgsign = true;
+      "url \"git@github.com:\"".insteadOf = "https://github.com/";
+    };
     programs.gpg.enable = true;
     programs.gpg.homedir = "/Users/cyryl/.gnupg";
     programs.zsh.loginExtra = ''

nixos/home-manager/cli.nix

@@ -7,10 +7,8 @@
       ext.pass-audit
       ext.pass-update
     ]))
-    inputs.alejandra.packages.${system}.default
     age
     android-tools
-    appimage-run
     aria
     bc
     bfg-repo-cleaner
@@ -29,14 +27,11 @@
     genpass
     git
     gitRepo
-    hsetroot
     htop
     imagemagick
     jmtpfs
     jpeginfo
     jq
-    kopia
-    minicom
     nix-du
     nix-index
     nix-top
@@ -44,10 +39,6 @@
     nixpkgs-fmt
     nmap
     nvd
-    par2cmdline
-    pciutils
-    ranger
-    restic
     ripgrep-all
     rustup
     sops
@@ -56,7 +47,6 @@
     unzip
     wget
     whois
-    woeusb
     inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".youtube-dl
   ];
 }

nixos/home-manager/default.nix

@@ -1,10 +1,5 @@
-{
+{ config, pkgs, inputs, lib, ... }:
-  config,
+let username = "cyryl";
-  pkgs,
-  inputs,
-  ...
-}: let
-  username = "cyryl";
 in {
   home.sessionVariables = {
     LC_ALL = "en_GB.UTF-8";
@@ -14,11 +9,11 @@ in {
 
   news.display = "show";
 
-  home.packages = with pkgs; [];
+  home.packages = with pkgs; [ ];
 
   home.username = username;
-  home.homeDirectory = "/home/${username}";
+  home.homeDirectory = lib.mkDefault "/home/${username}";
-  home.stateVersion = "22.05";
+  home.stateVersion = "22.11";
   programs.home-manager.enable = true;
 
   imports = [
@@ -28,7 +23,6 @@ in {
 
     ./programs.nix
     ./programs/emacs/home.nix
-    ./programs/helix.nix
     ./programs/newsboat.nix
     ./programs/ssh.nix
     ./programs/tmux.nix

nixos/home-manager/linux.nix

@@ -1,22 +1,24 @@
-{
+{ config, pkgs, inputs, ... }: {
-  config,
-  pkgs,
-  inputs,
-  ...
-}: {
   services.gpg-agent = {
     enable = true;
     pinentryFlavor = "curses";
   };
   home.packages = with pkgs; [
+    appimage-run
     atop
     btop
     btrfs-progs
     glibcLocales
+    hsetroot
     lm_sensors
+    minicom
     nerdfonts
+    pciutils
     powertop
+    ranger
+    restic
     topgrade
     wirelesstools
+    woeusb
   ];
 }