From e2382fa1a9d81ca2c3dffb8463d477bd4561feb4 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Wed, 10 Dec 2025 14:51:28 -0600 Subject: [PATCH] fixed opencode pasting on oren --- flakes/de_plasma/de_plasma.nix | 12 ---- flakes/de_plasma/home_manager/default.nix | 6 +- flakes/opencode/flake.nix | 27 +++++++++ hosts/lio/flake.nix | 12 +--- hosts/oren/flake.lock | 73 ++++++++++++++++++----- hosts/oren/flake.nix | 7 ++- 6 files changed, 96 insertions(+), 41 deletions(-) create mode 100644 flakes/opencode/flake.nix diff --git a/flakes/de_plasma/de_plasma.nix b/flakes/de_plasma/de_plasma.nix index fd1b0e84..30b33276 100644 --- a/flakes/de_plasma/de_plasma.nix +++ b/flakes/de_plasma/de_plasma.nix @@ -107,18 +107,6 @@ in }; services.desktopManager.plasma6.enable = true; - # Portals - xdg.portal = { - enable = true; - extraPortals = [ - pkgs.xdg-desktop-portal-kde - pkgs.xdg-desktop-portal-gtk - ]; - config.common.default = [ - "kde" - "gtk" - ]; - }; # Audio / IPC services.pipewire = { diff --git a/flakes/de_plasma/home_manager/default.nix b/flakes/de_plasma/home_manager/default.nix index 2d2e634c..792b40b3 100644 --- a/flakes/de_plasma/home_manager/default.nix +++ b/flakes/de_plasma/home_manager/default.nix @@ -166,7 +166,7 @@ in lengthMode = "fit"; height = 24; opacity = "translucent"; # "adaptive" | "translucent" | "opaque" - floating = false; + floating = true; hiding = "normalpanel"; screen = "all"; widgets = [ @@ -191,7 +191,7 @@ in lengthMode = "fit"; height = 24; opacity = "translucent"; # "adaptive" | "translucent" | "opaque" - floating = false; + floating = true; hiding = "normalpanel"; screen = "all"; widgets = [ @@ -204,7 +204,7 @@ in lengthMode = "fit"; height = 24; opacity = "translucent"; # "adaptive" | "translucent" | "opaque" - floating = false; + floating = true; hiding = "normalpanel"; screen = "all"; widgets = [ diff --git a/flakes/opencode/flake.nix b/flakes/opencode/flake.nix new file mode 100644 index 00000000..7801ba2c --- /dev/null +++ b/flakes/opencode/flake.nix @@ -0,0 +1,27 @@ +{ + 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"; + }; + }; + }; + }; +} diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index 0c153a30..cfedf0bb 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -5,9 +5,6 @@ nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - opencode.url = "github:sst/opencode"; - opencode.inputs.nixpkgs.follows = "nixpkgs-unstable"; - # Use relative to get current version for testing # common.url = "path:../../flakes/common"; common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/common"; @@ -19,6 +16,8 @@ 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"; + opencode.url = "path:../../flakes/opencode"; + # opencode.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/opencode"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; }; @@ -75,6 +74,7 @@ ({ ringofstorms-nvim.includeAllRuntimeDependencies = true; }) + inputs.opencode.nixosModules.default flatpaks.nixosModules.default common.nixosModules.essentials @@ -176,14 +176,8 @@ vlang ttyd pavucontrol - opencode.packages.${pkgs.system}.default ]; - environment.shellAliases = { - "oc" = "all_proxy='' http_proxy='' https_proxy='' opencode"; - "occ" = "oc -c"; - }; - services.flatpak.packages = [ "org.signal.Signal" "dev.vencord.Vesktop" diff --git a/hosts/oren/flake.lock b/hosts/oren/flake.lock index e05c2541..1c315647 100644 --- a/hosts/oren/flake.lock +++ b/hosts/oren/flake.lock @@ -122,20 +122,14 @@ "plasma-manager": "plasma-manager" }, "locked": { - "dir": "flakes/de_plasma", - "lastModified": 1765154566, - "narHash": "sha256-aC4YHMW0Tv0mPZP51IDpcUIucwRy7DrVZOcoLMAHFug=", - "ref": "refs/heads/master", - "rev": "770d3fb859ee5a4c5f5eeb39fe56757c065822ab", - "revCount": 855, - "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": { @@ -320,6 +314,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1765270179, + "narHash": "sha256-g2a4MhRKu4ymR4xwo+I+auTknXt/+j37Lnf0Mvfl1rE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "677fbe97984e7af3175b6c121f3c39ee5c8d62c9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1764776358, "narHash": "sha256-MxXSCRiV7DI5U3Ra1UxVJTTUyKsONAE8+8QdSXsGIhA=", @@ -334,7 +344,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1761672384, "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", @@ -1214,6 +1224,38 @@ "type": "github" } }, + "opencode": { + "inputs": { + "opencode": "opencode_2" + }, + "locked": { + "path": "../../flakes/opencode", + "type": "path" + }, + "original": { + "path": "../../flakes/opencode", + "type": "path" + }, + "parent": [] + }, + "opencode_2": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1765395355, + "narHash": "sha256-AT24xCe1h7ltirRqLoHce3bmDu5rFKX7Ww9RcqQPgYM=", + "owner": "sst", + "repo": "opencode", + "rev": "31e6ed6806927d3ffd925d12fe6cd1df14cd6a25", + "type": "github" + }, + "original": { + "owner": "sst", + "repo": "opencode", + "type": "github" + } + }, "plasma-manager": { "inputs": { "home-manager": "home-manager", @@ -1238,7 +1280,7 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay_2" }, "locked": { @@ -1264,13 +1306,14 @@ "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", + "opencode": "opencode", "ros_neovim": "ros_neovim", "secrets": "secrets" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "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", diff --git a/hosts/oren/flake.nix b/hosts/oren/flake.nix index 5ff78e38..4e4d6e1d 100644 --- a/hosts/oren/flake.nix +++ b/hosts/oren/flake.nix @@ -16,8 +16,10 @@ # hyprland.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/hyprland"; # 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"; + opencode.url = "path:../../flakes/opencode"; + # opencode.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/opencode"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; }; @@ -74,6 +76,7 @@ ringofstorms-nvim.includeAllRuntimeDependencies = true; } ) + inputs.opencode.nixosModules.default flatpaks.nixosModules.default # hyprland.nixosModules.default