From e282bd517f2392177a7afece8f875ee3ad07601d Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 3 Sep 2025 15:13:25 -0500 Subject: [PATCH] update oren to use latest sway/etc DE --- hosts/lio/flake.nix | 1 - hosts/oren/flake.lock | 209 ++++++++++++++++++------------------------ hosts/oren/flake.nix | 30 +++++- 3 files changed, 113 insertions(+), 127 deletions(-) diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index 0325ddb..6ab3e3a 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -71,7 +71,6 @@ environment.systemPackages = with pkgs; [ lua qdirstat - steam ffmpeg-full appimage-run nodejs_24 diff --git a/hosts/oren/flake.lock b/hosts/oren/flake.lock index b384ad0..5bc3f55 100644 --- a/hosts/oren/flake.lock +++ b/hosts/oren/flake.lock @@ -30,16 +30,14 @@ "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_2", - "nixpkgs-unstable": "nixpkgs-unstable", - "opencode": "opencode", "ragenix": "ragenix" }, "locked": { - "lastModified": 1755036081, - "narHash": "sha256-RcJpH9+C6os1jb9l3ukOAU0CtrP5YPlGyRGh6gZPF1Q=", + "lastModified": 1756877422, + "narHash": "sha256-q6H6lNVCrvBef/voxtzWmzhzQV1SfpMfijLaVVhWxdY=", "ref": "refs/heads/master", - "rev": "db6d5161ff0d4962236befa6ca1fd7ef2cb37fe3", - "revCount": 588, + "rev": "c88327b38b92037d0a3d65d4fbf300c020973ba7", + "revCount": 632, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -181,27 +179,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1753694789, - "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", + "lastModified": 1756787288, + "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable_2": { - "locked": { - "lastModified": 1753694789, - "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", + "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", "type": "github" }, "original": { @@ -245,11 +227,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1753749649, - "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", + "lastModified": 1756886854, + "narHash": "sha256-6tooT142NLcFjt24Gi4B0G1pgWLvfw7y93sYEfSHlLI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", + "rev": "0e6684e6c5755325f801bda1751a8a4038145d7d", "type": "github" }, "original": { @@ -261,11 +243,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1753848940, - "narHash": "sha256-jH7fqN4HzsIlj2c/SAuVWmgUIjBwDdEKVnL97xlECHY=", + "lastModified": 1755648324, + "narHash": "sha256-+2TxwJEXWXGC7JBsRGUHtmQ66lRGPcDI2kFKTTU5e2s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "25b37a9225cece2da4b68aca8bd0998439074362", + "rev": "226bb7c9df5f953fd7533e199b8d9e5475458a8a", "type": "github" }, "original": { @@ -293,11 +275,11 @@ "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": { "flake": false, "locked": { - "lastModified": 1753815885, - "narHash": "sha256-A9qlpDXdIfoZ/5yZ5w39pgfoxVwhklhcESYWsqQgiDY=", + "lastModified": 1755636100, + "narHash": "sha256-EeU6AfMISnXUmKdNHXN35srj+fuQiHoWx5uYRKCjsTE=", "owner": "CopilotC-Nvim", "repo": "CopilotChat.nvim", - "rev": "450fcecf2f71d0469e9c98f5967252092714ed03", + "rev": "f7bb32dbbe2ff5e26f5033e2142b5920cf427236", "type": "github" }, "original": { @@ -325,11 +307,11 @@ "nvim_plugin-L3MON4D3/LuaSnip": { "flake": false, "locked": { - "lastModified": 1753286973, - "narHash": "sha256-w70rSwYdjMRGCLYcwIoA4cvl6JcGQYHngCBJvRq+SXg=", + "lastModified": 1754037237, + "narHash": "sha256-JhTqTGQfIryJ7MElcOGOfb48uaNDnd9RM9Fl1Fs4QV0=", "owner": "L3MON4D3", "repo": "LuaSnip", - "rev": "3d5bced1b9ae69fa3f9b1942e28af5dbc537f946", + "rev": "de10d8414235b0a8cabfeba60d07c24304e71f5c", "type": "github" }, "original": { @@ -341,11 +323,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1753730059, - "narHash": "sha256-OjvoAFWaJT4+gyO/jtA2uvFdeOz7lhdkkhKQUl/kIT4=", + "lastModified": 1755631821, + "narHash": "sha256-+/GVSb3uQ5HktPv6HFwdywX85hScsAI1IHqXmwDH9PU=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "9e51b7711c6159511e966dc42fafd58a9db9ad1d", + "rev": "0087ee1d505d4fc4886d8d3121ae7848b7c0e49b", "type": "github" }, "original": { @@ -389,11 +371,11 @@ "nvim_plugin-Saecki/crates.nvim": { "flake": false, "locked": { - "lastModified": 1753218471, - "narHash": "sha256-5Vu3VG6Ab1Rpqzeqoa0S9sfzco7wykrSt2eSXOajm14=", + "lastModified": 1754466592, + "narHash": "sha256-b40E121rJrEmlor3fHmh4Y1TXKdfiqsBGBcpbY//eTw=", "owner": "Saecki", "repo": "crates.nvim", - "rev": "c915ab5334a46178f64ce17ab606a79454bcd14f", + "rev": "a49df0f70171adc77704eac70dd2c0d179065933", "type": "github" }, "original": { @@ -421,11 +403,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1753826458, - "narHash": "sha256-7VZmb4JPlLF4tmEuuM69etdyCIxdH1PNZlT1mijzo7o=", + "lastModified": 1755594039, + "narHash": "sha256-XU+PtvXlgoHFouyyceUIZ4L5AvZThUR2AegmCQAYt1A=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "3cd1c7267282b4d89618674de36a6d866981347e", + "rev": "e906ac3ed0bd273781759e7635b5b824393c925c", "type": "github" }, "original": { @@ -437,11 +419,11 @@ "nvim_plugin-catppuccin/nvim": { "flake": false, "locked": { - "lastModified": 1753779499, - "narHash": "sha256-lnIlYUhUQXuoVWv000n5Ev4YNSZY+U70b3npZbMUDg4=", + "lastModified": 1755621274, + "narHash": "sha256-o8VLMPriOh4+Ay5Ff0cWQYXjmihdr3x9131bKHHTsQE=", "owner": "catppuccin", "repo": "nvim", - "rev": "94f6e8a06b6bb7b8e5529cf9f93adb4654534241", + "rev": "30fa4d122d9b22ad8b2e0ab1b533c8c26c4dde86", "type": "github" }, "original": { @@ -453,11 +435,11 @@ "nvim_plugin-chrisgrieser/nvim-early-retirement": { "flake": false, "locked": { - "lastModified": 1750108178, - "narHash": "sha256-3I7Xup+v9Yq9/nJQ1F5CDW99oFQcxbinv7VQcKeA16Y=", + "lastModified": 1755590055, + "narHash": "sha256-989Zf6SCy+vakFac4KmElUn8+ErJMtYJ8zlOi999UJI=", "owner": "chrisgrieser", "repo": "nvim-early-retirement", - "rev": "d9ffd8f70ed6d466cecd3e7e2dd1425b0010932f", + "rev": "ef9fc0267da4204432ab7bf3ab9df359874cfeb6", "type": "github" }, "original": { @@ -549,11 +531,11 @@ "nvim_plugin-hrsh7th/cmp-nvim-lsp": { "flake": false, "locked": { - "lastModified": 1743496195, - "narHash": "sha256-iaihXNCF5bB5MdeoosD/kc3QtpA/QaIDZVLiLIurBSM=", + "lastModified": 1755085771, + "narHash": "sha256-X1rppwf2xBPrmB93ptXukOnEBDZmfjJd4F5ObNa1DHs=", "owner": "hrsh7th", "repo": "cmp-nvim-lsp", - "rev": "a8912b88ce488f411177fc8aed358b04dc246d7b", + "rev": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3", "type": "github" }, "original": { @@ -597,11 +579,11 @@ "nvim_plugin-j-hui/fidget.nvim": { "flake": false, "locked": { - "lastModified": 1753813056, - "narHash": "sha256-rQIEO9C9YokdwaPfKsu7Rb6pi51Tm0Qqo/igBKeCW/8=", + "lastModified": 1755048367, + "narHash": "sha256-Hcnbk6go2vYCYqSfXLWQ+KimpU+NPbIkjBTKGMFoNQM=", "owner": "j-hui", "repo": "fidget.nvim", - "rev": "c1725fbadd99c810273b202d67dbfedf66e61eaf", + "rev": "2cb5edb2dd6700a958a446b20bb2be04d318da9d", "type": "github" }, "original": { @@ -629,11 +611,11 @@ "nvim_plugin-lewis6991/gitsigns.nvim": { "flake": false, "locked": { - "lastModified": 1753442199, - "narHash": "sha256-7BKwxHoFWGepqm8/J+RB6zu+7IpGUUmgLP4a2O2lIuA=", + "lastModified": 1755014582, + "narHash": "sha256-zBUrqL+00Y8j4eVNAgI0nYn2i35zhQo2BVl4mL1cgfs=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "b01433169be710d6c69f7b4ee264d9670698b831", + "rev": "6e3c66548035e50db7bd8e360a29aec6620c3641", "type": "github" }, "original": { @@ -709,11 +691,11 @@ "nvim_plugin-mfussenegger/nvim-lint": { "flake": false, "locked": { - "lastModified": 1753039571, - "narHash": "sha256-ly5S0KAZN8Jeag22SCX+5XKqn3d+zCRN/8Jf5HlEn9I=", + "lastModified": 1753951521, + "narHash": "sha256-GmXScmbXJx74RMgPhkdKtdODZqkOarFHE1XOiSnt5Bo=", "owner": "mfussenegger", "repo": "nvim-lint", - "rev": "9c6207559297b24f0b7c32829f8e45f7d65b991f", + "rev": "7ef127aaede2a4d5ad8df8321e2eb4e567f29594", "type": "github" }, "original": { @@ -725,11 +707,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1753575790, - "narHash": "sha256-Iw3W0Inn0CpZTXyxk54WRtsXP5DYm+7bKH/HSO/diBo=", + "lastModified": 1755599388, + "narHash": "sha256-4o20Hf+rFD2zejPZr5oe3ZkaynW3xAw/wtbF3sMjNnQ=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "f845bb055397019c4bc70f9c76376ca490f4c783", + "rev": "eb9beab7d80eb052f78165b28d18f55844b26aef", "type": "github" }, "original": { @@ -741,11 +723,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1753837371, - "narHash": "sha256-IsdjkpE+T5irvmH5fam5EmsCpzwxSEiXV3r2iXsOVT0=", + "lastModified": 1755617152, + "narHash": "sha256-PSu5zQi/rzBAnALX8WrYckhqM5lI6hGAhsWWgS7ln7A=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "3db16ceeea947517f0dc1404c24dcb5ab0c91d26", + "rev": "5f1c9a90c8db9c647da40ce6cf5be9e49ccbf0c7", "type": "github" }, "original": { @@ -757,11 +739,11 @@ "nvim_plugin-nosduco/remote-sshfs.nvim": { "flake": false, "locked": { - "lastModified": 1748880705, - "narHash": "sha256-eTnVFOR7FHlkU9kwrk3q3pNo/U8OR2gJrnrMUQKGi2A=", + "lastModified": 1755623332, + "narHash": "sha256-hnTDzd3eRsDUYYf9WPknYZ126d0XKXO1hjlY7WH4bDI=", "owner": "nosduco", "repo": "remote-sshfs.nvim", - "rev": "6e893c32ff7c5b8d0d501b748c525fa53963fb35", + "rev": "8ab43934caea0eacc986d112e5680c316b8a7944", "type": "github" }, "original": { @@ -805,11 +787,11 @@ "nvim_plugin-nvim-lualine/lualine.nvim": { "flake": false, "locked": { - "lastModified": 1749383457, - "narHash": "sha256-2aPgA7riA/FubQpTkqsxLKl7OZ8L6FkucNHc2QEx2HQ=", + "lastModified": 1754970649, + "narHash": "sha256-lWt2kpW+hsTMWt8tar/+AISTDrIt4Jn27NmI9j+Xt4s=", "owner": "nvim-lualine", "repo": "lualine.nvim", - "rev": "a94fc68960665e54408fe37dcf573193c4ce82c9", + "rev": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955", "type": "github" }, "original": { @@ -821,11 +803,11 @@ "nvim_plugin-nvim-telescope/telescope-file-browser.nvim": { "flake": false, "locked": { - "lastModified": 1750040034, - "narHash": "sha256-NHcU3c+1pLeypHr9xXKmqvdwB1QM/vj5axzjpFEQCLQ=", + "lastModified": 1754424906, + "narHash": "sha256-FlJ7w5Ywwq03E0oYdnFJFb+MMUMQMa+5QhDMy2O9tGQ=", "owner": "nvim-telescope", "repo": "telescope-file-browser.nvim", - "rev": "7bf55ed0ff5be182ad3301cff266581fc1c56cce", + "rev": "3610dc7dc91f06aa98b11dca5cc30dfa98626b7e", "type": "github" }, "original": { @@ -885,11 +867,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1753762764, - "narHash": "sha256-uoiPwURO0ATaYeLozG8X44cC4eWf1wANspljkjh/qeY=", + "lastModified": 1755174669, + "narHash": "sha256-Cdd7m2ondica5yDgm8THEm8LttJwDWQTNPnKO4vKr2c=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "65bae449224b8a3bc149471b96587b23b13a9946", + "rev": "f0e9951778802526b14c934f7bf746e1e0ae5ed0", "type": "github" }, "original": { @@ -901,11 +883,11 @@ "nvim_plugin-nvim-tree/nvim-web-devicons": { "flake": false, "locked": { - "lastModified": 1753653538, - "narHash": "sha256-1IwOcdIUJuh7YC2YTw0VnGI2UIg7F/ipxLLfQdPzjFQ=", + "lastModified": 1754884337, + "narHash": "sha256-Zftd4xFYdCtof6IusN+E079yY2oMTNhJ/yznvLiiur0=", "owner": "nvim-tree", "repo": "nvim-web-devicons", - "rev": "4a8369f4c78ef6f6f895f0cec349e48f74330574", + "rev": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a", "type": "github" }, "original": { @@ -917,11 +899,11 @@ "nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1753794238, - "narHash": "sha256-9KKJJhKCjlKakVFyF3EUj2sobrKaJBMIGqkwbVjD9Mk=", + "lastModified": 1754488703, + "narHash": "sha256-f4a9Abwb265Rm+hpUXz+rKWXvaFVrmXf1h7d7eh9jJc=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "02fd97c803962108d129cf42e05adc5eff7f89c1", + "rev": "dca8726fea2c14e1ce6adbaa76a04816fbfaff61", "type": "github" }, "original": { @@ -965,11 +947,11 @@ "nvim_plugin-rmagatti/auto-session": { "flake": false, "locked": { - "lastModified": 1753745747, - "narHash": "sha256-Uowy7CMw6+4y1ME5vNTUSxDCOBfjnfJRpteAKfUo6A8=", + "lastModified": 1755285297, + "narHash": "sha256-x8oPN7JqcY0scFO0vGREerT3dRiQA+k/qeWsug1sGiU=", "owner": "rmagatti", "repo": "auto-session", - "rev": "c93a9bfd8a5cbf931a6ead5c824998da874b9f79", + "rev": "d27a29f5754e3a8b8d89a4069814e53ac583e951", "type": "github" }, "original": { @@ -1029,11 +1011,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1751472067, - "narHash": "sha256-bm6266h0rKYcOeMPVqjh3DEKe5M0EIPuo4rvmRtkpvs=", + "lastModified": 1755640282, + "narHash": "sha256-WYGvppnMsBaVYnMmv9WJRuKuyk4F/rzJ3DRBh+72tRY=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "973f3cb73887d510321653044791d7937c7ec0fa", + "rev": "04bfa5f35706410376bf7618a01fcf44e3f35b59", "type": "github" }, "original": { @@ -1141,11 +1123,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1753817982, - "narHash": "sha256-AHDh24MQ3OMNKUCuKaA9KrR4l0I+dT7tF+Bpl6PBSx8=", + "lastModified": 1755448417, + "narHash": "sha256-KV+Wno4aB5uTSBxIZzQKC/0KfjQLM7x8wCDkVSnaPeA=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "55e43020dcd59c6da41cc773971380a003100844", + "rev": "3fd7b50810ae4cccf8b38e4c509b1608f141a9e9", "type": "github" }, "original": { @@ -1154,23 +1136,6 @@ "type": "github" } }, - "opencode": { - "flake": false, - "locked": { - "lastModified": 1754526276, - "narHash": "sha256-OkkjbytvvUBOcSCjf3zd8NWLaM+I1tUR9IxcRZrdVeM=", - "owner": "sst", - "repo": "opencode", - "rev": "1a561bb5120b1b87a4c477f7cb6c3a0a4ce79114", - "type": "github" - }, - "original": { - "owner": "sst", - "ref": "v0.3.133", - "repo": "opencode", - "type": "github" - } - }, "ragenix": { "inputs": { "agenix": "agenix", @@ -1197,7 +1162,7 @@ "inputs": { "common": "common", "nixpkgs": "nixpkgs_4", - "nixpkgs-unstable": "nixpkgs-unstable_2", + "nixpkgs-unstable": "nixpkgs-unstable", "ros_neovim": "ros_neovim" } }, @@ -1262,11 +1227,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1753849449, - "narHash": "sha256-zBShks1kHnfIq+tkBNkA41NCrhwJNbkhW3a/jLUIr50=", + "lastModified": 1755648539, + "narHash": "sha256-zElmY3ieHOxJtn5Q3KKXZw3i6/e63jRtHowzOM4jERw=", "ref": "refs/heads/master", - "rev": "86093285e53caae7d2bf9a8d0046be3d4245a35b", - "revCount": 299, + "rev": "1f8444ad78e85c902818ab48479f3f3a1e909031", + "revCount": 300, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, @@ -1305,11 +1270,11 @@ ] }, "locked": { - "lastModified": 1753843724, - "narHash": "sha256-a0Aab7Zst68GqvNAMh9Ejwnp8gawGnruOMtEWZ0HHjM=", + "lastModified": 1755571033, + "narHash": "sha256-V8gmZBfMiFGCyGJQx/yO81LFJ4d/I5Jxs2id96rLxrM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "01ac47d86311fb030023f1dfc5f6bc368b9c6cee", + "rev": "95487740bb7ac11553445e9249041a6fa4b5eccf", "type": "github" }, "original": { diff --git a/hosts/oren/flake.nix b/hosts/oren/flake.nix index f4e2a29..09d242a 100644 --- a/hosts/oren/flake.nix +++ b/hosts/oren/flake.nix @@ -35,12 +35,30 @@ { config, pkgs, ... }: { programs = { - steam.enable = true; + nix-ld = { + enable = true; + libraries = with pkgs; [ + icu + gmp + glibc + openssl + stdenv.cc.cc + ]; + }; + }; + environment.shellAliases = { + "oc" = + "all_proxy='' http_proxy='' https_proxy='' /home/josh/other/opencode/node_modules/opencode-linux-x64/bin/opencode"; + "occ" = "oc -c"; }; environment.systemPackages = with pkgs; [ lua qdirstat + ffmpeg-full + appimage-run + nodejs_24 + foot ]; services.ollama = { @@ -57,15 +75,18 @@ reporting.enable = true; }; secrets.enable = true; - desktopEnvironment.gnome.enable = true; + desktopEnvironment.sway = { + enable = true; + waybar.enable = true; + swaync.enable = true; + }; programs = { qFlipper.enable = true; rustDev.enable = true; uhkAgent.enable = true; tailnet.enable = true; ssh.enable = true; - docker.enable = true; - opencode.enable = true; + # docker.enable = true; virt-manager.enable = true; flatpaks = { enable = true; @@ -113,6 +134,7 @@ tmux atuin kitty + foot direnv git nix_deprecations