Merge branch 'main' of github.com:tmayoff/.dotfiles

This commit is contained in:
Tyler Mayoff 2025-05-12 19:30:40 -04:00
commit 4a1cdbccd4
10 changed files with 86 additions and 73 deletions

View file

@ -11,7 +11,8 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@main - run: |
curl -sSf -L https://install.lix.systems/lix | sh -s -- install --no-confirm
- uses: DeterminateSystems/update-flake-lock@v24 - uses: DeterminateSystems/update-flake-lock@v24
with: with:
pr-title: "Update flake.lock" # Title of PR to be created pr-title: "Update flake.lock" # Title of PR to be created

View file

@ -22,7 +22,8 @@ jobs:
sudo docker builder prune -a sudo docker builder prune -a
df -h df -h
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@v16 - uses: samueldr/lix-gha-installer-action@v2025-02-26.prerelease
- uses: cachix/cachix-action@v16 - uses: cachix/cachix-action@v16
with: with:
name: tmayoff name: tmayoff

View file

@ -5,11 +5,11 @@
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
}, },
"locked": { "locked": {
"lastModified": 1732200724, "lastModified": 1745523430,
"narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=",
"owner": "SenchoPens", "owner": "SenchoPens",
"repo": "base16.nix", "repo": "base16.nix",
"rev": "153d52373b0fb2d343592871009a286ec8837aec", "rev": "58bfe2553d937d8af0564f79d5b950afbef69717",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -75,11 +75,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1746109800, "lastModified": 1747048878,
"narHash": "sha256-sjDpqdvbQaiA6OAsgLE4niz6hmmCpoUH0cl5zyfu6FI=", "narHash": "sha256-YSGK+etuuFrMo0PSMWdiIHSuEDybrgCIuyOq0V7Hmt8=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "9fe1aa7b6a1043003b38f36626dd29b52247d720", "rev": "f430a256db90c7d6035f2d738e2e8acd5c633f16",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -110,11 +110,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745816321, "lastModified": 1746708654,
"narHash": "sha256-Gyh/fkCDqVNGM0BWvk+4UAS17w2UI6iwnbQQCmc1TDI=", "narHash": "sha256-GeC99gu5H6+AjBXsn5dOhP4/ApuioGCBkufdmEIWPRs=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "4515dacafb0ccd42e5395aacc49fd58a43027e01", "rev": "6cb36e8327421c61e5a3bbd08ed63491b616364a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -143,11 +143,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1717312683, "lastModified": 1746162366,
"narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -369,11 +369,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746040799, "lastModified": 1747021744,
"narHash": "sha256-osgPX/SzIpkR50vev/rqoTEAVkEcOWXoQXmbzsaI4KU=", "narHash": "sha256-IDsM/9/tHQBlhG3tXI2fTM84AUN1uRa7JDPT1LMlGes=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5f217e5a319f6c186283b530f8c975e66c028433", "rev": "fb061f555f821fe4fb49f8f6f2a0cc3d5728bd52",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -407,15 +407,15 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1737234286, "lastModified": 1746827285,
"narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=", "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=",
"rev": "079528098f5998ba13c88821a2eca1005c1695de", "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz" "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz"
} }
}, },
"lix-module": { "lix-module": {
@ -428,15 +428,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742943028, "lastModified": 1746838955,
"narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=", "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=",
"rev": "868d97695bab9d21f6070b03957bcace249fbe3c", "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/868d97695bab9d21f6070b03957bcace249fbe3c.tar.gz?rev=868d97695bab9d21f6070b03957bcace249fbe3c" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz" "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"
} }
}, },
"nixgl": { "nixgl": {
@ -460,11 +460,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1745930157, "lastModified": 1746904237,
"narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -492,11 +492,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1746055187, "lastModified": 1746810718,
"narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", "narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", "rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -508,11 +508,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1745930157, "lastModified": 1746904237,
"narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -555,11 +555,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1745930157, "lastModified": 1746904237,
"narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -607,11 +607,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746067100, "lastModified": 1747017456,
"narHash": "sha256-6JeEbboDvRjLwB9kzCnmWj+f+ZnMtKOe5c2F1VBpaTs=", "narHash": "sha256-C/U12fcO+HEF071b5mK65lt4XtAIZyJSSJAg9hdlvTk=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "026e8fedefd6b167d92ed04b195c658d95ffc7a5", "rev": "5b07506ae89b025b14de91f697eba23b48654c52",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -660,11 +660,11 @@
"tinted-tmux": "tinted-tmux" "tinted-tmux": "tinted-tmux"
}, },
"locked": { "locked": {
"lastModified": 1745893500, "lastModified": 1746143246,
"narHash": "sha256-MXkFfYmufV7UA1/UY3Hw/+bBv9gNvR4vqJi6wEu3yJA=", "narHash": "sha256-O8rZjqJUIkUva66XTOZy0wcgfBP2eaxU9+Xt7ZHtfhI=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "eb8366e23f7f4c779711965371c20da1279d9c20", "rev": "20ace60f9cb5e179cb2256abaee505780df8e804",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -5,7 +5,7 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
lix-module = { lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz"; url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager = { home-manager = {
@ -61,7 +61,7 @@
modules = [ modules = [
./machines/mal/configuration.nix ./machines/mal/configuration.nix
lix-module.nixosModules.default # lix-module.nixosModules.default
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {

View file

@ -53,7 +53,7 @@
# Software Dev # Software Dev
tig tig
mold # mold
# language servers # language servers
efm-langserver efm-langserver

View file

@ -48,22 +48,17 @@ in {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
pinentry_mac pinentry_mac
# llvmPackages_19.clang-tools
fnm fnm
pipenv pipenv
sketchybar sketchybar
# sbarlua
lua lua
# android-tools
jdk17 jdk17
# distrobox
conan conan
deno deno
@ -100,10 +95,7 @@ in {
"unzip" "unzip"
"xz" "xz"
"podman" "llvm"
"llvm@18"
"llvm@19"
]; ];
casks = [ casks = [

View file

@ -39,7 +39,7 @@
sessionVariables = { sessionVariables = {
ANDROID_HOME = "/Users/tyler.mayoff/Library/Android/sdk"; ANDROID_HOME = "/Users/tyler.mayoff/Library/Android/sdk";
PATH = "$PATH:/opt/homebrew/opt/llvm@18/bin:/Users/tyler.mayoff/Library/Android/sdk/platform-tools"; PATH = "/opt/homebrew/opt/llvm@20/bin:$PATH::/Users/tyler.mayoff/Library/Android/sdk/platform-tools";
}; };
file.".gnupg/gpg-agent.conf".text = '' file.".gnupg/gpg-agent.conf".text = ''

View file

@ -156,6 +156,38 @@ in {
}; };
}; };
systemd.services."restore-nextcloud" = {
script = ''
# Remove keys
${secrets}
printf "\nRestore nextcloud \n"
${pkgs.restic}/bin/restic -r "$RESTIC_REPOSITORY/NextCloud" restore latest -vvv --target /
# ${pkgs.restic}/bin/restic -r "$RESTIC_REPOSITORY/NextCloud" check -vvv
'';
serviceConfig = {
Type = "simple";
User = "root";
};
};
systemd.services."restore-backups" = {
script = ''
# Remove keys
${secrets}
printf "\nRestore nextcloud \n"
${pkgs.restic}/bin/restic -r "$RESTIC_REPOSITORY/Backups" restore latest -vvv --target /
# ${pkgs.restic}/bin/restic -r "$RESTIC_REPOSITORY/NextCloud" check -vvv
'';
serviceConfig = {
Type = "simple";
User = "root";
};
};
programs.fish.enable = true; programs.fish.enable = true;
# List services that you want to enable: # List services that you want to enable:

View file

@ -28,23 +28,11 @@
options = ["fmask=0022" "dmask=0022"]; options = ["fmask=0022" "dmask=0022"];
}; };
fileSystems."/mnt/store" = { fileSystems."/mnt/user" = {
device = "nix-store"; device = "array";
fsType = "9p"; fsType = "9p";
}; };
fileSystems."/nix/store" = {
depends = [
"/mnt/store"
];
device = "/mnt/store";
fsType = "none";
options = [
"bind"
];
};
swapDevices = []; swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

View file

@ -21,7 +21,6 @@
homeDirectory = "/home/tyler"; homeDirectory = "/home/tyler";
packages = with pkgs; [ packages = with pkgs; [
ventoy
nom nom
# (config.lib.nixGL.wrap renderdoc) # (config.lib.nixGL.wrap renderdoc)
]; ];