diff options
| -rw-r--r-- | flake.lock | 18 | ||||
| -rw-r--r-- | flake.nix | 17 | ||||
| -rw-r--r-- | home-manager/default.nix | 20 | ||||
| -rw-r--r-- | home-manager/gtk/default.nix | 11 | ||||
| -rw-r--r-- | home-manager/packages/default.nix | 16 | ||||
| -rw-r--r-- | home-manager/zed-editor/default.nix | 35 | ||||
| -rw-r--r-- | modules/flatpak-base/default.nix (renamed from modules/flatpak/default.nix) | 11 | ||||
| -rw-r--r-- | modules/flatpak-extra/default.nix | 17 | ||||
| -rw-r--r-- | modules/searx/default.nix | 10 |
9 files changed, 105 insertions, 50 deletions
@@ -55,11 +55,11 @@ ] }, "locked": { - "lastModified": 1764613336, - "narHash": "sha256-L979az28t/+SXvYw9qhOno5HLlDwkZOpz6LzCLnjmRM=", + "lastModified": 1764776959, + "narHash": "sha256-d+5CGloq7Lo1u2SkzhF8oiOdUc6Z5emh22nTXUB9CFA=", "owner": "nix-community", "repo": "home-manager", - "rev": "f3902b5d8767985680875ad86d028371100faeb3", + "rev": "e1680d594a9281651cbf7d126941a8c8e2396183", "type": "github" }, "original": { @@ -86,11 +86,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764522689, - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", + "lastModified": 1764677808, + "narHash": "sha256-H3lC7knbXOBrHI9hITQ7modLuX20mYJVhZORL5ioms0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", + "rev": "1aab89277eb2d87823d5b69bae631a2496cff57a", "type": "github" }, "original": { @@ -133,11 +133,11 @@ ] }, "locked": { - "lastModified": 1764521817, - "narHash": "sha256-mBQzTYUukEyhGyy6MJMSaWCzBCyZWZuIUNdcQ0s+Ffg=", + "lastModified": 1764792636, + "narHash": "sha256-glADrdaOSLbJHDKsMar+M/76WhePfKQQ8vUAW3kQT8w=", "owner": "winapps-org", "repo": "winapps", - "rev": "dc77dc6e863a25aa02327ff48ab367329308b725", + "rev": "2683676856ba08a2e4eebfee34d41f397ee553d3", "type": "github" }, "original": { @@ -57,6 +57,7 @@ ]; commonModules = [ + flatpaks.nixosModules.nix-flatpak home-manager.nixosModules.home-manager { home-manager = { @@ -75,6 +76,7 @@ ./modules/bluetooth ./modules/common ./modules/doas + ./modules/flatpak-base ./modules/fonts ./modules/gnupg ./modules/i18n @@ -95,11 +97,10 @@ pad = mkHost { hostPath = ./hosts/pad; extraModules = commonModules ++ [ - flatpaks.nixosModules.nix-flatpak ./modules/1password ./modules/adguard ./modules/cinnamon - ./modules/flatpak + ./modules/flatpak-extra ./modules/intel ./modules/nginx ./modules/searx @@ -116,6 +117,7 @@ ./home-manager/kanshi ./home-manager/mail ./home-manager/nextcloud + ./home-manager/packages ./home-manager/ssh-agent ./home-manager/zsh ]; @@ -128,13 +130,12 @@ station = mkHost { hostPath = ./hosts/station; extraModules = commonModules ++ [ - flatpaks.nixosModules.nix-flatpak ./modules/1password ./modules/adguard ./modules/amd ./modules/calibre ./modules/cinnamon - ./modules/flatpak + ./modules/flatpak-extra ./modules/monero ./modules/nginx ./modules/ollama @@ -152,6 +153,7 @@ ./home-manager/gtk ./home-manager/mail ./home-manager/nextcloud + ./home-manager/packages ./home-manager/ssh-agent ./home-manager/zsh ]; @@ -164,28 +166,23 @@ work = mkHost { hostPath = ./hosts/work; extraModules = commonModules ++ [ - flatpaks.nixosModules.nix-flatpak - ./modules/1password ./modules/adguard ./modules/cinnamon - ./modules/flatpak - ./modules/monero ./modules/nginx ./modules/nvidia ./modules/ollama - # ./modules/open-webui ./modules/searx { home-manager = { users.aethrvmn = { imports = [ - ./home-manager/browser ./home-manager/dotfiles ./home-manager/fish ./home-manager/git ./home-manager/gnupg ./home-manager/gtk ./home-manager/ssh-agent + ./home-manager/zed-editor ./home-manager/zsh ]; }; diff --git a/home-manager/default.nix b/home-manager/default.nix index acd0494..b3a38f0 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -13,27 +13,9 @@ btop eza - # dev tools - faircamp - fontforge + # dev gitui - hugo marksman - - # gui apps - ## crypto - sparrow - monero-gui - ## media - feishin ]; - - pointerCursor = { - gtk.enable = true; - x11.enable = true; - name = "Qogir"; - package = pkgs.qogir-icon-theme; - size = 24; - }; }; } diff --git a/home-manager/gtk/default.nix b/home-manager/gtk/default.nix index 0b52bd6..8c7938c 100644 --- a/home-manager/gtk/default.nix +++ b/home-manager/gtk/default.nix @@ -1,5 +1,6 @@ { config, pkgs, ... }: { + dconf = { enable = true; settings = { @@ -83,7 +84,7 @@ gtk3 = { bookmarks = [ "file://${config.home.homeDirectory}/Documents" - "file://${config.home.homeDirectory}/Downlads" + "file://${config.home.homeDirectory}/Downloads" "file://${config.home.homeDirectory}/Music" "file://${config.home.homeDirectory}/Pictures" "file://${config.home.homeDirectory}/Videos" @@ -99,4 +100,12 @@ gtk-application-prefer-dark-theme = 1; }; }; + + home.pointerCursor = { + gtk.enable = true; + x11.enable = true; + name = "Qogir"; + package = pkgs.qogir-icon-theme; + size = 24; + }; } diff --git a/home-manager/packages/default.nix b/home-manager/packages/default.nix new file mode 100644 index 0000000..87702d9 --- /dev/null +++ b/home-manager/packages/default.nix @@ -0,0 +1,16 @@ + +{ pkgs, ...}: +{ + home = { + packages = with pkgs; [ + # dev + faircamp + fontforge + hugo + + # gui apps + ## media + feishin + ]; + }; +} diff --git a/home-manager/zed-editor/default.nix b/home-manager/zed-editor/default.nix new file mode 100644 index 0000000..f36ea3d --- /dev/null +++ b/home-manager/zed-editor/default.nix @@ -0,0 +1,35 @@ +{ + programs.zed-editor = { + enable = true; + + extensions = [ "python" "nix" "nim" ]; + + userSettings = { + helix_mode = true; + telemetry = { + metrics = false; + }; + + "language_models" = { + ollama = { + api_url = "http://localhost:11434"; + available_models = [ + { + name = "qwen3-coder:32b"; + display_name = "qwen 3 coder"; + max_tokens = 32768; + supports_tools = true; + } + ]; + }; + }; + + agent = { + default_model = { + provider = "ollama"; + model = "qwen3-coder"; + }; + }; + }; + }; +} diff --git a/modules/flatpak/default.nix b/modules/flatpak-base/default.nix index e5a636f..3f6a56d 100644 --- a/modules/flatpak/default.nix +++ b/modules/flatpak-base/default.nix @@ -11,18 +11,7 @@ ]; packages = [ - "app.grayjay.Grayjay" "com.github.tchx84.Flatseal" - "com.obsproject.Studio" - "fi.skyjake.Lagrange" - "media.emby.EmbyTheater" - "net.lutris.Lutris" - "org.gimp.GIMP" - "org.inkscape.Inkscape" - "org.localsend.localsend_app" - "org.musicbrainz.Picard" - "org.nickvision.money" - "org.nicotine_plus.Nicotine" ]; update = { diff --git a/modules/flatpak-extra/default.nix b/modules/flatpak-extra/default.nix new file mode 100644 index 0000000..80f0c92 --- /dev/null +++ b/modules/flatpak-extra/default.nix @@ -0,0 +1,17 @@ +{ pkgs, lib, ...}: +{ + services.flatpak = { + packages = [ + "app.grayjay.Grayjay" + "com.obsproject.Studio" + "fi.skyjake.Lagrange" + "net.lutris.Lutris" + "org.gimp.GIMP" + "org.inkscape.Inkscape" + "org.localsend.localsend_app" + "org.musicbrainz.Picard" + "org.nickvision.money" + "org.nicotine_plus.Nicotine" + ]; + }; +} diff --git a/modules/searx/default.nix b/modules/searx/default.nix index e8b3873..37ff297 100644 --- a/modules/searx/default.nix +++ b/modules/searx/default.nix @@ -85,6 +85,16 @@ "dictzone".disabled = false; "libretranslate".disabled = false; + # wikistuff + "wikidata".disabled = true; + "wikibooks".disabled = true; + "wikiquote".disabled = true; + "wikisource".disabled = true; + "wikivoyage".disabled = true; + "wikispecies".disabled = true; + "wikiversity".disabled = true; + "wikicommons".disabled = true; + # # scams/don't trusts "bing".disabled = true; "yahoo".disabled = true; |