set checks on individual languages

flake.lock

@@ -53,11 +53,11 @@
     "bypass-paywalls-clean": {
       "flake": false,
       "locked": {
-        "lastModified": 1706880406,
+        "lastModified": 1706005203,
-        "narHash": "sha256-8z2Gc3ITluXXbDij4Ltahpkxs7zdnMITvIAjotab/QU=",
+        "narHash": "sha256-9vku2FK5dXAnb2R/YHTKIHgc+Ckqza1qAH0kOw0Uryg=",
         "owner": "magnolia1234",
         "repo": "bpc-uploads",
-        "rev": "c91cfd510390ab5a138f412ad2890b2cb2a2eafd",
+        "rev": "245899e6b06e30ce36f26b37b8045b6c5b0ac8de",
         "type": "gitlab"
       },
       "original": {
@@ -89,11 +89,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706833576,
+        "lastModified": 1706405065,
-        "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=",
+        "narHash": "sha256-femlVBNWgr9a6HfBUzhBF/9S8VBlaHDKcEm8B89O+zc=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7",
+        "rev": "0108864c15bb68ad57d17fb2e7d3a3e025751d79",
         "type": "github"
       },
       "original": {
@@ -110,11 +110,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706491084,
+        "lastModified": 1706302763,
-        "narHash": "sha256-eaEv+orTmr2arXpoE4aFZQMVPOYXCBEbLgK22kOtkhs=",
+        "narHash": "sha256-Le1wk75qlzOSfzDk8vqYxSdoEyr/ORIbMhziltVNGYw=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "f67ba6552845ea5d7f596a24d57c33a8a9dc8de9",
+        "rev": "f7424625dc1f2e4eceac3009cbd1203d566feebc",
         "type": "github"
       },
       "original": {
@@ -147,11 +147,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1707007453,
+        "lastModified": 1706402627,
-        "narHash": "sha256-vs7uACn2/8GOApZJv52gAVsLfpjQWFgkHN2QJ7aVkl8=",
+        "narHash": "sha256-lq2g41A527U2qJ1A9socjFPBOJ1/PM+Mftj3t7D/lhM=",
         "owner": "bandithedoge",
         "repo": "nixpkgs-firefox-darwin",
-        "rev": "d839feb516758ad28bc1cef43008d55e749c1d6a",
+        "rev": "912228b33c72703badb20a309518e1e09af302c3",
         "type": "github"
       },
       "original": {
@@ -215,11 +215,11 @@
     "hmts-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1706900289,
+        "lastModified": 1693226725,
-        "narHash": "sha256-kw3YJ21nhs/x9Jp7kvnL+9FuiSgLB1hO/ON3QeeZx9g=",
+        "narHash": "sha256-jUuztOqNBltC3axa7s3CPJz9Cmukfwkf846+Z/gAxCU=",
         "owner": "calops",
         "repo": "hmts.nvim",
-        "rev": "ba1239972a1f56b94252d4f85a43e777ac419662",
+        "rev": "14fd941d7ec2bb98314a1aacaa2573d97f1629ab",
         "type": "github"
       },
       "original": {
@@ -235,11 +235,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706985585,
+        "lastModified": 1706306660,
-        "narHash": "sha256-ptshv4qXiC6V0GCfpABz88UGGPNwqs5tAxaRUKbk1Qo=",
+        "narHash": "sha256-lZvgkHtVeduGByPb0Tz9LpAi4olfkEm8XPgv0o7GRsk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1ca210648a6ca9b957efde5da957f3de6b1f0c45",
+        "rev": "b2f56952074cb46e93902ecaabfb04dd93733434",
         "type": "github"
       },
       "original": {
@@ -249,22 +249,6 @@
         "type": "github"
       }
     },
-    "kitty-scrollback-nvim-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1706891759,
-        "narHash": "sha256-p7RPqLHO6D5CCTDQzUrEqTu9+jg+V7wtYfGbY4qjE9A=",
-        "owner": "mikesmithgh",
-        "repo": "kitty-scrollback.nvim",
-        "rev": "12f7687ac049d46a987c39b2b4f657fdf540fa4e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mikesmithgh",
-        "repo": "kitty-scrollback.nvim",
-        "type": "github"
-      }
-    },
     "nextcloud-cookbook": {
       "flake": false,
       "locked": {
@@ -307,7 +291,7 @@
     "nextcloud-snappymail": {
       "flake": false,
       "locked": {
-        "lastModified": 1707018069,
+        "lastModified": 1706414864,
         "narHash": "sha256-UeZXoZFEPJj7zEVNTXJ3IYNt/wI7VFq3Pjh1ubMHCBo=",
         "type": "tarball",
         "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz"
@@ -325,11 +309,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706886721,
+        "lastModified": 1706407735,
-        "narHash": "sha256-iDYxsE5xYoK8Ww2TYZDmgRQNIZl+QHJfChOxWh45g0k=",
+        "narHash": "sha256-Q5Lv4FlKVmMXd91ujh6FUxCsoAU2Q8KPU+ipTZPkTjE=",
         "owner": "gytis-ivaskevicius",
         "repo": "nix2vim",
-        "rev": "29253dcf0f645a44847006d436b096369ef42fd8",
+        "rev": "84584da274869fb8177e8ef2d0b9d975bbb82489",
         "type": "github"
       },
       "original": {
@@ -376,11 +360,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1706732774,
+        "lastModified": 1706191920,
-        "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=",
+        "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d",
+        "rev": "ae5c332cbb5827f6b1f02572496b141021de335f",
         "type": "github"
       },
       "original": {
@@ -408,11 +392,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1707013032,
+        "lastModified": 1706405996,
-        "narHash": "sha256-9kEY/D0Q6sF+p6vJRefVXDK4QQdwK4Q0lSQdsYICad0=",
+        "narHash": "sha256-hJbt3cTW0ma3k/kZ51F/T9MijyJxR1S3ZIeQHL2JPYw=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "ab432acea15134873882610c0e936a882319bc8a",
+        "rev": "ab8cf147ee2254ef91e87ff7272524975fcbba3f",
         "type": "github"
       },
       "original": {
@@ -441,11 +425,11 @@
     "nvim-tree-lua-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1706571452,
+        "lastModified": 1705818283,
-        "narHash": "sha256-b0LIqLC8cCRX1NyJx4eH5c4v5Fqqw5mMleAnQ2VRctM=",
+        "narHash": "sha256-EKAzWIT2Qs65Il1pwgpkFsCogFViapUiSHcZgVy+QsY=",
         "owner": "kyazdani42",
         "repo": "nvim-tree.lua",
-        "rev": "f39f7b6fcd3865ac2146de4cb4045286308f2935",
+        "rev": "7bdb220d0fe604a77361e92cdbc7af1b8a412126",
         "type": "github"
       },
       "original": {
@@ -457,11 +441,11 @@
     "nvim-treesitter-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1706952848,
+        "lastModified": 1706392286,
-        "narHash": "sha256-pNjEODR+QJPDL58O4NM7SjzZEN8D3bXDHbKLNOS3fL8=",
+        "narHash": "sha256-JWGTIuhyTUok4QsML63eUragDoqKkyk5tBuv25lmbg8=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter",
-        "rev": "4fbf150a1621d52f17b099506e1a32f107079210",
+        "rev": "458ce4d16c1771fc601ec10a87820acae9981f6d",
         "type": "github"
       },
       "original": {
@@ -484,38 +468,6 @@
         "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-25/GE-Proton8-25.tar.gz"
       }
     },
-    "ren": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1704996573,
-        "narHash": "sha256-zVIt6Xp+Mvym6gySvHIZJt1QgzKVP/wbTGTubWk6kzI=",
-        "owner": "robenkleene",
-        "repo": "ren-find",
-        "rev": "50c40172e354caffee48932266edd7c7a76a20fd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "robenkleene",
-        "repo": "ren-find",
-        "type": "github"
-      }
-    },
-    "rep": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1705833236,
-        "narHash": "sha256-hm+v+b97z1HnY/7QHZxc0GygCq9W0mJauyjnz48ddaM=",
-        "owner": "robenkleene",
-        "repo": "rep-grep",
-        "rev": "365acc5d599934e94dc066eb85b7ddd684ba508b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "robenkleene",
-        "repo": "rep-grep",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "Comment-nvim-src": "Comment-nvim-src",
@@ -529,7 +481,6 @@
         "firefox-darwin": "firefox-darwin",
         "hmts-nvim-src": "hmts-nvim-src",
         "home-manager": "home-manager",
-        "kitty-scrollback-nvim-src": "kitty-scrollback-nvim-src",
         "nextcloud-cookbook": "nextcloud-cookbook",
         "nextcloud-external": "nextcloud-external",
         "nextcloud-news": "nextcloud-news",
@@ -543,8 +494,6 @@
         "nvim-tree-lua-src": "nvim-tree-lua-src",
         "nvim-treesitter-src": "nvim-treesitter-src",
         "proton-ge": "proton-ge",
-        "ren": "ren",
-        "rep": "rep",
         "telescope-nvim-src": "telescope-nvim-src",
         "telescope-project-nvim-src": "telescope-project-nvim-src",
         "toggleterm-nvim-src": "toggleterm-nvim-src",
@@ -780,11 +729,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706867893,
+        "lastModified": 1706071294,
-        "narHash": "sha256-c5bADvtL35S3vsJaXR5YWTXe08W0gSwOrTOXfpJB4Ac=",
+        "narHash": "sha256-mpt86O5GQxKQoIg4nzKz810PeXjGSEFb4rW+shXbRco=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "bcae8dc73b931b7f0fc65f1f1ef93dc379dfd66b",
+        "rev": "31346e340e828f79be23d9c83ec1674b152f17bc",
         "type": "github"
       },
       "original": {

flake.nix

@@ -120,10 +120,6 @@
       url = "github:j-hui/fidget.nvim/v1.2.0";
       flake = false;
     };
-    kitty-scrollback-nvim-src = {
-      url = "github:mikesmithgh/kitty-scrollback.nvim";
-      flake = false;
-    };
 
     # Tree-Sitter Grammars
     tree-sitter-bash = {
@@ -161,16 +157,6 @@
       flake = false;
     };
 
-    # Ren and rep - CLI find and replace
-    rep = {
-      url = "github:robenkleene/rep-grep";
-      flake = false;
-    };
-    ren = {
-      url = "github:robenkleene/ren-find";
-      flake = false;
-    };
-
     # GE version of Proton for game compatibility
     # Alternatively, could consider using https://github.com/fufexan/nix-gaming
     proton-ge = {
@@ -259,7 +245,7 @@
         (import ./overlays/proton-ge.nix inputs)
         (import ./overlays/gh-collaborators.nix)
         (import ./overlays/bypass-paywalls-clean.nix inputs)
-        (import ./overlays/ren-rep.nix inputs)
+        (import ./overlays/terraform.nix)
       ];
 
       # System types to support.

modules/common/applications/1password.nix

@@ -12,7 +12,7 @@
   config = lib.mkIf (config.gui.enable && config._1password.enable) {
     unfreePackages = [ "1password" "_1password-gui" "1password-cli" ];
     home-manager.users.${config.user} = {
-      home.packages = with pkgs; [ _1password-gui _1password ];
+      home.packages = with pkgs; [ _1password-gui ];
     };
 
     # https://1password.community/discussion/135462/firefox-extension-does-not-connect-to-linux-app

modules/common/applications/discord.nix

@@ -11,8 +11,8 @@
 
   config = lib.mkIf (config.gui.enable && config.discord.enable) {
     unfreePackages = [ "discord" ];
-    environment.systemPackages = [ pkgs.discord ];
     home-manager.users.${config.user} = {
+      home.packages = with pkgs; [ discord ];
       xdg.configFile."discord/settings.json".text = ''
         {
           "BACKGROUND_COLOR": "#202225",

modules/common/applications/kitty.nix

@@ -45,20 +45,9 @@
 
           # Easy fullscreen toggle (for macOS)
           "super+f" = "toggle_fullscreen";
-
-          # Kitty scrollback nvim
-          "kitty_mod+h" = "kitty_scrollback_nvim";
-          "kitty_mod+g" =
-            "kitty_scrollback_nvim --config ksb_builtin_last_cmd_output";
         };
         settings = {
 
-          # Required for kitty-scrollback.nvim
-          allow_remote_control = "socket-only";
-          listen_on = "unix:/tmp/kitty";
-          action_alias =
-            "kitty_scrollback_nvim kitten ${pkgs.kitty-scrollback-nvim}/python/kitty_scrollback_nvim.py";
-
           # Colors (adapted from: https://github.com/kdrag0n/base16-kitty/blob/master/templates/default-256.mustache)
           background = config.theme.colors.base00;
           foreground = config.theme.colors.base05;

modules/common/applications/media.nix

@@ -40,7 +40,6 @@
         associations.added = {
           "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
           "image/jpeg" = [ "nsxiv.desktop" ];
-          "image/png" = [ "nsxiv.desktop" ];
           "image/*" = [ "nsxiv.desktop" ];
         };
         associations.removed = {
@@ -49,7 +48,6 @@
         defaultApplications = {
           "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
           "image/jpeg" = [ "nsxiv.desktop" ];
-          "image/png" = [ "nsxiv.desktop" ];
           "image/*" = [ "nsxiv.desktop" ];
         };
       };

modules/common/neovim/config/misc.nix

@@ -8,7 +8,6 @@
     pkgs.vimPlugins.glow-nvim # Markdown preview popup
     pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews
     pkgs.vimPlugins.which-key-nvim # Keybind helper
-    pkgs.kitty-scrollback-nvim # Scrollback pager for kitty
   ];
 
   # Initialize some plugins
@@ -16,7 +15,6 @@
   setup.colorizer = { user_default_options = { names = false; }; };
   setup.glow = { };
   setup.which-key = { };
-  setup.kitty-scrollback = { };
 
   vim.o = {
     termguicolors = true; # Set to truecolor

modules/common/neovim/default.nix

@@ -47,8 +47,8 @@ in {
         # Requires removing some of the ANSI escape codes that are sent to the
         # scrollback using sed and baleia, as well as removing several
         # unnecessary features.
-        programs.kitty.settings.scrollback_pager =
+        programs.kitty.settings.scrollback_pager = ''
-          "${neovim}/bin/nvim --headless +'KittyScrollbackGenerateKittens' +'set nonumber' +'set norelativenumber' +'%print' +'quit!' 2>&1";
+          $SHELL -c 'sed -r "s/[[:cntrl:]]\]133;[AC]..//g" | ${neovim}/bin/nvim -c "setlocal nonumber norelativenumber nolist laststatus=0" -c "lua baleia = require(\"baleia\").setup({}); baleia.once(0)" -c "map <silent> q :qa!<CR>" -c "autocmd VimEnter * normal G"' '';
 
         # Create a desktop option for launching Neovim from a file manager
         # (Requires launching the terminal and then executing Neovim)

modules/common/programming/kubernetes.nix

@@ -24,29 +24,18 @@
       # Terminal Kubernetes UI
       programs.k9s = {
         enable = true;
-        settings = {
+        # settings = { k9s = { headless = true; }; };
-          k9s = {
+        skin = {
-            ui = {
-              enableMouse = true;
-              headless = true;
-              logoless = true;
-              crumbsless = false;
-              skin = "main";
-            };
-          };
-        };
-        skins = {
-          main = {
           k9s = {
             body = {
               fgColor = config.theme.colors.base06;
-                bgColor = "default";
+              bgColor = config.theme.colors.base00;
               logoColor = config.theme.colors.base02; # *blue ?
             };
             # Search bar
             prompt = {
               fgColor = config.theme.colors.base06;
-                bgColor = "default";
+              bgColor = config.theme.colors.base00;
               suggestColor = config.theme.colors.base03;
             };
             # Header left side
@@ -56,7 +45,7 @@
             };
             dialog = {
               fgColor = config.theme.colors.base06;
-                bgColor = "default";
+              bgColor = config.theme.colors.base00;
               buttonFgColor = config.theme.colors.base06;
               buttonBgColor = config.theme.colors.base0E;
               buttonFocusFgColor = config.theme.colors.base07;
@@ -90,7 +79,7 @@
               };
               title = {
                 fgColor = config.theme.colors.base06;
-                  bgColor = "default";
+                bgColor = config.theme.colors.base00;
                 highlightColor = config.theme.colors.base09; # *orange
                 counterColor = config.theme.colors.base0D; # *blue
                 filterColor = config.theme.colors.base0E; # *magenta
@@ -98,7 +87,7 @@
             };
             views = {
               charts = {
-                  bgColor = "default";
+                bgColor = config.theme.colors.base00;
                 defaultDialColors =
                   [ config.theme.colors.base0D config.theme.colors.base08 ];
                 # - *blue
@@ -111,7 +100,7 @@
               table = {
                 # List of resources
                 fgColor = config.theme.colors.base06;
-                  bgColor = "default";
+                bgColor = config.theme.colors.base00;
 
                 # Row selection
                 cursorFgColor = config.theme.colors.base07;
@@ -120,13 +109,13 @@
                 # Header row
                 header = {
                   fgColor = config.theme.colors.base0D;
-                    bgColor = "default";
+                  bgColor = config.theme.colors.base00;
                   sorterColor = config.theme.colors.base0A; # *selection
                 };
               };
               xray = {
                 fgColor = config.theme.colors.base06;
-                  bgColor = "default";
+                bgColor = config.theme.colors.base00;
                 cursorColor = config.theme.colors.base06;
                 graphicColor = config.theme.colors.base0D;
                 showIcons = false;
@@ -138,11 +127,10 @@
               };
               logs = {
                 fgColor = config.theme.colors.base06;
-                  bgColor = "default";
+                bgColor = config.theme.colors.base00;
                 indicator = {
                   fgColor = config.theme.colors.base06;
-                    bgColor = "default";
+                  bgColor = config.theme.colors.base00;
-                  };
                 };
               };
             };

modules/common/shell/utilities.nix

@@ -31,8 +31,6 @@ in {
         lf # File viewer
         qrencode # Generate qr codes
         rsync # Copy folders
-        ren # Rename files
-        # rep # Replace text in files
         ripgrep # grep
         sd # sed
         tealdeer # Cheatsheets

modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/init.lua

@@ -9,7 +9,7 @@ obj.version = "0.1"
 obj.license = "MIT - https://opensource.org/licenses/MIT"
 
 function obj:init()
-    hs.window.animationDuration = 0.1
+    hs.window.animationDuration = 0
     dofile(hs.spoons.resourcePath("worklayout.lua"))()
     -- bind hotkey
     hs.hotkey.bind({ "alt", "ctrl", "cmd" }, "n", function()

modules/darwin/homebrew.nix

@@ -30,14 +30,17 @@
       };
       brews = [
         "trash" # Delete files and folders to trash instead of rm
+        "openjdk" # Required by Apache Directory Studio
       ];
       casks = [
         "1password" # 1Password will not launch from Nix on macOS
+        "apache-directory-studio" # Packaging on Nix is not available for macOS
         # "gitify" # Git notifications in menu bar (downgrade manually from 4.6.1)
         "keybase" # GUI on Nix not available for macOS
         # "logitech-g-hub" # Mouse and keyboard management
         "logitune" # Logitech webcam firmware
         "meetingbar" # Show meetings in menu bar
+        # "obsidian" # Obsidian packaging on Nix is not available for macOS
         "scroll-reverser" # Different scroll style for mouse vs. trackpad
         # "steam" # Not packaged for Nix
         # "epic-games" # Not packaged for Nix

modules/darwin/system.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }: {
+{ pkgs, lib, ... }: {
 
   config = lib.mkIf pkgs.stdenv.isDarwin {
 
@@ -112,95 +112,88 @@
         # Disable trackpad tap to click
         trackpad.Clicking = false;
 
+        # universalaccess = {
+
+        #   # Zoom in with Control + Scroll Wheel
+        #   closeViewScrollWheelToggle = true;
+        #   closeViewZoomFollowsFocus = true;
+        # };
+
         # Where to save screenshots
         screencapture.location = "~/Downloads";
 
-        CustomUserPreferences = {
-          # Disable disk image verification
-          "com.apple.frameworks.diskimages" = {
-            skip-verify = true;
-            skip-verify-locked = true;
-            skip-verify-remote = true;
-          };
-          # Avoid creating .DS_Store files on network or USB volumes
-          "com.apple.desktopservices" = {
-            DSDontWriteNetworkStores = true;
-            DSDontWriteUSBStores = true;
-          };
-          "com.apple.dock" = {
-            magnification = true;
-            largesize = 48;
-            persistent-apps = let
-              dockText = app:
-                "<dict><key>tile-data</key><dict><key>file-data</key><dict><key>_CFURLString</key><string>${app}</string><key>_CFURLStringType</key><integer>0</integer></dict></dict></dict>";
-            in map dockText [
-              "/Applications/1Password.app"
-              "${pkgs.slack}/Applications/Slack.app"
-              "/System/Applications/Calendar.app"
-              "${pkgs.firefox-bin}/Applications/Firefox.app"
-              "/System/Applications/Messages.app"
-              "/System/Applications/Mail.app"
-              "/Applications/zoom.us.app"
-              "${pkgs.discord}/Applications/Discord.app"
-              "${pkgs.obsidian}/Applications/Obsidian.app"
-              "${pkgs.kitty}/Applications/kitty.app"
-              "/System/Applications/System Settings.app"
-            ];
-          };
-          # Require password immediately after screen saver begins
-          "com.apple.screensaver" = {
-            askForPassword = 1;
-            askForPasswordDelay = 0;
-          };
-          "com.apple.finder" = {
-            # Disable the warning before emptying the Trash
-            WarnOnEmptyTrash = false;
-
-            # Finder search in current folder by default
-            FXDefaultSearchScope = "SCcf";
-
-            # Default Finder window set to column view
-            FXPreferredViewStyle = "clmv";
-          };
-          "leits.MeetingBar" = {
-            eventTimeFormat = ''"show"'';
-            eventTitleFormat = ''"none"'';
-            eventTitleIconFormat = ''"iconCalendar"'';
-            slackBrowser =
-              ''{"deletable":true,"arguments":"","name":"Slack","path":""}'';
-            zoomBrowser =
-              ''{"deletable":true,"arguments":"","name":"Zoom","path":""}'';
-            KeyboardShortcuts_joinEventShortcut =
-              ''{"carbonModifiers":6400,"carbonKeyCode":38}'';
-            timeFormat = ''"12-hour"'';
-          };
-        };
-
-        CustomSystemPreferences = {
-
-        };
-
       };
 
       # Settings that don't have an option in nix-darwin
       activationScripts.postActivation.text = ''
+        echo "Disable disk image verification"
+        defaults write com.apple.frameworks.diskimages skip-verify -bool true
+        defaults write com.apple.frameworks.diskimages skip-verify-locked -bool true
+        defaults write com.apple.frameworks.diskimages skip-verify-remote -bool true
+
+        echo "Avoid creating .DS_Store files on network volumes"
+        defaults write com.apple.desktopservices DSDontWriteNetworkStores -bool true
+
+        echo "Disable the warning before emptying the Trash"
+        defaults write com.apple.finder WarnOnEmptyTrash -bool false
+
+        echo "Require password immediately after sleep or screen saver begins"
+        defaults write com.apple.screensaver askForPassword -int 1
+        defaults write com.apple.screensaver askForPasswordDelay -int 0
+
         echo "Allow apps from anywhere"
         SPCTL=$(spctl --status)
         if ! [ "$SPCTL" = "assessments disabled" ]; then
             sudo spctl --master-disable
         fi
+
       '';
 
       # User-level settings
-      activationScripts.postUserActivation.text = let
+      activationScripts.postUserActivation.text = ''
-        persistentApps = lib.concatMapStrings (x: ''"'' + x + ''" '')
-          config.system.defaults.CustomUserPreferences."com.apple.dock".persistent-apps;
-      in ''
         echo "Show the ~/Library folder"
         chflags nohidden ~/Library
 
+        if [ ! $(defaults read com.apple.dock magnification) = "1" ]; then
+            echo "Enable dock magnification"
+            defaults write com.apple.dock magnification -bool true
+        fi
+
+        if [ ! $(defaults read com.apple.dock largesize) = "48" ]; then
+            echo "Set dock magnification size"
+            defaults write com.apple.dock largesize -int 48
+        fi
+
+        echo "Define dock icon function"
+        __dock_item() {
+            printf "%s%s%s%s%s" \
+                   "<dict><key>tile-data</key><dict><key>file-data</key><dict>" \
+                   "<key>_CFURLString</key><string>" \
+                   "$1" \
+                   "</string><key>_CFURLStringType</key><integer>0</integer>" \
+                   "</dict></dict></dict>"
+        }
+
         echo "Choose and order dock icons"
-        defaults write com.apple.dock persistent-apps -array ${persistentApps}
+        defaults write com.apple.dock persistent-apps -array \
+            "$(__dock_item /Applications/1Password.app)" \
+            "$(__dock_item ${pkgs.slack}/Applications/Slack.app)" \
+            "$(__dock_item /System/Applications/Calendar.app)" \
+            "$(__dock_item ${pkgs.firefox-bin}/Applications/Firefox.app)" \
+            "$(__dock_item /System/Applications/Messages.app)" \
+            "$(__dock_item /System/Applications/Mail.app)" \
+            "$(__dock_item /Applications/zoom.us.app)" \
+            "$(__dock_item ${pkgs.discord}/Applications/Discord.app)" \
+            "$(__dock_item ${pkgs.obsidian}/Applications/Obsidian.app)" \
+            "$(__dock_item ${pkgs.kitty}/Applications/kitty.app)" \
+            "$(__dock_item /System/Applications/System\ Settings.app)"
+
+        echo "MeetingBar settings"
+        defaults write leits.MeetingBar eventTimeFormat -string "\"show\""
+        defaults write leits.MeetingBar eventTitleFormat -string "\"none\""
+        defaults write leits.MeetingBar eventTitleIconFormat -string "\"iconCalendar\""
+        defaults write leits.MeetingBar slackBrowser -string "{\"deletable\":true,\"arguments\":\"\",\"name\":\"Slack\",\"path\":\"\"}"
+        defaults write leits.MeetingBar zoomBrowser -string "{\"deletable\":true,\"arguments\":\"\",\"name\":\"Zoom\",\"path\":\"\"}"
       '';
 
     };

modules/darwin/utilities.nix

@@ -18,6 +18,7 @@
       awscli2
       awslogs
       google-cloud-sdk
+      ansible
       vault-bin
       consul
       noti # Create notifications programmatically

modules/nixos/hardware/keyboard.nix

@@ -4,7 +4,7 @@
 
     services.xserver = {
 
-      xkb.layout = "us";
+      layout = "us";
 
       # Keyboard responsiveness
       autoRepeatDelay = 250;

overlays/neovim-plugins.nix

@@ -35,7 +35,5 @@ in {
   # Packaging plugins entirely with Nix
   baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src;
   hmts-nvim = plugin "hmts-nvim" inputs.hmts-nvim-src;
-  kitty-scrollback-nvim =
-    plugin "kitty-scrollback-nvim" inputs.kitty-scrollback-nvim-src;
 
 }

overlays/ren-rep.nix

@@ -1,17 +0,0 @@
-inputs: _final: prev: {
-
-  ren = prev.rustPlatform.buildRustPackage {
-    pname = "ren-find";
-    version = "0.0.7";
-    src = inputs.ren;
-    cargoHash = "sha256-3bI3j2xvNHp4kyLEq/DZvRJBF2rn6pE4n8oXh67edDI=";
-  };
-
-  # rep = prev.rustPlatform.buildRustPackage {
-  #   pname = "rep-grep";
-  #   version = "0.0.7";
-  #   src = inputs.rep;
-  #   cargoHash = "sha256-GEr3VvQ0VTKHUbW/GFEgwLpQWP2ZhS/4KYjDvfFLgxo=";
-  # };
-
-}

overlays/terraform.nix

@@ -0,0 +1,12 @@
+# Fix for Terraform and Consul on Darwin:
+# https://github.com/NixOS/nixpkgs/pull/275534/files
+_final: prev: {
+  girara = prev.girara.overrideAttrs (old: {
+    mesonFlags = [
+      "-Ddocs=disabled"
+      (prev.lib.mesonEnable "tests"
+        ((prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform)
+          && (!prev.stdenv.isDarwin)))
+    ];
+  });
+}