diff --git a/ext/doom/config.el b/ext/doom/config.el index c16e139..d81707e 100644 --- a/ext/doom/config.el +++ b/ext/doom/config.el @@ -288,6 +288,10 @@ (centaur-tabs-local-mode)))) ) +;; ruby + +(setq! lsp-ruby-lsp-use-bundler t) + ;; Copilot ;; accept completion from copilot and fallback to company @@ -309,15 +313,20 @@ (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") + (setq! gptel-backend (gptel-make-openai "llama-cpp" + :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)) + (add-hook 'gptel-post-stream-hook 'gptel-auto-scroll) + + (map! :leader + "" 'gptel-complete + "TAB" 'gptel-complete) + ) diff --git a/flake.lock b/flake.lock index ae2b18d..a177a53 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1709802317, - "narHash": "sha256-Xi/nghMW2ywH11M/7L9FgoYRXMpy42ODYvdkJ4lARVg=", + "lastModified": 1710954445, + "narHash": "sha256-vU2OGteZS6dMKZcu+btwsNN4HxIwhEb8dzP+h5NgKps=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "ecc8d401f3534069a9f0a5d113df9ca32b468a4a", + "rev": "2952a351037582a8aeb11be9cf57901d872bcf30", "type": "github" }, "original": { @@ -113,17 +113,17 @@ ] }, "locked": { - "lastModified": 1709522437, - "narHash": "sha256-mS0tYjN3B2cLfF+p8m/0YAMNOEQSx/HJT6BOy/XcOLw=", + "lastModified": 1710821861, + "narHash": "sha256-Y+x3q7VkPpRok7Om2bwB2v1JDK/OCZmiFaBrIOJRojY=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "b527ec46661a9a5efe22aa83eeb9fbbe37c41850", - "type": "gitlab" + "rev": "7809f0a6aee6900de59b720bf966d4a0315276bc", + "type": "github" }, "original": { "owner": "girlbossceo", "repo": "conduwuit", - "type": "gitlab" + "type": "github" } }, "crane": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1709773529, - "narHash": "sha256-CNz9ybeR88j8QQxy7YNFa8RlNq3pWnXLvocWIt2n5Mg=", + "lastModified": 1711006105, + "narHash": "sha256-pvjqjx4L2Hx/NP3RWcwLjk+ABtMODAJ9+rgreU6fP6I=", "owner": "nix-community", "repo": "disko", - "rev": "a2009bc2b4e1d3ff5360048292deb0d610aa064b", + "rev": "a8c966ee117c278a5aabc6f00b00ef62eb7e28f6", "type": "github" }, "original": { @@ -177,11 +177,11 @@ ] }, "locked": { - "lastModified": 1709802224, - "narHash": "sha256-8BQn24/XPLxcQ7j+pkcuWF8FUn+s8H7RexBul77VSbA=", + "lastModified": 1711097455, + "narHash": "sha256-XrDR0IosuBua7GN7VrCHvebLKmwMUhfcJYsj/mGfCcU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "35b810dcbe9543e026f6a7095b955f7c9643b9b3", + "rev": "b211a25ffa4f6938243612b63c0d59e3d2ca0259", "type": "github" }, "original": { @@ -199,11 +199,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1709593798, - "narHash": "sha256-vuYPYV5A98ge3iw/bCEN1s5rOTE96O4ult9Noydjv9k=", + "lastModified": 1710936387, + "narHash": "sha256-4cRJtlp5nz2BmwBR8zxxYfMG6K5z0yIoqgVD00j9GC0=", "owner": "Mic92", "repo": "envfs", - "rev": "141f1146a826094568069e9b9027c7738b6babfe", + "rev": "b4651b6e49da75534d8a33893ac13bbb1b3445da", "type": "github" }, "original": { @@ -303,11 +303,11 @@ ] }, "locked": { - "lastModified": 1698882062, - "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -377,12 +377,12 @@ ] }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", - "revCount": 91, + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "revCount": 92, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/numtide/flake-utils/0.1.91%2Brev-d465f4819400de7c8d874d50b982301f28a84605/018defde-b702-7c49-9ad0-aa7e8781287b/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/numtide/flake-utils/0.1.92%2Brev-b1d9ab70662946ef0850d488da1c9019f3a9752a/018e2ca5-e5a2-7f80-9261-445a8cecd4d7/source.tar.gz" }, "original": { "type": "tarball", @@ -394,11 +394,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -412,11 +412,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -529,11 +529,11 @@ ] }, "locked": { - "lastModified": 1709764752, - "narHash": "sha256-+lM4J4JoJeiN8V+3WSWndPHj1pJ9Jc1UMikGbXLqCTk=", + "lastModified": 1710974515, + "narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=", "owner": "nix-community", "repo": "home-manager", - "rev": "cf111d1a849ddfc38e9155be029519b0e2329615", + "rev": "1c2acec99933f9835cc7ad47e35303de92d923a4", "type": "github" }, "original": { @@ -551,11 +551,11 @@ ] }, "locked": { - "lastModified": 1709744297, - "narHash": "sha256-Q2LOs08hmFlzJdJMN4yNrWvZTegfpHEajLin0vcw7t0=", + "lastModified": 1710915975, + "narHash": "sha256-yOc0AD6ba7mbialNciZGzuSQLMo4CopoZGEfcUugA4I=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "f8e3302ee1e0ccaabc443f45dc415e117b54926f", + "rev": "179d73fbe14c5bdb835d10bcc1c783466112bfa6", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1709745623, - "narHash": "sha256-Al56OXS8GuqZUJny6yq1E1XAKEe+rowMOeqJKmnVfOc=", + "lastModified": 1710898409, + "narHash": "sha256-vk+NUeKBb8pyTkZvHVq7+or25fpnSeaaSBGHSGKXL44=", "owner": "martinvonz", "repo": "jj", - "rev": "1ee6b595a8a88dea3ead4ab55c224d9380b87375", + "rev": "4fbe6aecc95152eda44cb4b185ab369e23e1393f", "type": "github" }, "original": { @@ -614,11 +614,11 @@ ] }, "locked": { - "lastModified": 1709744470, - "narHash": "sha256-ZM5dTj+c8HVnn+EBKuGy7aqPY3UOeRVl9R0iwSuRL6k=", + "lastModified": 1710858553, + "narHash": "sha256-CHSkAhNaWIMXlJX7skC2t5wr/qaNlMgWQsezNqr15mw=", "owner": "YaLTeR", "repo": "niri", - "rev": "3ee2db71a456f5b009c1ba7c15c5376bb0a3bb0d", + "rev": "db49deb7fd2fbe805ceec060aa4dec65009ad7a7", "type": "github" }, "original": { @@ -640,11 +640,11 @@ ] }, "locked": { - "lastModified": 1707986999, - "narHash": "sha256-uPCdmwnf2vcfKMxHvD8Hhs1o2yqfnK8Xz6oM7Urvspk=", + "lastModified": 1710495228, + "narHash": "sha256-w0XM85Zo4mNqRLZDZMWUw0wv7LRoODKohCWIaVNnE94=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "d6f007b3cab6cd16e50a0041c542a18793357737", + "rev": "75c0c2d5eb1fdd2c5187c49888cab40b060605fa", "type": "github" }, "original": { @@ -655,11 +655,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1705332318, - "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", "owner": "numtide", "repo": "nix-filter", - "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", "type": "github" }, "original": { @@ -670,11 +670,11 @@ }, "nix-filter_2": { "locked": { - "lastModified": 1705332318, - "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", "owner": "numtide", "repo": "nix-filter", - "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", "type": "github" }, "original": { @@ -711,11 +711,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1707620986, - "narHash": "sha256-XE0tCSkSVBeJDWhjFwusNInwAhrnp+TloUNUpvnTiLw=", + "lastModified": 1710120787, + "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "0cb4345704123492e6d1f1068629069413c80de0", + "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07", "type": "github" }, "original": { @@ -731,11 +731,11 @@ ] }, "locked": { - "lastModified": 1709708644, - "narHash": "sha256-XAFOkZ6yexsqeJrCXWoHxopq0i+7ZqbwATXomMnGmr4=", + "lastModified": 1710644923, + "narHash": "sha256-0fjbN5GYYDKPyPay0l8gYoH+tFfNqPPwP5sxxBreeA4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "94a1e46434736a40f976a454f8bd3ea2144f349b", + "rev": "e25efda85e39fcdc845e371971ac4384989c4295", "type": "github" }, "original": { @@ -806,12 +806,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", - "revCount": 592007, + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", + "revCount": 598982, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.592007%2Brev-9df3e30ce24fd28c7b3e2de0d986769db5d6225d/018e1732-2a3c-7a76-9ec9-7272cb294c13/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.598982%2Brev-b06025f1533a1e07b6db3e75151caa155d1c7eb3/018e577a-86bd-7b2f-b434-442e9ada5378/source.tar.gz" }, "original": { "type": "tarball", @@ -870,11 +870,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1709780214, - "narHash": "sha256-p4iDKdveHMhfGAlpxmkCtfQO3WRzmlD11aIcThwPqhk=", + "lastModified": 1710889954, + "narHash": "sha256-Pr6F5Pmd7JnNEMHHmspZ0qVqIBVxyZ13ik1pJtm2QXk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f945939fd679284d736112d3d5410eb867f3b31c", + "rev": "7872526e9c5332274ea5932a0c3270d6e4724f3b", "type": "github" }, "original": { @@ -886,11 +886,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1707268954, - "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { @@ -934,11 +934,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ }, "nur": { "locked": { - "lastModified": 1709800027, - "narHash": "sha256-iyCUV3wbl+3kYpi5mJZQJRjFo/8YuuVR0UF3Ql5wLFw=", + "lastModified": 1711095683, + "narHash": "sha256-mLxazCxRu18EUFAAgQroruM83rdPH1mQvIaCAUtv/DQ=", "owner": "nix-community", "repo": "NUR", - "rev": "895e0855655804508fbeb90ed38bc82b6139c9bc", + "rev": "c03e4bfa0dbd731210226d2b406c6b512107ed9e", "type": "github" }, "original": { @@ -1042,11 +1042,11 @@ ] }, "locked": { - "lastModified": 1709634318, - "narHash": "sha256-4jZRGyPYShyLocUnE0kqDoitqxqBCkuJ6w6/QX4bjYk=", + "lastModified": 1709982472, + "narHash": "sha256-cMPHIV7yWbve+nwiQDhVt7BBkxrGTLzSTAslv7u6HZo=", "owner": "pjones", "repo": "plasma-manager", - "rev": "9bac5925cf7716979535eed9c88e307fa9744169", + "rev": "26acf8f5880ae7d6e5de4ca953c8ad161b7903eb", "type": "github" }, "original": { @@ -1229,11 +1229,11 @@ ] }, "locked": { - "lastModified": 1699786194, - "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=", + "lastModified": 1710781103, + "narHash": "sha256-nehQK/XTFxfa6rYKtbi8M1w+IU1v5twYhiyA4dg1vpg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1", + "rev": "7ee5aaac63c30d3c97a8c56efe89f3b2aa9ae564", "type": "github" }, "original": { diff --git a/home-mods/desktop/default.nix b/home-mods/desktop/default.nix index 23f987b..d590090 100644 --- a/home-mods/desktop/default.nix +++ b/home-mods/desktop/default.nix @@ -39,6 +39,7 @@ in element-desktop inkscape jellyfin-mpv-shim + libsForQt5.kasts # miraclecast kate kdenlive @@ -53,6 +54,8 @@ in signal-desktop tutanota-desktop webcord-vencord + tome4 + shattered-pixel-dungeon ]; }; } diff --git a/home-mods/shell/default.nix b/home-mods/shell/default.nix index ecc4259..b59dc76 100644 --- a/home-mods/shell/default.nix +++ b/home-mods/shell/default.nix @@ -154,6 +154,7 @@ in enableExtraSocket = true; enableSshSupport = true; + pinentryPackage = lib.mkForce pkgs.pinentry-qt; }; lorri.enable = true; diff --git a/os-mods/common/default.nix b/os-mods/common/default.nix index 1c6ae3c..1144b74 100644 --- a/os-mods/common/default.nix +++ b/os-mods/common/default.nix @@ -137,13 +137,15 @@ gnupg.agent = { enable = true; enableSSHSupport = true; + pinentryPackage = lib.mkForce pkgs.pinentry-qt; }; }; services = { fwupd.enable = true; - envfs.enable = true; + # envfs.enable = true; # not needed due to flake + ntpd-rs.enable = true; openssh = { enable = true; diff --git a/os-mods/desktop/default.nix b/os-mods/desktop/default.nix index bc93ae4..7f36d2a 100644 --- a/os-mods/desktop/default.nix +++ b/os-mods/desktop/default.nix @@ -69,6 +69,8 @@ }; services = { + desktopManager.plasma6.enable = true; + desktopManager.plasma6.enableQt5Integration = true; xserver = { enable = true; xkb = { @@ -78,8 +80,6 @@ # desktopManager.plasma5.enable = true; # desktopManager.plasma5.useQtScaling = true; - desktopManager.plasma6.enable = true; - desktopManager.plasma6.enableQt5Integration = true; displayManager = { # defaultSession = "plasmawayland"; diff --git a/systems/nixos-he4/default.nix b/systems/nixos-he4/default.nix index 830c653..7985e19 100644 --- a/systems/nixos-he4/default.nix +++ b/systems/nixos-he4/default.nix @@ -38,6 +38,7 @@ description = "tristand"; extraGroups = [ "docker" "networkmanager" "wheel" ]; hashedPassword = "$6$Wj.XY8JgH5EWuog4$HnbtPJXDEqKXFrzkPVEjih3PytcpBCrkfL7TAwkXd0IFced7kGMlZNliNsAqQ3XqfyUzAYiiKTIqoPVJEk.s.."; + shell = pkgs.fish; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHowJtKj3ohrYjyeWwQ8Lj6UMSPI390SwLRuVIlojcGM tristand@nixos-desk" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4fBDj1/He/uimO97RgjGWZLAimTrLmIlYS2ekD73GC tristan@arch-pulse" @@ -52,6 +53,7 @@ description = "taq"; extraGroups = [ "docker" "networkmanager" "wheel" ]; hashedPassword = "$6$rkCVbHd2sV36Y38p$e5WTTK58ha7RDDYnfjxAdbzYyNJ2miMD2tkE9.8BHCGyb5vjPNYslClrzYIhxOmujEOllmREXcIgGiUpiMv8Y."; + shell = pkgs.fish; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKokTPK/Gm30kqFAd+u5AT0BL7bG/eNt6pmGf40U8j03 arch-h1" ];