diff --git a/hosts/h001/flake.lock b/hosts/h001/flake.lock index 8c56ac2..e7e5257 100644 --- a/hosts/h001/flake.lock +++ b/hosts/h001/flake.lock @@ -28,15 +28,16 @@ "common": { "inputs": { "home-manager": "home-manager", + "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" }, "locked": { - "lastModified": 1746294278, - "narHash": "sha256-9QKEwS915nNTnubx5cs3L9c6E2vjvqK5bT3o79p6pvE=", + "lastModified": 1750459395, + "narHash": "sha256-i6Khg4dcHXl6keWUW8vv7+aUAFdM+1rahFg59qx2xQ8=", "ref": "refs/heads/master", - "rev": "9039afca2a9f1eef4e5167557d1306e9bde8c095", - "revCount": 445, + "rev": "1b02f9ea95ec7e81a45ec40159991065856482b7", + "revCount": 489, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -107,16 +108,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1744743431, - "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", + "lastModified": 1749154018, + "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "owner": "rycee", "repo": "home-manager", - "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", + "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "type": "github" }, "original": { "owner": "rycee", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -144,29 +145,65 @@ "type": "github" } }, + "nix-flatpak": { + "locked": { + "lastModified": 1739444422, + "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177", + "type": "github" + }, + "original": { + "owner": "gmodena", + "ref": "latest", + "repo": "nix-flatpak", + "type": "github" + } + }, + "nixarr": { + "inputs": { + "nixpkgs": "nixpkgs_4", + "vpnconfinement": "vpnconfinement", + "website-builder": "website-builder" + }, + "locked": { + "lastModified": 1750367617, + "narHash": "sha256-1kz35TbeqhJMdo1s/WHidoUT64IuoKCGlngv5/JCHiw=", + "owner": "rasmus-kirk", + "repo": "nixarr", + "rev": "450d76583ae6ec025577bde7da2a38cfc7fb0510", + "type": "github" + }, + "original": { + "owner": "rasmus-kirk", + "repo": "nixarr", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1731755305, - "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", + "lastModified": 1749024892, + "narHash": "sha256-OGcDEz60TXQC+gVz5sdtgGJdKVYr6rwdzQKuZAJQpCA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", + "rev": "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "github" }, "original": { @@ -194,11 +231,27 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1750259320, - "narHash": "sha256-H8J4H2XCIMEJ5g6fZ179QfQvsc2dUqhqfBjC8RAHNRY=", + "lastModified": 1748662220, + "narHash": "sha256-7gGa49iB9nCnFk4h/g9zwjlQAyjtpgcFkODjcOQS0Es=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9ba04bda9249d5d5e5238303c9755de5a49a79c5", + "rev": "59138c7667b7970d205d6a05a8bfa2d78caa3643", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1750400657, + "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37", "type": "github" }, "original": { @@ -208,13 +261,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { - "lastModified": 1745250177, - "narHash": "sha256-NPkMDgRHLVuNHs7y/MK3qYbE/5uo42mskUIygSHEOLM=", + "lastModified": 1750188666, + "narHash": "sha256-yAfLvtbCzSigTfbsJeOrvljS7VYLAwi2RZ6F+qd+A5E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d1e61a9c582ec2f701b36d4600ae19b8099c5211", + "rev": "aa36c6c05d04f90cf890f87845be9380cf7b83c2", "type": "github" }, "original": { @@ -226,11 +279,11 @@ "nvim_plugin-Almo7aya/openingh.nvim": { "flake": false, "locked": { - "lastModified": 1744327913, - "narHash": "sha256-WQ7GbrjtikpMnzzME59QSibZI0hjzt/KAGDmXa677Rw=", + "lastModified": 1746139196, + "narHash": "sha256-/FlNLWOSIrOYiWzAcgOdu9//QTorCDV1KWb+h6eqLwk=", "owner": "Almo7aya", "repo": "openingh.nvim", - "rev": "ce19b5ffe09e35cec600ba794df280cbb72c015f", + "rev": "7cc8c897cb6b34d8ed28e99d95baccef609ed251", "type": "github" }, "original": { @@ -242,11 +295,11 @@ "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "flake": false, "locked": { - "lastModified": 1745008876, - "narHash": "sha256-/GdJNqoDpdsPCOjcESbtEEDCz5TYkvbPRY1/T0gF7IY=", + "lastModified": 1750069301, + "narHash": "sha256-lIAsudDunKOY69r00czO+rmMbM+woIdIGroT4dUZAFc=", "owner": "CopilotC-Nvim", "repo": "CopilotChat.nvim", - "rev": "634aa58117a9b70b3f08a0b150f11afd64f1c0eb", + "rev": "5df0b668d23c05c173f6bc79bb19642215b8b66a", "type": "github" }, "original": { @@ -274,11 +327,11 @@ "nvim_plugin-L3MON4D3/LuaSnip": { "flake": false, "locked": { - "lastModified": 1736009707, - "narHash": "sha256-3ecm5SDTcSOh256xSQPHhddQfMpepiEIpv58fHXrVg0=", + "lastModified": 1749564222, + "narHash": "sha256-StttV19d5gWbFPxerCOX3dXIaRwg1oeUANIbNztALps=", "owner": "L3MON4D3", "repo": "LuaSnip", - "rev": "c9b9a22904c97d0eb69ccb9bab76037838326817", + "rev": "fb525166ccc30296fb3457441eb979113de46b00", "type": "github" }, "original": { @@ -290,11 +343,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1744934679, - "narHash": "sha256-rTX+CCVOOU6ZzM5NvymJvOfJF10BRMfl8hdSJz0zw+Q=", + "lastModified": 1749846779, + "narHash": "sha256-j1aslQ3SPD9ZuhQDEt9e5GD+VZ6N6Re7IjVFXycaxWI=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "dfc1299d9f32b53b34b7ac6c3a7553b5fd29977f", + "rev": "76f7ce56ccb913632745714f160faa53164c5574", "type": "github" }, "original": { @@ -306,11 +359,11 @@ "nvim_plugin-MunifTanjim/nui.nvim": { "flake": false, "locked": { - "lastModified": 1741233810, - "narHash": "sha256-BYTY2ezYuxsneAl/yQbwL1aQvVWKSsN3IVqzTlrBSEU=", + "lastModified": 1749392788, + "narHash": "sha256-41slmnvt1z7sCxvpiVuFmQ9g7eCaxQi1dDCL3AxSL1A=", "owner": "MunifTanjim", "repo": "nui.nvim", - "rev": "8d3bce9764e627b62b07424e0df77f680d47ffdb", + "rev": "de740991c12411b663994b2860f1a4fd0937c130", "type": "github" }, "original": { @@ -322,11 +375,11 @@ "nvim_plugin-RRethy/vim-illuminate": { "flake": false, "locked": { - "lastModified": 1744859423, - "narHash": "sha256-zqXKkrUNTH/EIx3PBRN8+mQcbWa6fO9i/UoSeav5R/w=", + "lastModified": 1748105647, + "narHash": "sha256-KqAJRCtDBG5xsvNsqkxoBdDckg02u4NBBreYQw7BphA=", "owner": "RRethy", "repo": "vim-illuminate", - "rev": "1fa4b23409e22a03823648e344c77f260e2572cb", + "rev": "0d1e93684da00ab7c057410fecfc24f434698898", "type": "github" }, "original": { @@ -338,11 +391,11 @@ "nvim_plugin-Saecki/crates.nvim": { "flake": false, "locked": { - "lastModified": 1744379189, - "narHash": "sha256-HsdDeV3mMQwrzlP23bJnNkiSL5OELgn0WBTERxehviE=", + "lastModified": 1748637634, + "narHash": "sha256-sDjG6fjnQsyYtdf7xpmOW193e7USh6ghrFzo6NoLyP8=", "owner": "Saecki", "repo": "crates.nvim", - "rev": "73d2c590c74a0c582144987a4decb4a642755859", + "rev": "5d8b1bef686db0fabe5f1bb593744b617e8f1405", "type": "github" }, "original": { @@ -354,11 +407,11 @@ "nvim_plugin-aznhe21/actions-preview.nvim": { "flake": false, "locked": { - "lastModified": 1740589350, - "narHash": "sha256-MP1hohDL2JFembwW+cb2S+v2Y7j0iZw1jPPKTZiNCWI=", + "lastModified": 1745779150, + "narHash": "sha256-rQjwlu5gQcOvxF72lr9ugPRl0W78wCWGWPhpN1oOMbs=", "owner": "aznhe21", "repo": "actions-preview.nvim", - "rev": "4ab7842eb6a5b6d2b004f8234dcf33382a0fdde2", + "rev": "36513ad213855d497b7dd3391a24d1d75d58e36f", "type": "github" }, "original": { @@ -370,11 +423,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1745020938, - "narHash": "sha256-qDcVJ2RovKSIcUdVnXNcQZHoAf75IqsTMlsclDFrT2U=", + "lastModified": 1750179699, + "narHash": "sha256-EGt75z/NbjzDXxsyXT9Qj2wWOf06ijUr1If5ljmfLqo=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "e623e30df4053cacc67fb7eb04e1bd0fadba52b4", + "rev": "45fd6c22f30487586c771072dc8c5230931e4c7b", "type": "github" }, "original": { @@ -386,11 +439,11 @@ "nvim_plugin-catppuccin/nvim": { "flake": false, "locked": { - "lastModified": 1740764472, - "narHash": "sha256-4h/fzFY8JR9r+QnoiWEqgQKPMuu8i9HTC4v0Jp7iuUo=", + "lastModified": 1749271780, + "narHash": "sha256-wt/Ybjgr4N80B+QsyANs1QezM7PpFceUWSweRFgkhl0=", "owner": "catppuccin", "repo": "nvim", - "rev": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429", + "rev": "fa42eb5e26819ef58884257d5ae95dd0552b9a66", "type": "github" }, "original": { @@ -402,11 +455,11 @@ "nvim_plugin-chrisgrieser/nvim-early-retirement": { "flake": false, "locked": { - "lastModified": 1744450582, - "narHash": "sha256-ybs65ObtjcUBaGglxP3SIpYjlGSEk/MQI9nSN8S3Q1w=", + "lastModified": 1750108178, + "narHash": "sha256-3I7Xup+v9Yq9/nJQ1F5CDW99oFQcxbinv7VQcKeA16Y=", "owner": "chrisgrieser", "repo": "nvim-early-retirement", - "rev": "3b14762a0186b1922cb5ddf3a760d8521c7b3d7e", + "rev": "d9ffd8f70ed6d466cecd3e7e2dd1425b0010932f", "type": "github" }, "original": { @@ -578,11 +631,11 @@ "nvim_plugin-lewis6991/gitsigns.nvim": { "flake": false, "locked": { - "lastModified": 1745219545, - "narHash": "sha256-7WQ428oPr43z01HvNpArZJcUov61/pDtLqJtkEKnBAY=", + "lastModified": 1750058704, + "narHash": "sha256-V9aXXR9ZP2G/XInHt07RylC4rS+AyMXAAfODvC6pVxw=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "2149fc2009d1117d58e86e56836f70c969f60a82", + "rev": "88205953bd748322b49b26e1dfb0389932520dc9", "type": "github" }, "original": { @@ -626,11 +679,11 @@ "nvim_plugin-m4xshen/hardtime.nvim": { "flake": false, "locked": { - "lastModified": 1744007533, - "narHash": "sha256-KCz8UNL7SkI4cP7wKmQPJgkI4TsQftnHjaMSBYCgrOY=", + "lastModified": 1750160168, + "narHash": "sha256-hzFX5mZRxTDDIp/iBVl4lqEaQryLQOe7jFJmXDwq4J8=", "owner": "m4xshen", "repo": "hardtime.nvim", - "rev": "9aaec65de041bddfc4c0af66919030d2950bcea8", + "rev": "b9a989191b3a97c9316a0efea02341c4cdab845a", "type": "github" }, "original": { @@ -658,11 +711,11 @@ "nvim_plugin-mfussenegger/nvim-lint": { "flake": false, "locked": { - "lastModified": 1745090089, - "narHash": "sha256-Pwxk2C5WaaaW7Ookbq2edvLSJh6ZQc3iWMxowHyQkFQ=", + "lastModified": 1749731021, + "narHash": "sha256-V4JJ1VQXoIsUBTxe6ykbkyo6LxEAr+QEIqIV3mA9phs=", "owner": "mfussenegger", "repo": "nvim-lint", - "rev": "d698d3b6fd7b1b85657d05a2a31d843ddb682c63", + "rev": "2b0039b8be9583704591a13129c600891ac2c596", "type": "github" }, "original": { @@ -674,11 +727,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1745050087, - "narHash": "sha256-nkCVQ+TXiaKm17HXaAMVuRMV3Jbxv8aRIO6re4zEgDw=", + "lastModified": 1750024924, + "narHash": "sha256-gmOqCnSLGDNerXyuuNhkyL/pSJitnyqBdWC3LejZoS4=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "69636cedf0d6aabf0eac3dfbce24883fe1051a3d", + "rev": "2fdf224107e5bc29fb5c3a175f5f2c9161b34741", "type": "github" }, "original": { @@ -690,11 +743,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1745247686, - "narHash": "sha256-rnm/BJNMVxcYH/ZXf1HciXgG0UWhAeQQniOaSvi0E40=", + "lastModified": 1750169575, + "narHash": "sha256-lJWMFgQLQhKUuv50WrYXlJ3TFqT04nVbmcBGVDaSz0k=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "b335f1c72877f101248d3b085d4b7da7576361d7", + "rev": "99d3a0f26bfe402f45257c1398287aef252cbe2d", "type": "github" }, "original": { @@ -706,11 +759,11 @@ "nvim_plugin-nosduco/remote-sshfs.nvim": { "flake": false, "locked": { - "lastModified": 1743352525, - "narHash": "sha256-YNqj1vPc2oyVrSgp+huoMkrUAp2Lx3G4W52liOujP6A=", + "lastModified": 1748880705, + "narHash": "sha256-eTnVFOR7FHlkU9kwrk3q3pNo/U8OR2gJrnrMUQKGi2A=", "owner": "nosduco", "repo": "remote-sshfs.nvim", - "rev": "1ae5784bf0729c8b03cb7fe6561508a673c9adc8", + "rev": "6e893c32ff7c5b8d0d501b748c525fa53963fb35", "type": "github" }, "original": { @@ -754,11 +807,11 @@ "nvim_plugin-nvim-lualine/lualine.nvim": { "flake": false, "locked": { - "lastModified": 1744482854, - "narHash": "sha256-XeAFXg6GWzMJV/HzfdCXtv/effAHVU7mioFKTf1kDc8=", + "lastModified": 1749383457, + "narHash": "sha256-2aPgA7riA/FubQpTkqsxLKl7OZ8L6FkucNHc2QEx2HQ=", "owner": "nvim-lualine", "repo": "lualine.nvim", - "rev": "86fe39534b7da729a1ac56c0466e76f2c663dc42", + "rev": "a94fc68960665e54408fe37dcf573193c4ce82c9", "type": "github" }, "original": { @@ -770,11 +823,11 @@ "nvim_plugin-nvim-telescope/telescope-file-browser.nvim": { "flake": false, "locked": { - "lastModified": 1729728595, - "narHash": "sha256-VJbRi91TTOwUkQYyTM6Njl7MtX8/mOjINiqWYWEtyxg=", + "lastModified": 1750040034, + "narHash": "sha256-NHcU3c+1pLeypHr9xXKmqvdwB1QM/vj5axzjpFEQCLQ=", "owner": "nvim-telescope", "repo": "telescope-file-browser.nvim", - "rev": "626998e5c1b71c130d8bc6cf7abb6709b98287bb", + "rev": "7bf55ed0ff5be182ad3301cff266581fc1c56cce", "type": "github" }, "original": { @@ -818,11 +871,11 @@ "nvim_plugin-nvim-telescope/telescope.nvim": { "flake": false, "locked": { - "lastModified": 1742346322, - "narHash": "sha256-GF1zOHZItVZm3bx2wqI4hPj7EXQJ2F9KS4MtaEt2gm0=", + "lastModified": 1747012888, + "narHash": "sha256-JpW0ehsX81yVbKNzrYOe1hdgVMs6oaaxMLH6lECnOJg=", "owner": "nvim-telescope", "repo": "telescope.nvim", - "rev": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5", + "rev": "b4da76be54691e854d3e0e02c36b0245f945c2c7", "type": "github" }, "original": { @@ -834,11 +887,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1745201081, - "narHash": "sha256-zQsqyJgqlvxniKOtwPSzArUaOwvIgo6Xm+oAjAbPda4=", + "lastModified": 1750143568, + "narHash": "sha256-E2YdGlvvpnT/PiayfQldwpbCnjsyNDcoTzxgMf2ajV8=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "be5b788f2dc1522c73fb7afad9092331c8aebe80", + "rev": "d54a1875a91e1a705795ea26074795210b92ce7f", "type": "github" }, "original": { @@ -850,11 +903,11 @@ "nvim_plugin-nvim-tree/nvim-web-devicons": { "flake": false, "locked": { - "lastModified": 1745131674, - "narHash": "sha256-uoT45oaeY5c1+A7pVQIS+Bj9JnrSy9rQAecvaWZht+c=", + "lastModified": 1747360641, + "narHash": "sha256-+RHeFaeCF/iwAf8qAOjbEIl3YcnrBMVfkQnnzDNhyTA=", "owner": "nvim-tree", "repo": "nvim-web-devicons", - "rev": "855c97005c8eebcdd19846f2e54706bffd40ee96", + "rev": "1fb58cca9aebbc4fd32b086cb413548ce132c127", "type": "github" }, "original": { @@ -866,11 +919,11 @@ "nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1744921782, - "narHash": "sha256-w3I3w1SGqtpUnu4KQyaLue+k96XmkgA3+DpxSEjj+WI=", + "lastModified": 1749893617, + "narHash": "sha256-QJAfpVdTHTxjUgggQekRLvNYuvG12gjtfTGybfcFdyo=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "6daca3ad780f045550b820f262002f35175a6c04", + "rev": "1a1a7c5d6d75cb49bf64049dafab15ebe294a79f", "type": "github" }, "original": { @@ -882,11 +935,11 @@ "nvim_plugin-rafamadriz/friendly-snippets": { "flake": false, "locked": { - "lastModified": 1745202387, - "narHash": "sha256-R6xE5vwgFtyEYpET0E4ecZejuV/lNHFkumk+wGf3lbI=", + "lastModified": 1745949052, + "narHash": "sha256-FzApcTbWfFkBD9WsYMhaCyn6ky8UmpUC2io/co/eByM=", "owner": "rafamadriz", "repo": "friendly-snippets", - "rev": "fc8f183479a472df60aa86f00e295462f2308178", + "rev": "572f5660cf05f8cd8834e096d7b4c921ba18e175", "type": "github" }, "original": { @@ -914,11 +967,11 @@ "nvim_plugin-rmagatti/auto-session": { "flake": false, "locked": { - "lastModified": 1745009508, - "narHash": "sha256-NCytp+DiOo3obZeQ9bpaEaNMfstf1Ytn0OR5mAWodLw=", + "lastModified": 1749967462, + "narHash": "sha256-1pIGu/GJ4FiMH/yHhoo6Gu0HLC3rFQiesJBuv8uE7Vw=", "owner": "rmagatti", "repo": "auto-session", - "rev": "71c8af9a99e96b9d2533cf4bac4dfed1eafab923", + "rev": "fffb13dcbe8731b8650e5bf1caa749a485d20556", "type": "github" }, "original": { @@ -978,11 +1031,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1745180802, - "narHash": "sha256-J/GKqn2VHv/ydaFXWCFduV2B7iwZzHtUvFArszxf2Cw=", + "lastModified": 1749498876, + "narHash": "sha256-n1IPUNwD14WlDU4zbgfJuhXQcVMt8oc4wCuUJBPJ+y4=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "372fc521f8421b7830ea6db4d6ea3bae1c77548c", + "rev": "8132ec733eed3bf415b97b76797ca41b59f51d7d", "type": "github" }, "original": { @@ -1007,6 +1060,22 @@ "type": "github" } }, + "nvim_plugin-supermaven-inc/supermaven-nvim": { + "flake": false, + "locked": { + "lastModified": 1728314930, + "narHash": "sha256-1z3WKIiikQqoweReUyK5O8MWSRN5y95qcxM6qzlKMME=", + "owner": "supermaven-inc", + "repo": "supermaven-nvim", + "rev": "07d20fce48a5629686aefb0a7cd4b25e33947d50", + "type": "github" + }, + "original": { + "owner": "supermaven-inc", + "repo": "supermaven-nvim", + "type": "github" + } + }, "nvim_plugin-tpope/vim-sleuth": { "flake": false, "locked": { @@ -1042,11 +1111,11 @@ "nvim_plugin-uga-rosa/ccc.nvim": { "flake": false, "locked": { - "lastModified": 1744103477, - "narHash": "sha256-MSh9tJv9UNfceO1yQIvID36x/fLGmgFcnIzJ9LOog0A=", + "lastModified": 1746537659, + "narHash": "sha256-3TZ8VmvdgQ9n63m78C3r4OIUkVQHTHBvC24ixBdhTig=", "owner": "uga-rosa", "repo": "ccc.nvim", - "rev": "af2cf5a963f401aad868c065222ee13d4bbc9050", + "rev": "9d1a256e006decc574789dfc7d628ca11644d4c2", "type": "github" }, "original": { @@ -1071,22 +1140,6 @@ "type": "github" } }, - "nvim_plugin-yetone/avante.nvim": { - "flake": false, - "locked": { - "lastModified": 1744881650, - "narHash": "sha256-BzRFgcBG4vn7mamwLvviMl4erTPwg+1AkAb3Ss4Kq8E=", - "owner": "yetone", - "repo": "avante.nvim", - "rev": "eb1cd44731783024621beafe4e46204cbc9a4320", - "type": "github" - }, - "original": { - "owner": "yetone", - "repo": "avante.nvim", - "type": "github" - } - }, "nvim_plugin-zbirenbaum/copilot-cmp": { "flake": false, "locked": { @@ -1106,11 +1159,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1745111203, - "narHash": "sha256-PaWWT0mSsTfnBMrmHagHgemGN5Be6rbikVVW4ZBK/Zs=", + "lastModified": 1749137204, + "narHash": "sha256-qxHpIsFFLDG/jtk6e1hkOZgDSRA5Q0+DMxxAxckNhIc=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "dc579f98536029610cfa32c6bad86c0d24363679", + "rev": "c1bb86abbed1a52a11ab3944ef00c8410520543d", "type": "github" }, "original": { @@ -1128,11 +1181,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1741508717, - "narHash": "sha256-iQf1WdNxaApOFHIx4RLMRZ4f8g+8Xp0Z1/E/Mz2rLxY=", + "lastModified": 1744897914, + "narHash": "sha256-GIVU92o2TZBnKQXTb76zpQbWR4zjU2rFqWKNIIpXnqA=", "owner": "yaxitech", "repo": "ragenix", - "rev": "2a2bea99d74927e54adf53cbf113219def67d5c9", + "rev": "40f2e17ecaeab4d78ec323e96a04548c0aaa5223", "type": "github" }, "original": { @@ -1144,13 +1197,14 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_4", + "nixarr": "nixarr", + "nixpkgs": "nixpkgs_5", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", @@ -1200,21 +1254,21 @@ "nvim_plugin-sindrets/diffview.nvim": "nvim_plugin-sindrets/diffview.nvim", "nvim_plugin-stevearc/conform.nvim": "nvim_plugin-stevearc/conform.nvim", "nvim_plugin-stevearc/dressing.nvim": "nvim_plugin-stevearc/dressing.nvim", + "nvim_plugin-supermaven-inc/supermaven-nvim": "nvim_plugin-supermaven-inc/supermaven-nvim", "nvim_plugin-tpope/vim-sleuth": "nvim_plugin-tpope/vim-sleuth", "nvim_plugin-tpope/vim-surround": "nvim_plugin-tpope/vim-surround", "nvim_plugin-uga-rosa/ccc.nvim": "nvim_plugin-uga-rosa/ccc.nvim", "nvim_plugin-windwp/nvim-ts-autotag": "nvim_plugin-windwp/nvim-ts-autotag", - "nvim_plugin-yetone/avante.nvim": "nvim_plugin-yetone/avante.nvim", "nvim_plugin-zbirenbaum/copilot-cmp": "nvim_plugin-zbirenbaum/copilot-cmp", "nvim_plugin-zbirenbaum/copilot.lua": "nvim_plugin-zbirenbaum/copilot.lua", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1745585761, - "narHash": "sha256-xS3068xhndFrZh9GcTTNTmeebGq1A3uVykRRdzJOj3Y=", + "lastModified": 1750190298, + "narHash": "sha256-ero30lVvCzmdKkY0lZR/RO+oTNTY1WXQh6vhfbcbTIk=", "ref": "refs/heads/master", - "rev": "e5523910a0c07c88d026d006f5962434bfa53548", - "revCount": 277, + "rev": "1ed03dac446683ef42035b53a410d857855d82d9", + "revCount": 291, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, @@ -1253,11 +1307,11 @@ ] }, "locked": { - "lastModified": 1745207416, - "narHash": "sha256-2g2TnXgJEvSvpk7ujY69pSplmM3oShhoOidZf1iHTHU=", + "lastModified": 1750127910, + "narHash": "sha256-FIgEIS0RAlOyXGqoj/OufTfcKItYq668yPYL4SXdU0M=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "68a0ff1a43d08aa1ec3730e7e7d06f6da0ba630a", + "rev": "45418795a73b77b7726c62ce265d68cf541ffb49", "type": "github" }, "original": { @@ -1295,6 +1349,42 @@ "repo": "default", "type": "github" } + }, + "vpnconfinement": { + "locked": { + "lastModified": 1743810720, + "narHash": "sha256-kbv/W4gizUSa6qH2rUQdgPj9AJaeN9k2XSWUYqj7IMU=", + "owner": "Maroka-chan", + "repo": "VPN-Confinement", + "rev": "74ae51e6d18b972ecc918ab43e8bde60c21a65d8", + "type": "github" + }, + "original": { + "owner": "Maroka-chan", + "repo": "VPN-Confinement", + "type": "github" + } + }, + "website-builder": { + "inputs": { + "nixpkgs": [ + "nixarr", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1750317638, + "narHash": "sha256-B4RWcXXOLO6gMeYyV+K4olu+kGGsYamKH+JAm0cIXqI=", + "owner": "rasmus-kirk", + "repo": "website-builder", + "rev": "b54192000a00e865947f45bacf3184d56363ee38", + "type": "github" + }, + "original": { + "owner": "rasmus-kirk", + "repo": "website-builder", + "type": "github" + } } }, "root": "root", diff --git a/hosts/h001/mods/adguardhome.nix b/hosts/h001/mods/adguardhome.nix index 24d4436..d6d7c71 100644 --- a/hosts/h001/mods/adguardhome.nix +++ b/hosts/h001/mods/adguardhome.nix @@ -41,7 +41,7 @@ services.nginx = { virtualHosts = { - "h001.net.joshuabell.xyz " = { + "h001.net.joshuabell.xyz" = { locations."/" = { proxyPass = "http://localhost:3000"; }; diff --git a/hosts/h001/mods/nixarr.nix b/hosts/h001/mods/nixarr.nix index 352f549..ea06e5e 100644 --- a/hosts/h001/mods/nixarr.nix +++ b/hosts/h001/mods/nixarr.nix @@ -5,10 +5,11 @@ config = { nixarr = { enable = true; - mediaDir = "/var/lib/nixarr/media"; + mediaDir = "/drives/wd10/nixarr/media"; stateDir = "/var/lib/nixarr/state"; jellyfin.enable = true; # jellyfinnnnnn! + jellyseerr.enable = true; # request manager for media sabnzbd.enable = true; # Usenet downloader prowlarr.enable = true; # Index manager sonarr.enable = true; # TV @@ -16,7 +17,81 @@ bazarr.enable = true; # subtitles for sonarr and radarr lidarr.enable = true; # music readarr.enable = true; # books - jellyseerr.enable = true; # request manager for media + }; + + services.nginx = { + virtualHosts = { + "jellyfin.joshuabell.xyz" = { + locations."/" = { + proxyWebsockets = true; + proxyPass = "http://localhost:8096"; + }; + }; + "media.joshuabell.xyz" = { + locations."/" = { + proxyWebsockets = true; + proxyPass = "http://localhost:5055"; + }; + }; + "100.64.0.13" = { + locations = { + "/jellyfin" = { + proxyPass = "http://localhost:8096"; + extraConfig = '' + rewrite ^/jellyfin/(.*) /$1 break; + ''; + }; + "/jellyseerr" = { + proxyPass = "http://localhost:5055"; + extraConfig = '' + rewrite ^/jellyseerr/(.*) /$1 break; + ''; + }; + "/sabnzbd" = { + proxyPass = "http://localhost:6336"; + extraConfig = '' + rewrite ^/sabnzbd/(.*) /$1 break; + ''; + }; + "/prowlarr" = { + proxyPass = "http://localhost:9696"; + extraConfig = '' + rewrite ^/prowlarr/(.*) /$1 break; + ''; + }; + "/radarr" = { + proxyPass = "http://localhost:7878"; + extraConfig = '' + rewrite ^/radarr/(.*) /$1 break; + ''; + }; + "/sonarr" = { + proxyPass = "http://localhost:8989"; + extraConfig = '' + rewrite ^/sonarr/(.*) /$1 break; + ''; + }; + "/lidarr" = { + proxyPass = "http://localhost:8686"; + extraConfig = '' + rewrite ^/lidarr/(.*) /$1 break; + ''; + }; + "/readarr" = { + proxyPass = "http://localhost:8787"; + extraConfig = '' + rewrite ^/readarr/(.*) /$1 break; + ''; + }; + "/bazarr" = { + proxyPass = "http://localhost:6767"; + extraConfig = '' + rewrite ^/bazarr/(.*) /$1 break; + ''; + }; + }; + }; + }; }; }; } diff --git a/hosts/lio/media_test.md b/hosts/lio/media_test.md deleted file mode 100644 index f633bf6..0000000 --- a/hosts/lio/media_test.md +++ /dev/null @@ -1,14 +0,0 @@ -[jellyfin](http://10.0.0.3:8096) -[sabnzbd](http://10.0.0.3:6336) -[prowlarr](http://10.0.0.3:9696/) -[radarr](http://10.0.0.3:7878/) -[sonarr](http://10.0.0.3:8989/) -[lidarr](http://10.0.0.3:8686/) -[readarr](http://10.0.0.3:8787/) -[bazarr](http://10.0.0.3:6767) -[jellyseer](http://10.0.0.3:5055/) - - -[nixarr wiki](https://nixarr.com/wiki/) - -[reference for setup](https://www.youtube.com/watch?v=twJDyoj0tDc&t=1172s)