diff --git a/ext/doom/config.el b/ext/doom/config.el index 5b5b94e..c16e139 100644 --- a/ext/doom/config.el +++ b/ext/doom/config.el @@ -302,6 +302,25 @@ ("C-TAB" . 'copilot-accept-completion-by-word) ("C-" . 'copilot-accept-completion-by-word))) + +;; gptel + +;;(require 'gptel) +(use-package! gptel + :init + :config + (setq-default gptel-backend (gptel-make-openai "llama-cpp" ;Any name + :stream t + :protocol "http" + :host "100.64.0.3:8080" + :models '("test") + ) + gptel-model "test") + (add-hook 'gptel-post-response-functions 'gptel-end-of-response) + (add-hook 'gptel-post-stream-hook 'gptel-auto-scroll)) + + + ;; ;; cape ;;;;; ;; (use-package! cape) diff --git a/ext/doom/packages.el b/ext/doom/packages.el index c7faebd..ce53267 100644 --- a/ext/doom/packages.el +++ b/ext/doom/packages.el @@ -56,6 +56,8 @@ (package! copilot :recipe (:host github :repo "zerolfx/copilot.el" :files ("*.el" "dist"))) +;; gptel +(package! gptel :recipe (:host github :repo "akhil3417/gptel")) ;; Doom's packages are pinned to a specific commit and updated from release to ;; release. The `unpin!' macro allows you to unpin single packages... diff --git a/flake.lock b/flake.lock index cf88777..59efa3d 100644 --- a/flake.lock +++ b/flake.lock @@ -249,21 +249,6 @@ } }, "flake-compat_2": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -279,6 +264,21 @@ "type": "github" } }, + "flake-compat_3": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-compat_4": { "flake": false, "locked": { @@ -295,6 +295,22 @@ "type": "github" } }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -429,6 +445,24 @@ "inputs": { "systems": "systems_4" }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "inputs": { + "systems": "systems_5" + }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", @@ -443,9 +477,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1705309234, @@ -462,6 +496,28 @@ } }, "gitignore": { + "inputs": { + "nixpkgs": [ + "kde2nix", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "nix-wallpaper", @@ -486,7 +542,7 @@ "hercules-ci-effects": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1701009247, @@ -590,6 +646,26 @@ "type": "github" } }, + "kde2nix": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_2", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1707218112, + "narHash": "sha256-GXwhrTyeIj38aBi8t6fxasuJ3h2AhvxDypAxQjKrrTY=", + "owner": "nix-community", + "repo": "kde2nix", + "rev": "285ae35495f7a39aacf91598ecf154035bc5d2e8", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "kde2nix", + "type": "github" + } + }, "niri": { "inputs": { "crane": [ @@ -629,8 +705,8 @@ }, "nix-alien": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_4", "nix-filter": "nix-filter_2", "nix-index-database": "nix-index-database", "nixpkgs": [ @@ -708,7 +784,7 @@ }, "nix-index-database": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1707620986, @@ -746,9 +822,9 @@ }, "nix-ld-rs": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_3" + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1699781621, @@ -766,11 +842,11 @@ }, "nix-wallpaper": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks" + "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { "lastModified": 1708554876, @@ -788,7 +864,7 @@ }, "nixinate": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1702325609, @@ -868,6 +944,22 @@ "type": "github" } }, + "nixpkgs-stable_3": { + "locked": { + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1708815994, @@ -885,6 +977,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1706812040, + "narHash": "sha256-pxgWZApBfqHi4I6Hz7nL/rSt0vGE62HvBwvuVXFXeOk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5c5bca5a97c0982ea37a2fcf6d3860349b9f9a35", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1707268954, "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", @@ -900,7 +1008,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1699099776, "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", @@ -916,7 +1024,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1653060744, "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=", @@ -932,7 +1040,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1708807242, "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", @@ -948,7 +1056,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1697723726, "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", @@ -964,7 +1072,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1703255338, "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", @@ -984,7 +1092,7 @@ "inputs": { "flake-parts": "flake-parts_2", "hercules-ci-effects": "hercules-ci-effects", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "osx-kvm": "osx-kvm" }, "locked": { @@ -1057,18 +1165,46 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_2", "flake-utils": [ - "nix-wallpaper", + "kde2nix", "flake-utils" ], "gitignore": "gitignore", "nixpkgs": [ - "nix-wallpaper", + "kde2nix", "nixpkgs" ], "nixpkgs-stable": "nixpkgs-stable_2" }, + "locked": { + "lastModified": 1706424699, + "narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks_2": { + "inputs": { + "flake-compat": "flake-compat_5", + "flake-utils": [ + "nix-wallpaper", + "flake-utils" + ], + "gitignore": "gitignore_2", + "nixpkgs": [ + "nix-wallpaper", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_3" + }, "locked": { "lastModified": 1708018599, "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", @@ -1090,12 +1226,13 @@ "emacs-overlay": "emacs-overlay", "envfs": "envfs", "home-manager": "home-manager_2", + "kde2nix": "kde2nix", "nix-alien": "nix-alien", "nix-index-database": "nix-index-database_2", "nix-ld-rs": "nix-ld-rs", "nix-wallpaper": "nix-wallpaper", "nixinate": "nixinate", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixpkgs-unstable": "nixpkgs-unstable", "nixtheplanet": "nixtheplanet", "nur": "nur", @@ -1221,6 +1358,21 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index bf75175..ecd25bb 100644 --- a/flake.nix +++ b/flake.nix @@ -51,6 +51,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nix-ld-rs.url = "github:nix-community/nix-ld-rs"; + kde2nix.url = "github:nix-community/kde2nix"; }; outputs = @@ -67,6 +68,7 @@ , disko , chaotic , envfs + , kde2nix , ... } @ inputs: let @@ -108,6 +110,7 @@ chaotic.nixosModules.default nixtheplanet.nixosModules.macos-ventura envfs.nixosModules.envfs + kde2nix.nixosModules.default ]; args = { inherit self inputs system; diff --git a/home-mods/desktop/default.nix b/home-mods/desktop/default.nix index 7f2faab..ba06987 100644 --- a/home-mods/desktop/default.nix +++ b/home-mods/desktop/default.nix @@ -36,9 +36,9 @@ in kate kdenlive krita - libsForQt5.kdeconnect-kde - libsForQt5.plasma-vault - libsForQt5.plasma-browser-integration + # libsForQt5.kdeconnect-kde + # libsForQt5.plasma-vault + # libsForQt5.plasma-browser-integration nextcloud-client onlyoffice-bin protonup-qt diff --git a/os-mods/desktop/default.nix b/os-mods/desktop/default.nix index c3bc29f..75ead8d 100644 --- a/os-mods/desktop/default.nix +++ b/os-mods/desktop/default.nix @@ -61,6 +61,11 @@ ]; }; + programs.kdeconnect.enable = true; + + # TODO enable when plasma 6 nixpkgs branch is merged + # security.pam.services.sddm.kwallet.enable = true; + # security.pam.services.kdewallet.kwallet.enable = true; services = { xserver = { enable = true; @@ -69,11 +74,13 @@ variant = "alt-intl"; }; - desktopManager.plasma5.enable = true; - desktopManager.plasma5.useQtScaling = true; + # desktopManager.plasma5.enable = true; + # desktopManager.plasma5.useQtScaling = true; + desktopManager.plasma6.enable = true; + desktopManager.plasma6.enableQt5Integration = true; displayManager = { - defaultSession = "plasmawayland"; + # defaultSession = "plasmawayland"; sddm.enable = true;