Merge branch 'master' of ssh://git.joshuabell.xyz:3032/ringofstorms/dotfiles

This commit is contained in:
RingOfStorms (Joshua Bell) 2026-01-16 12:04:03 -06:00
commit 28656f137d
20 changed files with 4499 additions and 102 deletions

165
hosts/juni/flake.lock generated
View file

@ -6,11 +6,11 @@
},
"locked": {
"dir": "flakes/beszel",
"lastModified": 1768000280,
"narHash": "sha256-JegPSldfsBcANqnV53mEAQOx/Fv22hUd0G2VTZGUR8Y=",
"lastModified": 1768431400,
"narHash": "sha256-g4YBBC4SqGIkApJIN5w+JczHEQiDGJDkIH3nYKUGqgc=",
"ref": "refs/heads/master",
"rev": "a4e2cc00d86d2f3401918cfdf9f0643939871a42",
"revCount": 1115,
"rev": "e8c7befd8804c4d836d6ac4bcbbc37d337b77f53",
"revCount": 1141,
"type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
},
@ -38,19 +38,28 @@
},
"common": {
"locked": {
"dir": "flakes/common",
"lastModified": 1768255305,
"narHash": "sha256-XcXl5M0WNYhCCqE9qc9Aj2/2Jb/T0NHZnu2ZuVBvlHw=",
"ref": "refs/heads/master",
"rev": "15769eda748f6fcc6fdab04f79f14ed9b1ffc548",
"revCount": 1125,
"type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
"path": "../../flakes/common",
"type": "path"
},
"original": {
"dir": "flakes/common",
"type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
"path": "../../flakes/common",
"type": "path"
},
"parent": []
},
"crane": {
"locked": {
"lastModified": 1768319649,
"narHash": "sha256-VFkNyxHxkqGp8gf8kfFMW1j6XeBy609kv6TE9uF/0Js=",
"owner": "ipetkov",
"repo": "crane",
"rev": "4b6527687cfd20da3c2ef8287e01b74c2d6c705b",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"de_plasma": {
@ -58,19 +67,31 @@
"plasma-manager": "plasma-manager"
},
"locked": {
"dir": "flakes/de_plasma",
"lastModified": 1768255305,
"narHash": "sha256-XcXl5M0WNYhCCqE9qc9Aj2/2Jb/T0NHZnu2ZuVBvlHw=",
"ref": "refs/heads/master",
"rev": "15769eda748f6fcc6fdab04f79f14ed9b1ffc548",
"revCount": 1125,
"type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
"path": "../../flakes/de_plasma",
"type": "path"
},
"original": {
"dir": "flakes/de_plasma",
"type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
"path": "../../flakes/de_plasma",
"type": "path"
},
"parent": []
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flatpaks": {
@ -79,11 +100,11 @@
},
"locked": {
"dir": "flakes/flatpaks",
"lastModified": 1768000280,
"narHash": "sha256-JegPSldfsBcANqnV53mEAQOx/Fv22hUd0G2VTZGUR8Y=",
"lastModified": 1768431400,
"narHash": "sha256-g4YBBC4SqGIkApJIN5w+JczHEQiDGJDkIH3nYKUGqgc=",
"ref": "refs/heads/master",
"rev": "a4e2cc00d86d2f3401918cfdf9f0643939871a42",
"revCount": 1115,
"rev": "e8c7befd8804c4d836d6ac4bcbbc37d337b77f53",
"revCount": 1141,
"type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
},
@ -192,11 +213,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1767185284,
"narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=",
"lastModified": 1768397375,
"narHash": "sha256-7QqbFi3ERvKjEdAzEYPv7iSGwpUKSrQW5wPLMFq45AQ=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "40b1a28dce561bea34858287fbb23052c3ee63fe",
"rev": "efe2094529d69a3f54892771b6be8ee4a0ebef0f",
"type": "github"
},
"original": {
@ -224,11 +245,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1767892417,
"narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=",
"lastModified": 1768127708,
"narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
"rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38",
"type": "github"
},
"original": {
@ -272,11 +293,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1767799921,
"narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
"lastModified": 1768323494,
"narHash": "sha256-yBXJLE6WCtrGo7LKiB6NOt6nisBEEkguC/lq/rP3zRQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
"rev": "2c3e5ec5df46d3aeee2a1da0bfedd74e21f4bf3a",
"type": "github"
},
"original": {
@ -288,11 +309,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1767364772,
"narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
"lastModified": 1768302833,
"narHash": "sha256-h5bRFy9bco+8QcK7rGoOiqMxMbmn21moTACofNLRMP4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
"rev": "61db79b0c6b838d9894923920b612048e1201926",
"type": "github"
},
"original": {
@ -318,6 +339,22 @@
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1768127708,
"narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nvim_plugin-Almo7aya/openingh.nvim": {
"flake": false,
"locked": {
@ -1187,15 +1224,15 @@
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1767994684,
"narHash": "sha256-UIijTI9ndnvhRC4tJDiSc19iMxeZZbDjkYTnfCbJpV8=",
"owner": "sst",
"lastModified": 1768427084,
"narHash": "sha256-v+42hqkPtOo0jAPZoqSc3eifsjPsdOPK5YXAyOkQc2s=",
"owner": "anomalyco",
"repo": "opencode",
"rev": "563b4c33f2bace782403de88e60de4f9167a3c93",
"rev": "096e14d787adf10a9a8e0815d92ad3b19e274bfc",
"type": "github"
},
"original": {
"owner": "sst",
"owner": "anomalyco",
"repo": "opencode",
"type": "github"
}
@ -1232,7 +1269,8 @@
"nixpkgs-unstable": "nixpkgs-unstable",
"opencode": "opencode",
"ros_neovim": "ros_neovim",
"secrets-bao": "secrets-bao"
"secrets-bao": "secrets-bao",
"stt_ime": "stt_ime"
}
},
"ros_neovim": {
@ -1339,6 +1377,37 @@
"type": "path"
},
"parent": []
},
"stt_ime": {
"inputs": {
"crane": "crane",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_7"
},
"locked": {
"path": "../../flakes/stt_ime",
"type": "path"
},
"original": {
"path": "../../flakes/stt_ime",
"type": "path"
},
"parent": []
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

View file

@ -9,18 +9,20 @@
impermanence.url = "github:nix-community/impermanence";
# Use relative to get current version for testin
# common.url = "path:../../flakes/common";
common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/common";
common.url = "path:../../flakes/common";
# common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/common";
# secrets-bao.url = "path:../../flakes/secrets-bao";
secrets-bao.url = "path:../../flakes/secrets-bao";
# flatpaks.url = "path:../../flakes/flatpaks";
flatpaks.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/flatpaks";
# beszel.url = "path:../../flakes/beszel";
beszel.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/beszel";
# de_plasma.url = "path:../../flakes/de_plasma";
de_plasma.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/de_plasma";
de_plasma.url = "path:../../flakes/de_plasma";
# de_plasma.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/de_plasma";
stt_ime.url = "path:../../flakes/stt_ime";
# stt_ime.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/stt_ime";
opencode.url = "github:sst/opencode";
opencode.url = "github:anomalyco/opencode";
ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim";
};
@ -63,12 +65,19 @@
gpu.intel.enable = true;
sddm.autologinUser = "josh";
wallpapers = [
../../_shared_assets/wallpapers/pixel_neon.png
../../_shared_assets/wallpapers/pixel_neon_v.png
../../hosts/_shared_assets/wallpapers/pixel_neon.png
../../hosts/_shared_assets/wallpapers/pixel_neon_v.png
];
};
})
inputs.common.nixosModules.jetbrains_font
inputs.stt_ime.nixosModules.default
({
ringofstorms.sttIme = {
enable = true;
model = "tiny.en";
};
})
inputs.ros_neovim.nixosModules.default
({

View file

@ -108,6 +108,7 @@ lib.mkMerge [
serviceConfig.KeyringMode = "shared";
};
# Resets my root to a fresh snapshot. I do this my simply moving root to an old snapshots directory
boot.initrd.systemd.services.bcachefs-reset-root = {
description = "Reset bcachefs root subvolume before pivot";
@ -171,14 +172,8 @@ lib.mkMerge [
'';
};
})
# If you mess up decruption password this reboots for retry instead of getting stuck
(lib.mkIf ENCRYPTED {
boot.kernelParams = [
"rd.shell=0"
"rd.emergency=reboot"
];
})
# Bcachefs auto decryption / unlock
# Bcachefs auto decryption / unlock (will use usb key if provided above, else just prompts password)
# We use this for password instead of the default one because default doesn't let you retry if you misstype the password
(lib.mkIf ENCRYPTED {
boot.supportedFilesystems = [
"bcachefs"

View file

@ -32,8 +32,6 @@
files = [
"/machine-key.json"
"/etc/machine-id"
"/etc/localtime"
"/etc/timezone"
"/etc/adjtime"
# NOTE: if you want mutable passwords across reboots, persist these,
# but you must do a one-time migration (see notes in chat).
@ -55,6 +53,9 @@
".local/share/zoxide"
# Hugging Face cache (e.g. whisper.cpp models via hf-hub)
".cache/huggingface"
".config/opencode"
# KDE
@ -65,12 +66,14 @@
# neovim ros_neovim
".local/state/nvim_ringofstorms_helium"
".local/state/opencode"
".local/share/flatpak"
".var/app"
];
files = [
# ".config/kglobalshortcutsrc"
# ".config/plasma-org.kde.plasma.desktop-appletsrc"
];
};
};

118
hosts/lio/flake.lock generated
View file

@ -87,6 +87,21 @@
"type": "github"
}
},
"crane_2": {
"locked": {
"lastModified": 1768319649,
"narHash": "sha256-VFkNyxHxkqGp8gf8kfFMW1j6XeBy609kv6TE9uF/0Js=",
"owner": "ipetkov",
"repo": "crane",
"rev": "4b6527687cfd20da3c2ef8287e01b74c2d6c705b",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"darwin": {
"inputs": {
"nixpkgs": [
@ -116,20 +131,14 @@
"plasma-manager": "plasma-manager"
},
"locked": {
"dir": "flakes/de_plasma",
"lastModified": 1768233301,
"narHash": "sha256-m7Og7WuCT8VdQdLhsR6J7ZCR+aFM5ddJ7A1Kt2LBXQs=",
"ref": "refs/heads/master",
"rev": "128209e4aa8927b7514bcfd2acaf097ac0d59310",
"revCount": 1122,
"type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
"path": "../../flakes/de_plasma",
"type": "path"
},
"original": {
"dir": "flakes/de_plasma",
"type": "git",
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
}
"path": "../../flakes/de_plasma",
"type": "path"
},
"parent": []
},
"flake-utils": {
"inputs": {
@ -149,6 +158,24 @@
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flatpaks": {
"inputs": {
"nix-flatpak": "nix-flatpak"
@ -315,11 +342,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1767273430,
"narHash": "sha256-kDpoFwQ8GLrPiS3KL+sAwreXrph2KhdXuJzo5+vSLoo=",
"lastModified": 1768302833,
"narHash": "sha256-h5bRFy9bco+8QcK7rGoOiqMxMbmn21moTACofNLRMP4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "76eec3925eb9bbe193934987d3285473dbcfad50",
"rev": "61db79b0c6b838d9894923920b612048e1201926",
"type": "github"
},
"original": {
@ -361,6 +388,22 @@
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1768127708,
"narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nvim_plugin-Almo7aya/openingh.nvim": {
"flake": false,
"locked": {
@ -1230,16 +1273,15 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1767388146,
"narHash": "sha256-E4Zce3466wABErQl0wMm+09BbH06FFShUCdJGcSqmQk=",
"owner": "sst",
"lastModified": 1768396176,
"narHash": "sha256-JqLZY6/s3O5IVNjZs4vi4BGQhA730aLLMA7DgENCTTU=",
"owner": "anomalyco",
"repo": "opencode",
"rev": "0cf0294787322664c6d668fa5ab0a9ce26796f78",
"rev": "ee6ca104e5eb1693b63901128ea315754f88f595",
"type": "github"
},
"original": {
"owner": "sst",
"ref": "latest",
"owner": "anomalyco",
"repo": "opencode",
"type": "github"
}
@ -1297,7 +1339,8 @@
"opencode": "opencode",
"ros_neovim": "ros_neovim",
"secrets": "secrets",
"secrets-bao": "secrets-bao"
"secrets-bao": "secrets-bao",
"stt_ime": "stt_ime"
}
},
"ros_neovim": {
@ -1447,6 +1490,22 @@
},
"parent": []
},
"stt_ime": {
"inputs": {
"crane": "crane_2",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_7"
},
"locked": {
"path": "../../flakes/stt_ime",
"type": "path"
},
"original": {
"path": "../../flakes/stt_ime",
"type": "path"
},
"parent": []
},
"systems": {
"locked": {
"lastModified": 1681028828,
@ -1476,6 +1535,21 @@
"repo": "default",
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

View file

@ -16,10 +16,12 @@
flatpaks.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/flatpaks";
# beszel.url = "path:../../flakes/beszel";
beszel.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/beszel";
# de_plasma.url = "path:../../flakes/de_plasma";
de_plasma.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/de_plasma";
de_plasma.url = "path:../../flakes/de_plasma";
# de_plasma.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/de_plasma";
stt_ime.url = "path:../../flakes/stt_ime";
# stt_ime.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/stt_ime";
opencode.url = "github:sst/opencode?ref=latest";
opencode.url = "github:anomalyco/opencode";
ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim";
};
@ -69,6 +71,15 @@
# sddm.autologinUser = "josh";
};
})
inputs.stt_ime.nixosModules.default
({
ringofstorms.sttIme = {
enable = true;
gpuBackend = "hip"; # Use AMD ROCm/HIP acceleration
useGpu = true;
};
})
secrets.nixosModules.default
ros_neovim.nixosModules.default
({