Compare commits

..

4 Commits

4 changed files with 35 additions and 67 deletions

84
flake.lock generated
View File

@@ -94,11 +94,11 @@
"quickshell": "quickshell" "quickshell": "quickshell"
}, },
"locked": { "locked": {
"lastModified": 1775660122, "lastModified": 1774758352,
"narHash": "sha256-qMKB06TE0MY1anDQKBrzZEpktNPyvMxQQzTEEwWAA6I=", "narHash": "sha256-zrv2EjkiGT5BYyg9kOXfo48V6bUf0nyTjis/40ca+7s=",
"owner": "caelestia-dots", "owner": "caelestia-dots",
"repo": "shell", "repo": "shell",
"rev": "aa2b08dd45963dc9558de94dbff5e1615e347d02", "rev": "5c59e4490a43eb38b39133d80c47490f0963f216",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -115,11 +115,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775334496, "lastModified": 1774411715,
"narHash": "sha256-dUopEMj5KhH1vnv43o29kMsayp0Ki+9EfIn4UAE9sAU=", "narHash": "sha256-mceIHtVMXpLAfr1W0VK9ceTBX5yKu4gGWpVbThWTsAA=",
"owner": "9001", "owner": "9001",
"repo": "copyparty", "repo": "copyparty",
"rev": "ede692925edfc6fca7a52f483414d543e9303237", "rev": "26e663d111e39ca96c63702ad27a05b6736607cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -374,11 +374,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775683737, "lastModified": 1774738535,
"narHash": "sha256-oBYyowo6yfgb95Z78s3uTnAd9KkpJpwzjJbfnpLaM2Y=", "narHash": "sha256-2jfBEZUC67IlnxO5KItFCAd7Oc+1TvyV/jQlR+2ykGQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7ba4ee4228ed36123c7cb75d50524b43514ef992", "rev": "769e07ef8f4cf7b1ec3b96ef015abec9bc6b1e2a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -398,11 +398,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1775400071, "lastModified": 1774451186,
"narHash": "sha256-uFoqOUB1wbqqDKRdHNEYdgyRQECYWhJBq4Oxjm3Dx9M=", "narHash": "sha256-5IYhofBilDXbM6MWAZLTKxuThjtL3lGNTXdBGsbgRek=",
"ref": "refs/heads/develop", "ref": "refs/heads/develop",
"rev": "3da214ae4c14f57dc5f6ecd480330936f00e1a4f", "rev": "a5b2bc41aafd203203b4eba4f247a670dd9cb252",
"revCount": 35, "revCount": 29,
"type": "git", "type": "git",
"url": "https://labs.phundrak.com/phundrak/jj-cz" "url": "https://labs.phundrak.com/phundrak/jj-cz"
}, },
@@ -464,11 +464,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775365369, "lastModified": 1774762074,
"narHash": "sha256-DgH5mveLoau20CuTnaU5RXZWgFQWn56onQ4Du2CqYoI=", "narHash": "sha256-89Mh4Eb/5stVJX6kGagVMijcU2FmfeD8Qv7UXc5d92o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "cef5cf82671e749ac87d69aadecbb75967e6f6c3", "rev": "bc13aeaed568be76eab84df88ff39261bb52ff70",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -508,11 +508,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1775423009, "lastModified": 1774386573,
"narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -522,27 +522,6 @@
"type": "github" "type": "github"
} }
}, },
"opencode": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1775336060,
"narHash": "sha256-KkjMN2xA8jGBnj96UtzffvOeYJJZM05/5T36nSdpZkE=",
"owner": "anomalyco",
"repo": "opencode",
"rev": "930e94a3ea098b9d56fcb6d08b545256d2546a82",
"type": "github"
},
"original": {
"owner": "anomalyco",
"ref": "v1.3.15",
"repo": "opencode",
"type": "github"
}
},
"pumo-system-info": { "pumo-system-info": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_4",
@@ -595,7 +574,6 @@
"jj-cz": "jj-cz", "jj-cz": "jj-cz",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"opencode": "opencode",
"pumo-system-info": "pumo-system-info", "pumo-system-info": "pumo-system-info",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"spicetify": "spicetify", "spicetify": "spicetify",
@@ -669,11 +647,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775682595, "lastModified": 1774760784,
"narHash": "sha256-0E9PohY/VuESLq0LR4doaH7hTag513sDDW5n5qmHd1Q=", "narHash": "sha256-D+tgywBHldTc0klWCIC49+6Zlp57Y4GGwxP1CqfxZrY=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "d2e8438d5886e92bc5e7c40c035ab6cae0c41f76", "rev": "8adb84861fe70e131d44e1e33c426a51e2e0bfa5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -690,11 +668,11 @@
"systems": "systems_4" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1775421933, "lastModified": 1774157037,
"narHash": "sha256-JkEbzFDFTsUlVtHEzA8Y4r3O9LInhb96eOCbtGjGnbM=", "narHash": "sha256-kJpgEIF0sxMW0vx543m3AwyqptJOxPoOJY1DfJ4jQas=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "ec8d73085fdf807d55765335dc8126e14e7b2096", "rev": "2e2234c2932a3aff5f845cda33cb1972a9e889aa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -710,11 +688,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775701952, "lastModified": 1774517972,
"narHash": "sha256-xj9u8fz2hTTTELMorqox0hPWrmAvGRnQUEnlj+vCjFo=", "narHash": "sha256-oPIVzGlMmfWuJlRbr87yU3cnV8NxtwTG92GqpQczlkw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "srvos", "repo": "srvos",
"rev": "f56f1053ae9f878501d3a8ae1961c73d1d7abce3", "rev": "0ddba2fbd72bb60f8b35b7de1ad67590f454d402",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -813,11 +791,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775710180, "lastModified": 1774759885,
"narHash": "sha256-sCokvdNvl8zIzsnjgG0TN5h3RUI7GJyWW9ErfmEj0rM=", "narHash": "sha256-Y3D2GnZTO6BhGWeVcO6qUkiO5g0dDL2tmokLVWNC1WY=",
"owner": "youwen5", "owner": "youwen5",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "2c138beb648d1cbbfae76695a8230ee04e4db25a", "rev": "16e3f4cd221a030186a96015d82dcb3fb4afa4d6",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -30,11 +30,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
opencode = {
url = "github:anomalyco/opencode/v1.3.15";
inputs.nixpkgs.follows = "nixpkgs";
};
pumo-system-info = { pumo-system-info = {
url = "git+https://labs.phundrak.com/phundrak/pumo-system-info"; url = "git+https://labs.phundrak.com/phundrak/pumo-system-info";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View File

@@ -2,7 +2,6 @@
config, config,
lib, lib,
pkgs, pkgs,
inputs,
... ...
}: }:
with lib; let with lib; let
@@ -30,11 +29,7 @@ in {
}; };
ollama.enable = mkDefault cfg.enable; ollama.enable = mkDefault cfg.enable;
}; };
packages = let packages = [pkgs.lmstudio];
inherit (pkgs.stdenv.hostPlatform) system;
inherit (inputs.opencode.packages.${system}) opencode;
# opencodeCli = inputs.opencode.packages.${system}.opencode;
in [pkgs.lmstudio opencode];
}; };
programs.mcp = mkIf (cfg.mcpServers != {}) { programs.mcp = mkIf (cfg.mcpServers != {}) {
enable = true; enable = true;

View File

@@ -110,9 +110,9 @@
bind C back bind C back
bind R forward bind R forward
" === Tab navigation === " === Tab navigation (T/S = J/K) ===
bind T tabnext bind T tabprev
bind S tabprev bind S tabnext
" === Displaced commands === " === Displaced commands ===
" reload was on r move to h (bépo's 'replace' position) " reload was on r move to h (bépo's 'replace' position)