diff --git a/flake.lock b/flake.lock index afa21af..5250f5e 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1782233665, - "narHash": "sha256-h/xOtrByoA/Ak1lWHn0O1lVZz4qWYbwOSLQ8YSwQO0I=", + "lastModified": 1783222121, + "narHash": "sha256-E/ElL373TO8lQ2aMvYyzN+k4xkVaUGoRqoa8AtM71tI=", "owner": "nix-community", "repo": "home-manager", - "rev": "062581938b4a378a82dfbb294b494808157153a1", + "rev": "a1645f40777620c4bd2b6d854b290c2fc354a266", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1782173092, - "narHash": "sha256-w6J7mhMUI5wXzsnHJQUX8BURO2f+e98q0LzfpBVCCdE=", + "lastModified": 1783209806, + "narHash": "sha256-YKUtOu/HmaL8hD2FgAWZ/ZnXti6dau7kvq7BQ/oDdOU=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "70cfacc6ea1a24851e6d5c550456a95d4ca35f80", + "rev": "a4af0dcfd0788d45088dfed9d7fa50ce16070c97", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1782169544, - "narHash": "sha256-unNGqW0tmsqjdO1E6iOtYDIWu6MbesArGYlm8eYOe3s=", + "lastModified": 1783199847, + "narHash": "sha256-TiDFXEa4zEPMX8TvsrbMunQYJPGWQhXBTngi23lAY6g=", "owner": "neovim", "repo": "neovim", - "rev": "313be457f5d854b3a078f8db599a055060ce11b6", + "rev": "3b8c19ea460b4abb5b74f91e05a14c0fcf9cc6a6", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1782030356, - "narHash": "sha256-h4WpMr455AfRub0FXBaon6Vcpe0waUyJ4GivIW6oyd4=", + "lastModified": 1783233851, + "narHash": "sha256-jzisD+3wWZPC4QvAsKtYguiGsmlH2SN3Mjx5LWd68Ok=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "3017088b49efd404f78e3b104f553b97e4af786b", + "rev": "fab14c7b63499d57cb6673d5690168c3ec42b99a", "type": "github" }, "original": { @@ -198,11 +198,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1782166108, - "narHash": "sha256-/EtnQBcKbsaCAGQ5VRcplrHRkR4ryqyLMpBfkVuG9Xw=", + "lastModified": 1782562157, + "narHash": "sha256-a7+T6QSeowynwZ1ZJJbP8T8ntAytvrui8kFGJmIZt2c=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "875776f0252fcb8618bb948640a0d1f7a5b362be", + "rev": "a9cf7546a938c737b079e738de73934a13de9784", "type": "github" }, "original": { @@ -280,12 +280,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1782118813, - "narHash": "sha256-BnbXO5s5EhV89lLXMAGCzPdEN5a6vNqvMk71obeTEUw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b3c092d3c36d91e2f61f3dfb39a159f180a56659", - "type": "github" + "lastModified": 1783214977, + "narHash": "sha256-Klkkjf1yS7qTIGhQV5p1kmUcM8/rZwpr6LlR/noA8N8=", + "rev": "6edbf1a6a03e75886a6609c088801a0856449e88", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1027850.6edbf1a6a03e/nixexprs.tar.xz" }, "original": { "id": "nixpkgs", @@ -325,26 +324,9 @@ "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_4", "noctalia": "noctalia", - "tmux": "tmux", "zen-browser": "zen-browser" } }, - "tmux": { - "flake": false, - "locked": { - "lastModified": 1782248405, - "narHash": "sha256-/qBzK4J9yKQrKzUrTYDE89LqeKIh7jPTWH1YUVmwQI4=", - "owner": "tmux", - "repo": "tmux", - "rev": "ff8de1a106eca44bbf8cfca842aa32953d2593c8", - "type": "github" - }, - "original": { - "owner": "tmux", - "repo": "tmux", - "type": "github" - } - }, "zen-browser": { "inputs": { "nixpkgs": [ @@ -352,11 +334,11 @@ ] }, "locked": { - "lastModified": 1781847955, - "narHash": "sha256-1OSYOGuJp/NoODmSHjsz+6TB/kSilJ+BsFihjY7TTnc=", + "lastModified": 1783063092, + "narHash": "sha256-H6lM+h8+ZT25uWJwmYkER5yj5RJ9DP2++n5um/XH3J0=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "4bca251cd556677f7b765ff324d1638ae215be13", + "rev": "36b24209358c82e0ea5404ba003ae8dc37334c86", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8b66d08..15a47d6 100644 --- a/flake.nix +++ b/flake.nix @@ -32,11 +32,6 @@ url = "github:zoriya/noctalia-shell"; inputs.nixpkgs.follows = "nixpkgs"; }; - # use tmux's master for mode 2031 - tmux = { - url = "github:tmux/tmux"; - flake = false; - }; }; outputs = { diff --git a/modules/cli/nix/impermanence.nix b/modules/cli/nix/impermanence.nix index f8092d8..850ba66 100644 --- a/modules/cli/nix/impermanence.nix +++ b/modules/cli/nix/impermanence.nix @@ -68,6 +68,9 @@ ".config/YouTube\ Music" ".config/gh" ".config/github-copilot" + # orca slicer + ".config/OrcaSlicer" + ".local/share/orca-slicer" # Don't reinstall plugins on reboot ".local/share/nvim" ".local/state/nvim" diff --git a/modules/gui/home.nix b/modules/gui/home.nix index 20bf0e8..2408dc9 100644 --- a/modules/gui/home.nix +++ b/modules/gui/home.nix @@ -22,6 +22,7 @@ in { zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default vesktop freecad + orca-slicer kicad xdg-utils libreoffice diff --git a/overlays/default.nix b/overlays/default.nix index 25a029b..55c6802 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,4 +1,4 @@ -{tmux, ...}: self: super: let +{...}: self: super: let wrapProgram = drv: bins: wrapProgramFlags: super.symlinkJoin { name = drv.name; @@ -18,12 +18,6 @@ --add-flags "--ozone-platform=wayland" \ --add-flags "--disable-smooth-scrolling"''; in { - tmux = super.tmux.overrideAttrs { - src = tmux; - version = "next-3.7"; - patches = []; - }; - # they try to use passthrough if they detect tmux. we don't want that. osc = wrapProgram super.osc ["osc"] '' --set TMUX ""