diff --git a/defaults/nvim/init.lua b/defaults/nvim/init.lua index 2ce1cdd..ce06ec5 100644 --- a/defaults/nvim/init.lua +++ b/defaults/nvim/init.lua @@ -1,6 +1,14 @@ -- 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", "", '"+y', { noremap = true }) +vim.api.nvim_set_keymap("n", "", 'l"+P', { noremap = true }) +vim.api.nvim_set_keymap("v", "", '"+P', { noremap = true }) +vim.api.nvim_set_keymap("c", "", 'l"+Pl', { noremap = true }) +vim.api.nvim_set_keymap("i", "", 'l"+Pli', { noremap = true }) +vim.api.nvim_set_keymap("t", "", '"+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 }) diff --git a/flake.lock b/flake.lock index e66a596..255195e 100644 --- a/flake.lock +++ b/flake.lock @@ -2,37 +2,33 @@ "nodes": { "darwin": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": ["nixpkgs"] }, "locked": { - "lastModified": 1743496612, - "narHash": "sha256-emPWa5lmKbnyuj8c1mSJUkzJNT+iJoU9GMcXwjp2oVM=", + "lastModified": 1743127615, + "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "73d59580d01e9b9f957ba749f336a272869c42dd", + "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c", "type": "github" }, "original": { "owner": "lnl7", - "ref": "master", + "ref": "nix-darwin-24.11", "repo": "nix-darwin", "type": "github" } }, "home-manager": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": ["nixpkgs"] }, "locked": { - "lastModified": 1743808813, - "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=", + "lastModified": 1744743431, + "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6", + "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", "type": "github" }, "original": { @@ -60,19 +56,11 @@ }, "nixpkgs": { "locked": { -<<<<<<< HEAD - "lastModified": 1742751704, - "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", -======= - "lastModified": 1743703532, - "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "bdb91860de2f719b57eef819b5617762f7120c70", ->>>>>>> origin + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "type": "github" }, "original": { diff --git a/flake.lock.orig b/flake.lock.orig new file mode 100644 index 0000000..eaa4e4d --- /dev/null +++ b/flake.lock.orig @@ -0,0 +1,104 @@ +{ + "nodes": { + "darwin": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743127615, + "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "nix-darwin-24.11", + "repo": "nix-darwin", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1744743431, + "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, + "nix-flatpak": { + "locked": { + "lastModified": 1711997201, + "narHash": "sha256-J71xzQlVYsjagA4AsVwRazhBh2rZrPpKvxTgs6UzL7c=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "b76fa31346db7fc958a9898f3c594696ca71c4fd", + "type": "github" + }, + "original": { + "owner": "gmodena", + "ref": "v0.4.1", + "repo": "nix-flatpak", + "type": "github" + } + }, + "nixpkgs": { + "locked": { +<<<<<<< HEAD +<<<<<<< HEAD + "lastModified": 1742751704, + "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", +======= + "lastModified": 1743703532, + "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "bdb91860de2f719b57eef819b5617762f7120c70", +>>>>>>> origin +======= + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", +>>>>>>> origin + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "darwin": "darwin", + "home-manager": "home-manager", + "nix-flatpak": "nix-flatpak", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index d893951..7f6343d 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; darwin = { - url = "github:lnl7/nix-darwin/master"; + url = "github:lnl7/nix-darwin/nix-darwin-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/meta/maintainers.nix b/meta/maintainers.nix new file mode 100644 index 0000000..62c76e8 --- /dev/null +++ b/meta/maintainers.nix @@ -0,0 +1,11 @@ +{...}: { + "wymiller" = { + email = "wyatt@wyattjmiller.com"; + name = "Wyatt J. Miller"; + homepage = "https://wyattjmiller.com"; + license = { + spdxID = "MPL-2.0"; + fullName = "Mozilla Public License 2.0"; + }; + }; +} diff --git a/modules/common/users.nix b/modules/common/users.nix index 5d65284..60c2735 100644 --- a/modules/common/users.nix +++ b/modules/common/users.nix @@ -5,6 +5,10 @@ hostname, ... } @ args: { + imports = [ + ../security/sudo.nix + ]; + networking.hostName = hostname; # Don't forget to set a password with ‘passwd’! @@ -23,7 +27,7 @@ }) ]; - security.sudo.wheelNeedsPassword = false; + security.sudo.needsPassword = false; users.groups.wyatt = {}; diff --git a/modules/machine/sephiroth/apps.nix b/modules/machine/sephiroth/apps.nix index 2a47cb5..799d391 100644 --- a/modules/machine/sephiroth/apps.nix +++ b/modules/machine/sephiroth/apps.nix @@ -22,6 +22,7 @@ }; taps = [ + "iina/homebrew-mpv-iina" ]; brews = [ @@ -31,6 +32,14 @@ "ghostty" "raycast" "jordanbaird-ice" + "iina" + "linearmouse" + "sanesidebuttons" + "betterdisplay" + "maccy" + "swift-quit" + "medis" + # "alt-tab" ]; }; } diff --git a/modules/security/README.md b/modules/security/README.md new file mode 100644 index 0000000..51e9735 --- /dev/null +++ b/modules/security/README.md @@ -0,0 +1,3 @@ +# Security modules + +These are modules relating to security and security-related programs diff --git a/modules/security/sudo.nix b/modules/security/sudo.nix new file mode 100644 index 0000000..79360e8 --- /dev/null +++ b/modules/security/sudo.nix @@ -0,0 +1,25 @@ +{ + 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"; + }; + }; +}