ringofstorms/dotfiles
ringofstorms/dotfiles
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: ringofstorms:ef64efbb6e7d735d859830065a59374aa0496b70
Branches Tags
ringofstorms:master
..
compare: ringofstorms:a4e2cc00d86d2f3401918cfdf9f0643939871a42
Branches Tags
ringofstorms:master

2 commits
ef64efbb6e ... a4e2cc00d8

Author SHA1 Message Date
RingOfStorms (Joshua Bell)
a4e2cc00d8 Merge branch 'master' of ssh://git.joshuabell.xyz:3032/ringofstorms/dotfiles 2026-01-09 17:11:20 -06:00
RingOfStorms (Joshua Bell)
cb139caee1 just use open code directly isntead of useless pass through 2026-01-09 17:11:20 -06:00
5 changed files with 49 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

45
flakes/opencode/flake.lock generated
View file

@ -1,45 +0,0 @@
{
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1767364772,
"narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"opencode": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1767823467,
"narHash": "sha256-RLTgTjLdPpekYWaNxXRQPBS3phnfBK1LvjSgieKcrfs=",
"owner": "sst",
"repo": "opencode",
"rev": "361a96267334fcfc524cc5377dbbfd7d92254f62",
"type": "github"
},
"original": {
"owner": "sst",
"repo": "opencode",
"type": "github"
}
},
"root": {
"inputs": {
"opencode": "opencode"
}
}
},
"root": "root",
"version": 7
}

27
flakes/opencode/flake.nix
View file

@ -1,27 +0,0 @@
{
inputs = {
opencode.url = "github:sst/opencode";
};
outputs =
{ opencode, ... }:
{
nixosModules = {
default =
{
pkgs,
...
}:
{
environment.systemPackages = [
opencode.packages.${pkgs.system}.default
];
environment.shellAliases = {
"oc" = "all_proxy='' http_proxy='' https_proxy='' opencode";
"occ" = "oc -c";
};
};
};
};
}

5
hosts/juni/flake.nix
View file

@ -323,6 +323,11 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -euo pipefail set -euo pipefail
if ! ${pkgs.iputils}/bin/ping -c1 -W2 1.1.1.1 &>/dev/null; then
echo "No network access, skipping atuin login"
exit 0
fi
secret="/run/secrets/atuin-key-josh" secret="/run/secrets/atuin-key-josh"
if [ ! -s "$secret" ]; then if [ ! -s "$secret" ]; then
echo "Missing atuin secret at $secret" >&2 echo "Missing atuin secret at $secret" >&2

82
hosts/lio/flake.lock generated
View file

@ -31,11 +31,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/beszel", "dir": "flakes/beszel",
"lastModified": 1767740224, "lastModified": 1767999509,
"narHash": "sha256-7yUQUw/7IMTBHy2EtuDggE8+NwUN3vDH5fwiTQDIrsI=", "narHash": "sha256-01YDV5RSAOQQnbV24wKAYsp/unUhMkbIIe3slBVmZvI=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "4bc645061b8c3108fdb3ee92a61dbe3e98ecdaea", "rev": "ef64efbb6e7d735d859830065a59374aa0496b70",
"revCount": 1082, "revCount": 1113,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -117,11 +117,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/de_plasma", "dir": "flakes/de_plasma",
"lastModified": 1767740224, "lastModified": 1767999509,
"narHash": "sha256-7yUQUw/7IMTBHy2EtuDggE8+NwUN3vDH5fwiTQDIrsI=", "narHash": "sha256-01YDV5RSAOQQnbV24wKAYsp/unUhMkbIIe3slBVmZvI=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "4bc645061b8c3108fdb3ee92a61dbe3e98ecdaea", "rev": "ef64efbb6e7d735d859830065a59374aa0496b70",
"revCount": 1082, "revCount": 1113,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -155,11 +155,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/flatpaks", "dir": "flakes/flatpaks",
"lastModified": 1767740224, "lastModified": 1767999509,
"narHash": "sha256-7yUQUw/7IMTBHy2EtuDggE8+NwUN3vDH5fwiTQDIrsI=", "narHash": "sha256-01YDV5RSAOQQnbV24wKAYsp/unUhMkbIIe3slBVmZvI=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "4bc645061b8c3108fdb3ee92a61dbe3e98ecdaea", "rev": "ef64efbb6e7d735d859830065a59374aa0496b70",
"revCount": 1082, "revCount": 1113,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },
@ -196,11 +196,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1767619900, "lastModified": 1767910483,
"narHash": "sha256-KpoCBPvwHz3gAQtIUkohE2InRBFK3r0/FM6z5SPWfvM=", "narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=",
"owner": "rycee", "owner": "rycee",
"repo": "home-manager", "repo": "home-manager",
"rev": "6bd04da47cfb48dfd15eabf08364b78ad894f5b2", "rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -267,11 +267,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1767640445, "lastModified": 1767892417,
"narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=", "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5", "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -283,11 +283,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1767325753, "lastModified": 1767799921,
"narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=", "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "64049ca74d63e971b627b5f3178d95642e61cedd", "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -299,11 +299,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1767480499, "lastModified": 1767799921,
"narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=", "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92", "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1226,35 +1226,15 @@
} }
}, },
"opencode": { "opencode": {
"inputs": {
"opencode": "opencode_2"
},
"locked": {
"dir": "flakes/opencode",
"lastModified": 1767824427,
"narHash": "sha256-DIe2X3sIuH3KJThL6xQ6sW3+c11DbvMMiCueM/8K7nU=",
"ref": "refs/heads/master",
"rev": "bcf5891fc4aaaa249af532124683f9bdb0d6cd10",
"revCount": 1107,
"type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
},
"original": {
"dir": "flakes/opencode",
"type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}
},
"opencode_2": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1767823467, "lastModified": 1767994684,
"narHash": "sha256-RLTgTjLdPpekYWaNxXRQPBS3phnfBK1LvjSgieKcrfs=", "narHash": "sha256-UIijTI9ndnvhRC4tJDiSc19iMxeZZbDjkYTnfCbJpV8=",
"owner": "sst", "owner": "sst",
"repo": "opencode", "repo": "opencode",
"rev": "361a96267334fcfc524cc5377dbbfd7d92254f62", "rev": "563b4c33f2bace782403de88e60de4f9167a3c93",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1441,11 +1421,11 @@
}, },
"locked": { "locked": {
"dir": "flakes/secrets", "dir": "flakes/secrets",
"lastModified": 1767740224, "lastModified": 1767999509,
"narHash": "sha256-7yUQUw/7IMTBHy2EtuDggE8+NwUN3vDH5fwiTQDIrsI=", "narHash": "sha256-01YDV5RSAOQQnbV24wKAYsp/unUhMkbIIe3slBVmZvI=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "4bc645061b8c3108fdb3ee92a61dbe3e98ecdaea", "rev": "ef64efbb6e7d735d859830065a59374aa0496b70",
"revCount": 1082, "revCount": 1113,
"type": "git", "type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}, },

17
hosts/lio/flake.nix
View file

@ -18,9 +18,8 @@
beszel.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/beszel"; beszel.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/beszel";
# de_plasma.url = "path:../../flakes/de_plasma"; # de_plasma.url = "path:../../flakes/de_plasma";
de_plasma.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/de_plasma"; de_plasma.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/de_plasma";
# opencode.url = "path:../../flakes/opencode";
opencode.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/opencode";
opencode.url = "github:sst/opencode";
ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim";
}; };
@ -34,7 +33,6 @@
beszel, beszel,
ros_neovim, ros_neovim,
nixpkgs-unstable, nixpkgs-unstable,
opencode,
... ...
}@inputs: }@inputs:
let let
@ -76,7 +74,6 @@
({ ({
ringofstorms-nvim.includeAllRuntimeDependencies = true; ringofstorms-nvim.includeAllRuntimeDependencies = true;
}) })
inputs.opencode.nixosModules.default
flatpaks.nixosModules.default flatpaks.nixosModules.default
common.nixosModules.essentials common.nixosModules.essentials
@ -98,6 +95,18 @@
common.nixosModules.more_filesystems common.nixosModules.more_filesystems
inputs.secrets-bao.nixosModules.default inputs.secrets-bao.nixosModules.default
(
{ pkgs, ... }:
{
environment.systemPackages = [
inputs.opencode.packages.${pkgs.system}.default
];
environment.shellAliases = {
"oc" = "all_proxy='' http_proxy='' https_proxy='' opencode";
"occ" = "oc -c";
};
}
)
( (
{ inputs, lib, ... }: { inputs, lib, ... }:
let let