Compare commits

..

No commits in common. "master" and "update-flake-lock" have entirely different histories.

9 changed files with 13 additions and 74 deletions

View File

@ -5,7 +5,7 @@ on:
- cron: "0 0 * * 0" # runs weekly on Sunday at 00:00 - cron: "0 0 * * 0" # runs weekly on Sunday at 00:00
jobs: jobs:
update_lockfile: lockfile:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository
@ -19,4 +19,3 @@ jobs:
pr-labels: | # Labels to be set on the PR pr-labels: | # Labels to be set on the PR
dependencies dependencies
automated automated
token: ${{ secrets.GH_TOKEN }}

View File

@ -1,14 +1,6 @@
-- This file simply bootstraps the installation of Lazy.nvim and then calls other files for execution -- 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. -- 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" 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 if not (vim.env.LAZY or (vim.uv or vim.loop).fs_stat(lazypath)) then
-- stylua: ignore -- stylua: ignore
vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath }) vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath })

20
flake.lock generated
View File

@ -7,16 +7,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743127615, "lastModified": 1738743987,
"narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=", "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c", "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "lnl7", "owner": "lnl7",
"ref": "nix-darwin-24.11", "ref": "master",
"repo": "nix-darwin", "repo": "nix-darwin",
"type": "github" "type": "github"
} }
@ -28,11 +28,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744743431, "lastModified": 1736373539,
"narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,11 +60,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1744440957, "lastModified": 1738702386,
"narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

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

View File

@ -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";
};
};
}

View File

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

View File

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

View File

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

View File

@ -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";
};
};
}