.envrc

@@ -1 +0,0 @@
-use flake

.gitignore

@@ -1,6 +1,4 @@
 result
 result-*
 *.secret.*
-.nvimlog
+.nvimlog
-.pre-commit-config.yaml
-.direnv/

darwin/bootstrap.nix

@@ -10,7 +10,6 @@
       "https://nix-community.cachix.org"
       "https://mat.cachix.org"
       "https://helix.cachix.org"
-      "https://pre-commit-hooks.cachix.org"
     ];
     trusted-public-keys = [
       "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
@@ -18,7 +17,6 @@
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       "mat.cachix.org-1:AHqv9SoBEPKlJX2DDZQnjaMcvBAgpH1j8rw5USYDZno="
       "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
-      "pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc="
     ];
     trusted-users = [
       "@admin"

darwin/defaults.nix

@@ -1,3 +1,5 @@
+{ ... }:
+
 {
   system.defaults.NSGlobalDomain = {
     AppleInterfaceStyleSwitchesAutomatically = true;

darwin/general.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   environment.systemPackages = [ pkgs.terminal-notifier ];
@@ -6,17 +6,13 @@
   # Fonts
   fonts.fontDir.enable = true;
   fonts.fonts = with pkgs; [
-    borg-sans-mono
-    inter
     recursive
     (nerdfonts.override {
-      enableWindowsFonts = false;
       fonts = [
-        "CascadiaCode"
+        "FantasqueSansMono"
-        "iA-Writer"
+        "JetBrainsMono"
-        "Inconsolata"
         "FiraCode"
-        "Lilex"
+        "SourceCodePro"
       ];
     })
   ];

darwin/homebrew.nix

@@ -46,14 +46,12 @@
     "aerial"
     "alfred"
     "bartender"
-    "bbedit"
     # "discord"
     # "element"
     "firefox"
     "jitsi-meet"
     "knockknock"
     # "lagrange"
-    "lapce"
     "logi-options-plus"
     "lulu"
     "macsvg"

flake.lock

@@ -321,22 +321,6 @@
         "type": "github"
       }
     },
-    "kitty-rose-pine": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1661351382,
-        "narHash": "sha256-idqwpNC6hWIz5KtEGqL5C+KcUcKc9iPCstP5FQcZZ0I=",
-        "owner": "rose-pine",
-        "repo": "kitty",
-        "rev": "4dd9bbe6f838e61f0ef7e9ab9625adda34e129ef",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rose-pine",
-        "repo": "kitty",
-        "type": "github"
-      }
-    },
     "nci": {
       "inputs": {
         "devshell": "devshell",
@@ -412,42 +396,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1667292599,
-        "narHash": "sha256-7ISOUI1aj6UKMPIL+wwthENL22L3+A9V+jS8Is3QsRo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ef2f213d9659a274985778bff4ca322f3ef3ac68",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "pre-commit": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1668973924,
-        "narHash": "sha256-17VnhpKJRoYdt23SJcUUCi/qEt9d3OyFsz9YRYStrew=",
-        "owner": "cpcloud",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "7ee855668b78b9d7d1b504121c5b146c67a2abd8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cpcloud",
-        "ref": "dot-git-dir",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "dark-mode-notify-src": "dark-mode-notify-src",
@@ -460,11 +408,9 @@
         "home-manager-atemu": "home-manager-atemu",
         "homebrew-enabled": "homebrew-enabled",
         "kitty-icon": "kitty-icon",
-        "kitty-rose-pine": "kitty-rose-pine",
         "nixpkgs": "nixpkgs",
         "nixpkgs-master": "nixpkgs-master",
-        "nixpkgs-unstable": "nixpkgs-unstable",
+        "nixpkgs-unstable": "nixpkgs-unstable"
-        "pre-commit": "pre-commit"
       }
     },
     "rust-overlay": {

flake.nix

@@ -26,11 +26,6 @@
     home-manager-atemu.url = "github:Atemu/home-manager/darwin-copy-apps-fully-wip";
     home-manager-atemu.inputs.nixpkgs.follows = "nixpkgs-unstable";
 
-    # pre-commit and hooks
-    # pre-commit.url = "github:cachix/pre-commit-hooks.nix";
-    pre-commit.url = "github:cpcloud/pre-commit-hooks.nix/dot-git-dir";
-    pre-commit.inputs.flake-utils.follows = "flake-utils";
-
     # Extra sources
     helix.url = "github:helix-editor/helix";
     helix.inputs.nixpkgs.follows = "nixpkgs-unstable";
@@ -38,13 +33,11 @@
     dark-mode-notify-src.flake = false;
     kitty-icon.url = "github:DinkDonk/kitty-icon";
     kitty-icon.flake = false;
-    kitty-rose-pine.url = "github:rose-pine/kitty";
-    kitty-rose-pine.flake = false;
     fisher-src.url = "github:jorgebucaran/fisher";
     fisher-src.flake = false;
   };
 
-  outputs = { self, darwin, home-manager, flake-utils, pre-commit, ... }@inputs:
+  outputs = { self, darwin, home-manager, flake-utils, ... }@inputs:
     let
 
       inherit (darwin.lib) darwinSystem;
@@ -57,16 +50,16 @@
       nixpkgsConfig = {
         config = { allowUnfree = true; };
         overlays = attrValues self.overlays ++ [
-          (final: _prev:
+          (final: prev:
             import ./pkgs {
               inherit inputs;
               inherit (final) callPackage;
               inherit (final.stdenv) system;
             })
-          (_final: prev: optionalAttrs (prev.stdenv.system == "aarch64-darwin")
+          (final: prev: optionalAttrs (prev.stdenv.system == "aarch64-darwin")
             {
               # Sub in x86 version of packages that don't build on Apple Silicon yet
-              # inherit (final.pkgs-x86);
+              inherit (final.pkgs-x86);
             })
         ];
       };
@@ -92,7 +85,7 @@
         # `home-manager` module
         home-manager.darwinModules.home-manager
         (
-          { config, ... }:
+          { config, lib, pkgs, ... }:
           let
             inherit (config.users) primaryUser;
           in
@@ -202,7 +195,7 @@
 
       # Build and activate on new system with:
       # `nix build .#homeConfigurations.<name>.activationPackage; ./result/activate`
-      homeConfigurations = {
+      homeConfigurations = rec {
         cloudVM = home-manager.lib.homeManagerConfiguration {
           pkgs = import inputs.nixpkgs-unstable {
             system = "x86_64-linux";
@@ -225,21 +218,21 @@
 
       overlays = {
         # nixpkgs overlays
-        pkgs-stable = _final: prev: {
+        pkgs-stable = final: prev: {
           pkgs-stable = import inputs.nixpkgs {
             inherit (prev.stdenv) system;
             inherit (nixpkgsConfig) config;
           };
         };
 
-        pkgs-unstable = _final: prev: {
+        pkgs-unstable = final: prev: {
           pkgs-unstable = import inputs.nixpkgs-unstable {
             inherit (prev.stdenv) system;
             inherit (nixpkgsConfig) config;
           };
         };
 
-        pkgs-master = _final: prev: {
+        pkgs-master = final: prev: {
           pkgs-master = import inputs.nixpkgs-master {
             inherit (prev.stdenv) system;
             inherit (nixpkgsConfig) config;
@@ -249,7 +242,7 @@
         colors = import ./overlays/colors.nix;
 
         # Overlay useful on Macs with Apple Silicon
-        apple-silicon = _final: prev: optionalAttrs (prev.stdenv.system == "aarch64-darwin") {
+        apple-silicon = final: prev: optionalAttrs (prev.stdenv.system == "aarch64-darwin") {
           # Add access to x86 packages system is running Apple Silicon
           pkgs-x86 = import inputs.nixpkgs-unstable {
             system = "x86_64-darwin";
@@ -257,8 +250,8 @@
           };
         };
 
-        patched = _final: prev: optionalAttrs prev.stdenv.isDarwin {
+        patched = final: prev: optionalAttrs prev.stdenv.isDarwin {
-          inherit (inputs) kitty-icon kitty-rose-pine fisher-src;
+          inherit (inputs) kitty-icon fisher-src;
           lib = prev.lib // { homebrew-enabled = inputs.homebrew-enabled.value; };
         };
       };
@@ -305,33 +298,17 @@
         };
       };
 
-    } // flake-utils.lib.eachDefaultSystem (system:
+    } // flake-utils.lib.eachDefaultSystem (system: {
-      let
+      legacyPackages = import inputs.nixpkgs-unstable {
-        pkgs = import inputs.nixpkgs-unstable {
+        inherit system;
-          inherit system;
+        inherit (nixpkgsConfig) config;
-          inherit (nixpkgsConfig) config;
+        overlays = with self.overlays; [
-          overlays = with self.overlays; [
+          pkgs-master
-            pkgs-master
+          pkgs-stable
-            pkgs-stable
+          colors
-            colors
+          apple-silicon
-            apple-silicon
+          patched
-            patched
+        ];
-          ];
+      };
-        };
+    });
-      in
-      {
-        legacyPackages = pkgs;
-
-        checks.pre-commit = pre-commit.lib.${system}.run {
-          src = ./.;
-          hooks = {
-            deadnix.enable = true;
-            nix-linter.enable = true;
-            nixpkgs-fmt.enable = true;
-            statix.enable = true;
-          };
-        };
-
-        devShells.default = pkgs.mkShell { inherit (self.checks.${system}.pre-commit) shellHook; };
-      });
 }

home/fish.nix

@@ -204,7 +204,7 @@
       # Other
       ".." = "cd ..";
       ":q" = "exit";
-      cat = "${bat}/bin/bat --style=plain --paging=never";
+      cat = "${bat}/bin/bat --style=plain";
       du = "${du-dust}/bin/dust";
       g = "${gitAndTools.git}/bin/git";
       ls = "${exa}/bin/exa";

home/git.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   # Git

home/kitty.nix

@@ -1,6 +1,7 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 # Let-In --------------------------------------------------------------------------------------- {{{
 let
+  inherit (lib) mkIf;
   colorsToKitty = colors: with colors; {
     inherit
       background
@@ -32,7 +33,6 @@ let
     color15 = white;
     url_color = brightgreen;
   };
-  font = "CaskaydiaCove Nerd Font";
 in
 # }}}
 {
@@ -44,7 +44,7 @@ in
   # General config ----------------------------------------------------------------------------- {{{
 
   programs.kitty.settings = {
-    font_family = font;
+    font_family = "FiraCode Nerd Font";
     font_size = "14.0";
     adjust_line_height = "120%";
     disable_ligatures = "cursor"; # disable ligatures when cursor is on them
@@ -68,18 +68,13 @@ in
     macos_option_as_alt = "both";
   };
 
-  programs.kitty.extras.useSymbolsFromNerdFont = font;
+  programs.kitty.extras.useSymbolsFromNerdFont = "FiraCode Nerd Font";
   # }}}
 
   # Colors config ------------------------------------------------------------------------------ {{{
-  programs.kitty.extras.colors = {
+  programs.kitty.extras.colors.enable = true;
-    enable = true;
+  programs.kitty.extras.colors.dark = colorsToKitty pkgs.lib.colors.tokyonight.dark;
-    dark = colorsToKitty pkgs.lib.colors.tokyonight.dark;
+  programs.kitty.extras.colors.light = colorsToKitty pkgs.lib.colors.tokyonight.light;
-    light = colorsToKitty pkgs.lib.colors.tokyonight.light;
-    color-pkg = pkgs.kitty-rose-pine;
-    dark-name = "dist/rose-pine";
-    light-name = "dist/rose-pine-dawn";
-  };
 
   programs.fish.functions.set-term-colors = {
     body = ''

home/programs.nix

@@ -17,27 +17,9 @@ in
       enable = true;
       config = {
         style = "auto";
+        theme = "base16-256";
       };
     };
-    # See `./fish.nix` for more on how this is used.
-    fish = {
-      functions = {
-        set-bat-colors = {
-          body = ''
-            if test "$term_background" = light
-              set -xg BAT_THEME "Monokai Extended Light"
-            else
-              set -xg BAT_THEME "TwoDark"
-            end
-          '';
-          onVariable = "term_background";
-        };
-      };
-      interactiveShellInit = ''
-        # Set `bat` colors based on value of `$term_backdround` when shell starts up.
-        set-bat-colors
-      '';
-    };
     # Direnv, load and unload environment variables depending on the current directory.
     # https://direnv.net
     # https://rycee.gitlab.io/home-manager/options.html#opt-programs.direnv.enable
@@ -49,7 +31,7 @@ in
       enable = true;
       package = pkgs.helix-flake;
       settings = {
-        theme = "rose_pine";
+        theme = "base16_transparent";
         editor.indent-guides.render = true;
       };
     };
@@ -116,11 +98,10 @@ in
 
     # Useful nix related tools
     cachix # adding/managing alternative binary caches hosted by Cachix
-    comma # run software from nixpkgs without installing it
+    comma # run software from without installing it
     nixpkgs-fmt
     nix-prefetch-git
     nix-tree
-    nil # nix language server
   ] ++ lib.optionals stdenv.isDarwin [
     m-cli # useful macOS CLI commands
     is-dark-mode # see /overlays/colors.nix

home/starship.nix

@@ -14,7 +14,9 @@
     ];
     directory.fish_style_pwd_dir_length = 1; # turn on fish directory truncation
     directory.truncation_length = 2; # number of directories not to truncate
+    # hostname.style = "bold green"; # don't like the default
     memory_usage.disabled = true; # because it includes cached memory it's reported as full a lot
+    # username.style_user = "bold blue"; # don't like the default
   };
   # }}}
 }

modules/home/programs/kitty/extras.nix

@@ -23,18 +23,18 @@ let
 
   # Shell scripts for changing Kitty colors
   term-background = pkgs.writeShellScriptBin "term-background" ''
-    # Accepts the name of a theme file in color-pkg
+    # Accepts arguments "light" or "dark".
     # If shell is running in a Kitty window set the colors.
     if [ -n "$KITTY_WINDOW_ID" ]; then
       kitty @ --to $KITTY_LISTEN_ON set-colors --all --configured \
-        ${cfg.colors.color-pkg}/"$1".conf &
+        ${kitty-colors}/"$1".conf &
     fi
   '';
   term-light = pkgs.writeShellScriptBin "term-light" ''
-    ${term-background}/bin/term-background ${cfg.colors.light-name}
+    ${term-background}/bin/term-background light
   '';
   term-dark = pkgs.writeShellScriptBin "term-dark" ''
-    ${term-background}/bin/term-background ${cfg.colors.dark-name}
+    ${term-background}/bin/term-background dark
   '';
 in
 {
@@ -67,24 +67,6 @@ in
           Kitty color settings for light background colorscheme.
         '';
       };
-
-      color-pkg = mkOption {
-        type = types.package;
-        default = kitty-colors;
-        description = "Package from which to load kitty colors.";
-      };
-
-      light-name = mkOption {
-        type = types.str;
-        default = "light";
-        description = "The name to use for the light colorscheme.";
-      };
-
-      dark-name = mkOption {
-        type = types.str;
-        default = "dark";
-        description = "The name to use for the dark colorscheme.";
-      };
     };
 
     useSymbolsFromNerdFont = mkOption {
@@ -149,10 +131,12 @@ in
       };
 
     programs.kitty.settings = optionalAttrs cfg.colors.enable
-      {
+      (
-        allow_remote_control = "yes";
+        {
-        listen_on = "unix:/tmp/mykitty";
+          allow_remote_control = "yes";
-      } // optionalAttrs (cfg.useSymbolsFromNerdFont != "") {
+          listen_on = "unix:/tmp/mykitty";
+        }
+      ) // optionalAttrs (cfg.useSymbolsFromNerdFont != "") {
 
       # https://github.com/ryanoasis/nerd-fonts/wiki/Glyph-Sets-and-Code-Points
       symbol_map = "U+E5FA-U+E62B,U+E700-U+E7C5,U+F000-U+F2E0,U+E200-U+E2A9,U+F500-U+FD46,U+E300-U+E3EB,U+F400-U+F4A8,U+2665,U+26a1,U+F27C,U+E0A3,U+E0B4-U+E0C8,U+E0CA,U+E0CC-U+E0D2,U+E0D4,U+23FB-U+23FE,U+2B58,U+F300-U+F313,U+E000-U+E00D ${cfg.useSymbolsFromNerdFont}";

overlays/colors.nix

@@ -1,4 +1,4 @@
-_final: prev: {
+final: prev: {
   lib = prev.lib // {
     colors = {
       tokyonight = import ./colors/tokyonight.nix;

pkgs/yubiswitch.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, undmg, unzip, version ? "0.12", ... }:
+{ stdenv, lib, fetchurl, undmg, unzip, version ? "0.12", ... }:
 
 stdenv.mkDerivation {
   inherit version;