defaults/nvim/init.lua

@@ -1,14 +1,6 @@
 -- This file simply bootstraps the installation of Lazy.nvim and then calls other files for execution
 -- This file doesn't necessarily need to be touched, BE CAUTIOUS editing this file and proceed at your own risk.
 local lazypath = vim.env.LAZY or vim.fn.stdpath "data" .. "/lazy/lazy.nvim"
-
-vim.api.nvim_set_keymap("v", "<sc-c>", '"+y', { noremap = true })
-vim.api.nvim_set_keymap("n", "<sc-v>", 'l"+P', { noremap = true })
-vim.api.nvim_set_keymap("v", "<sc-v>", '"+P', { noremap = true })
-vim.api.nvim_set_keymap("c", "<sc-v>", '<C-o>l<C-o>"+<C-o>P<C-o>l', { noremap = true })
-vim.api.nvim_set_keymap("i", "<sc-v>", '<ESC>l"+Pli', { noremap = true })
-vim.api.nvim_set_keymap("t", "<sc-v>", '<C-\\><C-n>"+Pi', { noremap = true })
-
 if not (vim.env.LAZY or (vim.uv or vim.loop).fs_stat(lazypath)) then
   -- stylua: ignore
   vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath })

flake.lock

@@ -2,33 +2,37 @@
   "nodes": {
     "darwin": {
       "inputs": {
-        "nixpkgs": ["nixpkgs"]
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1743127615,
+        "lastModified": 1738743987,
-        "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=",
+        "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c",
+        "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c",
         "type": "github"
       },
       "original": {
         "owner": "lnl7",
-        "ref": "nix-darwin-24.11",
+        "ref": "master",
         "repo": "nix-darwin",
         "type": "github"
       }
     },
     "home-manager": {
       "inputs": {
-        "nixpkgs": ["nixpkgs"]
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1745557122,
+        "lastModified": 1736373539,
-        "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=",
+        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1",
+        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
         "type": "github"
       },
       "original": {
@@ -56,11 +60,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1745487689,
+        "lastModified": 1738702386,
-        "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=",
+        "narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3",
+        "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e",
         "type": "github"
       },
       "original": {

flake.nix

@@ -8,7 +8,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     darwin = {
-      url = "github:lnl7/nix-darwin/nix-darwin-24.11";
+      url = "github:lnl7/nix-darwin/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };

home/browser.nix

@@ -1,52 +1,5 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  lib,
-  ...
-}: {
   programs.firefox = {
-    # please see Mozilla's TOU and privacy policy please i implore you
-    enable = false;
-  };
-
-  programs.chromium = {
     enable = pkgs.stdenv.isLinux;
-    package = pkgs.ungoogled-chromium.override {
-      enableWideVine = true;
-      commandLineArgs = [
-        "--enable-features=AcceleratedVideoEncoder,Vulkan,VulkanFromANGLE,DefaultANGLEVulkan"
-        "--ignore-gpu-blocklist"
-        "--force-dark-mode"
-        "--enable-zero-copy"
-      ];
-    };
-    extensions = let
-      createChromiumExtensionFor = browserVersion: {
-        id,
-        sha256,
-        version,
-      }: {
-        inherit id;
-        crxPath = builtins.fetchurl {
-          url = "https://clients2.google.com/service/update2/crx?response=redirect&acceptformat=crx2,crx3&prodversion=${browserVersion}&x=id%3D${id}%26installsource%3Dondemand%26uc";
-          name = "${id}.crx";
-          inherit sha256;
-        };
-        inherit version;
-      };
-      createChromiumExtension = createChromiumExtensionFor (lib.versions.major pkgs.ungoogled-chromium.version);
-    in [
-      (createChromiumExtension {
-        # ublock origin
-        id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
-        sha256 = "sha256:0ycnkna72n969crgxfy2lc1qbndjqrj46b9gr5l9b7pgfxi5q0ll";
-        version = "1.63.2";
-      })
-      (createChromiumExtension {
-        # bitwarden
-        id = "nngceckbapebfimnlniiiahkandclblb";
-        sha256 = "sha256:0jxk3cqmgd5qj8hnw7s0k5s4bfrcmr0w0rckp3x0bmng07azw4gi";
-        version = "2025.3.1";
-      })
-    ];
   };
 }

home/default.nix

@@ -23,7 +23,6 @@ in {
     ./direnv.nix
     ./sway.nix
     ./terminal.nix
-    ./browser.nix
   ];
 
   # Home Manager needs a bit of information about you and the
@@ -42,7 +41,6 @@ in {
       XDG_CACHE_HOME = "$HOME/.cache";
       XDG_DATA_HOME = "$HOME/.local/share";
       XDG_STATE_HOME = "$HOME/.local/state";
-      NIXOS_OZONE_WL = "1";
     };
 
     pointerCursor = lib.mkIf pkgs.stdenv.isLinux {

home/git.nix

@@ -15,8 +15,7 @@
     extraConfig = {
       init.defaultBranch = "master";
       push.autoSetupRemote = true;
-      pull.merge = true;
+      pull.rebase = true;
-      merge.tool = "nvimdiff";
     };
 
     ignores = [
@@ -40,7 +39,7 @@
       dc = "diff --cached";
       amend = "commit --amend -m";
 
-      # aliases for submodules
+      # aliases for submodule
       update = "submodule update --init --recursive";
       foreach = "submodule foreach";
     };

home/packages/linux.nix

@@ -11,6 +11,5 @@
     mcrcon
     xfce.thunar
     pavucontrol
-    # ungoogled-chromium
   ]);
 }

meta/maintainers.nix

@@ -1,11 +0,0 @@
-{...}: {
-  "wymiller" = {
-    email = "wyatt@wyattjmiller.com";
-    name = "Wyatt J. Miller";
-    homepage = "https://wyattjmiller.com";
-    license = {
-      spdxID = "MPL-2.0";
-      fullName = "Mozilla Public License 2.0";
-    };
-  };
-}

modules/common/users.nix

@@ -5,10 +5,6 @@
   hostname,
   ...
 } @ args: {
-  imports = [
-    ../security/sudo.nix
-  ];
-
   networking.hostName = hostname;
 
   # Don't forget to set a password with ‘passwd’!
@@ -27,8 +23,6 @@
     })
   ];
 
-  security.sudo.needsPassword = false;
-
   users.groups.wyatt = {};
 
   nix.settings.trusted-users = [userName];

modules/machine/sephiroth/apps.nix

@@ -22,7 +22,6 @@
     };
 
     taps = [
-      "iina/homebrew-mpv-iina"
     ];
 
     brews = [
@@ -32,14 +31,6 @@
       "ghostty"
       "raycast"
       "jordanbaird-ice"
-      "iina"
-      "linearmouse"
-      "sanesidebuttons"
-      "betterdisplay"
-      "maccy"
-      "swift-quit"
-      "medis"
-      # "alt-tab"
     ];
   };
 }

modules/pwrMgmt/README.md

@@ -14,7 +14,7 @@ Given that this configuration is in the `machine/<hostname>` directory (where ho
     # other configuration files here...
   ];
 
-  pwrMgmt = {
+  customPowerManagement = {
     enable = true;
     cpuFreqGovernor = "performance";
     powertop.enable = false;
@@ -29,7 +29,7 @@ Given that this configuration is in the `machine/<hostname>` directory (where ho
     # other configuration files here...
   ];
 
-  pwrMgmt = {
+  customPowerManagement = {
     enable = true;
     cpuFreqGovernor = "powersave";
     powertop = {

modules/security/README.md

@@ -1,3 +0,0 @@
-# Security modules
-
-These are modules relating to security and security-related programs

modules/security/sudo.nix

@@ -1,25 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib; {
-  options = {
-    security.sudo = {
-      needsPassword = mkOption {
-        type = types.bool;
-        default = true;
-        description = "Whether users in the wheel group need to provide a password for sudo.";
-      };
-    };
-  };
-
-  config = {
-    environment.etc."sudoers.d/wheel-no-password" = mkIf (!config.security.sudo.needsPassword) {
-      text = ''
-        %wheel ALL=(ALL) NOPASSWD: ALL
-      '';
-      # mode = "0440";
-    };
-  };
-}