diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/common/networking.nix | 9 | ||||
| -rw-r--r-- | modules/common/nix.nix | 3 | ||||
| -rw-r--r-- | modules/emacs/doom/config.el | 23 | ||||
| -rw-r--r-- | modules/emacs/doom/packages.el | 15 | ||||
| -rw-r--r-- | modules/firefox/addons.json | 3 | ||||
| -rw-r--r-- | modules/firefox/addons.nix | 23 | ||||
| -rw-r--r-- | modules/firefox/default.nix | 5 | ||||
| -rw-r--r-- | modules/firefox/userContent.css | 3 | ||||
| -rw-r--r-- | modules/kde.nix | 11 | ||||
| -rw-r--r-- | modules/profiles/dev/default.nix | 1 | ||||
| -rw-r--r-- | modules/profiles/headful.nix | 1 |
11 files changed, 72 insertions, 25 deletions
diff --git a/modules/common/networking.nix b/modules/common/networking.nix index 71df24a..d7baa6c 100644 --- a/modules/common/networking.nix +++ b/modules/common/networking.nix @@ -102,10 +102,11 @@ in networkmanager = { enable = lib.mkDefault true; unmanaged = [ - "bridge" - "ethernet" - "loopback" - "wireguard" + "type:amneziawg" + "type:bridge" + "type:ethernet" + "type:loopback" + "type:wireguard" ]; plugins = lib.mkForce [ ]; wifi.backend = "iwd"; diff --git a/modules/common/nix.nix b/modules/common/nix.nix index 6a75e85..09d57ed 100644 --- a/modules/common/nix.nix +++ b/modules/common/nix.nix @@ -80,9 +80,6 @@ in "https://nix-community.cachix.org" "https://numtide.cachix.org" ]; - trusted-substituters = [ - "https://cache.tvl.su" - ]; trusted-public-keys = [ "cache.tvl.su:kjc6KOMupXc1vHVufJUoDUYeLzbwSr9abcAKdn/U1Jk=" ]; diff --git a/modules/emacs/doom/config.el b/modules/emacs/doom/config.el index 464a8b2..a212e17 100644 --- a/modules/emacs/doom/config.el +++ b/modules/emacs/doom/config.el @@ -271,11 +271,13 @@ gptel-backend (gptel-make-ollama "ollama" :host "eonwe.shire.net:11434" :stream t - :models '(mistral:7b + :models '(dagbs/qwen2.5-coder-7b-instruct-abliterated:latest + qwen2.5-coder:7b + deepseek-coder-v2:16b codegemma:7b codellama:7b - deepseek-coder-v2:16b - llama3.2:3b)))) + llama3.2:3b + mistral:7b)))) (use-package! ellama :init @@ -306,6 +308,18 @@ :port 11434 :chat-model "qwen2.5:7b" :embedding-model "nomic-embed-text:latest")) + ("qwen-coder" . (make-llm-ollama + :scheme "http" + :host "eonwe.shire.net" + :port 11434 + :chat-model "qwen2.5-coder:7b" + :embedding-model "nomic-embed-text:latest")) + ("qwen-coder-instruct" . (make-llm-ollama + :scheme "http" + :host "eonwe.shire.net" + :port 11434 + :chat-model "dagbs/qwen2.5-coder-7b-instruct-abliterated:latest" + :embedding-model "nomic-embed-text:latest")) ("gemma" . (make-llm-ollama :scheme "http" :host "eonwe.shire.net" @@ -357,8 +371,7 @@ :scheme "http" :host "eonwe.shire.net" :port 11434 - :chat-model "llama3.2:3b" + :chat-model "dagbs/qwen2.5-coder-7b-instruct-abliterated:latest" :embedding-model "nomic-embed-text:latest")) - (magit-gptcommit-status-buffer-setup)) diff --git a/modules/emacs/doom/packages.el b/modules/emacs/doom/packages.el index 8fb24f4..a7085da 100644 --- a/modules/emacs/doom/packages.el +++ b/modules/emacs/doom/packages.el @@ -8,18 +8,19 @@ (package! org-roam-ui) +;; https://github.com/doomemacs/doomemacs/issues/8166 +;; https://github.com/org-roam/org-roam/issues/2485 +(unpin! emacsql) +(package! emacsql + :recipe (:host github :repo "magit/emacsql") + :pin "491105a01f58bf0b346cbc0254766c6800b229a2") + (package! nickel-mode) (package! hledger-mode) (package! sops - :recipe (:host github - :repo "djgoku/sops")) - -(unpin! ansible) -(package! ansible - :recipe (:host gitlab - :repo "emacs-ansible/emacs-ansible")) + :recipe (:host github :repo "djgoku/sops")) (package! gptel) (package! ellama) diff --git a/modules/firefox/addons.json b/modules/firefox/addons.json index f189ed7..c194368 100644 --- a/modules/firefox/addons.json +++ b/modules/firefox/addons.json @@ -23,6 +23,9 @@ "slug": "no-pdf-download" }, { + "slug": "plasma-integration" + }, + { "pname": "rikaichamp", "slug": "10ten-ja-reader" }, diff --git a/modules/firefox/addons.nix b/modules/firefox/addons.nix index 6fac4df..5a08549 100644 --- a/modules/firefox/addons.nix +++ b/modules/firefox/addons.nix @@ -171,6 +171,29 @@ platforms = platforms.all; }; }; + "plasma-integration" = buildFirefoxXpiAddon { + pname = "plasma-integration"; + version = "1.9.1"; + addonId = "plasma-browser-integration@kde.org"; + url = "https://addons.mozilla.org/firefox/downloads/file/4298512/plasma_integration-1.9.1.xpi"; + sha256 = "394a3525185679dd5430d05f980ab6be19d96557560fe86208c21a8807669b33"; + meta = with lib; { + homepage = "http://kde.org"; + description = "Multitask efficiently by controlling browser functions from the Plasma desktop."; + license = licenses.gpl3; + mozPermissions = [ + "nativeMessaging" + "notifications" + "storage" + "downloads" + "tabs" + "<all_urls>" + "contextMenus" + "*://*/*" + ]; + platforms = platforms.all; + }; + }; "redirector" = buildFirefoxXpiAddon { pname = "redirector"; version = "3.5.3"; diff --git a/modules/firefox/default.nix b/modules/firefox/default.nix index c207930..4b04c40 100644 --- a/modules/firefox/default.nix +++ b/modules/firefox/default.nix @@ -115,6 +115,7 @@ in user-agent-switcher violentmonkey ] + ++ optional config.nixfiles.modules.kde.enable plasma-integration ++ optional config.nixfiles.modules.ipfs.enable ipfs-companion; search = { @@ -201,7 +202,7 @@ in "GitHub" = { urls = [ { template = "https://github.com/search?q={searchTerms}"; } ]; - icon = getIcon "https://github.githubassets.com/favicons/favicon-dark.svg" "sha256-qu/d9ftvsntplFuxw9RFL8BpI9b2g5b6xfeGw6Ekh6w="; + icon = getIcon "https://github.githubassets.com/favicons/favicon.svg" "sha256-apV3zU9/prdb3hAlr4W5ROndE4g3O1XMum6fgKwurmA="; definedAliases = [ "@github" "@gh" @@ -352,7 +353,7 @@ in "SourceHut" = { urls = [ { template = "https://sr.ht/projects?search={searchTerms}"; } ]; - icon = getIcon "https://sr.ht/static/logo.png" "sha256-NBzKZhqE9//zVJlOwYiwyW/jRFh8+nS2YvC3zMCQ1fU="; + icon = getIcon "https://sourcehut.org/logo.svg" "sha256-tX7ppdGitgaVFCI1aGc41n6er7srHi+GMv5+lpFvYBc="; definedAliases = [ "@sourcehut" "@srht" diff --git a/modules/firefox/userContent.css b/modules/firefox/userContent.css index 72382db..a009ad8 100644 --- a/modules/firefox/userContent.css +++ b/modules/firefox/userContent.css @@ -260,7 +260,8 @@ #highlight__main-container, .global-footer, .global-navigation, - .global-registration-buttons { + .global-registration-buttons, + .notifications-placeholder { display: none !important; } diff --git a/modules/kde.nix b/modules/kde.nix index e017e11..9490b71 100644 --- a/modules/kde.nix +++ b/modules/kde.nix @@ -50,9 +50,14 @@ in services = { desktopManager.plasma6.enable = true; + displayManager.sddm = { enable = true; - wayland.enable = true; + + wayland = { + enable = false; + compositor = "kwin"; + }; }; }; @@ -64,7 +69,9 @@ in khelpcenter print-manager ]; - systemPackages = with pkgs.kdePackages; [ plasma-disks ]; + systemPackages = with pkgs.kdePackages; [ + plasma-disks + ]; }; }; } diff --git a/modules/profiles/dev/default.nix b/modules/profiles/dev/default.nix index b0755d2..bc761f5 100644 --- a/modules/profiles/dev/default.nix +++ b/modules/profiles/dev/default.nix @@ -71,6 +71,7 @@ in nixpkgs-review scaleway-cli sops + toolbox vultr-cli yq ]; diff --git a/modules/profiles/headful.nix b/modules/profiles/headful.nix index 3a795f1..e2ed1df 100644 --- a/modules/profiles/headful.nix +++ b/modules/profiles/headful.nix @@ -123,7 +123,6 @@ in services = { fwupd.enable = true; libinput.enable = true; - psd.enable = true; upower.enable = true; }; |