diff --git a/home/features/coding/default.nix b/home/features/coding/default.nix index 3a87f1d..320bca3 100644 --- a/home/features/coding/default.nix +++ b/home/features/coding/default.nix @@ -12,6 +12,7 @@ torch srt ])) + pyrefly nixd alejandra tailwindcss diff --git a/home/features/desktop/coding.nix b/home/features/desktop/coding.nix index e3d25ab..0a1f360 100644 --- a/home/features/desktop/coding.nix +++ b/home/features/desktop/coding.nix @@ -19,97 +19,107 @@ in { programs.zed-editor = { enable = true; userSettings = { - features = { - inline_prediction_provider = "zed"; - edit_prediction_provider = "zed"; - copilot = false; - }; - telemetry = { - metrics = false; - }; - lsp = { - rust_analyzer = { - binary = {path_lookup = true;}; - }; - }; - languages = { - Nix = { - language_servers = ["nixd"]; - formatter = { - external = { - command = "alejandra"; - arguments = ["-q" "-"]; - }; - }; - }; - Python = { - language_servers = ["pyright"]; - formatter = { - external = { - command = "black"; - arguments = ["-"]; - }; - }; - }; - }; - context_servers = { - "some-context-server" = { - command = { - path = "some-command"; - args = ["arg-1" "arg-2"]; - env = {}; - }; - settings = {}; - }; - }; - assistant = { - version = "2"; - default_model = { - provider = "anthropic"; - model = "Claude 3.7 Sonnet"; - }; - }; - language_models = { - anthropic = { - version = "1"; - api_url = "https://api.anthropic.com"; - }; - openai = { - version = "1"; - api_url = "https://api.openai.com/v1"; - }; - ollama = { - api_url = "http://localhost:11434"; - }; - }; - ssh_connections = [ - { - host = "152.53.85.162"; - nickname = "m3-atlas"; - args = ["-i" "~/.ssh/m3tam3re"]; - } - { - host = "95.217.189.186"; - port = 2222; - nickname = "self-host-playbook"; - args = ["-i" "~/.ssh/self-host-playbook"]; - "projects" = [ - { - paths = ["/etc/nixos/current-systemconfig"]; - } - ]; - } - ]; - auto_update = false; - format_on_save = "on"; - vim_mode = true; - load_direnv = "shell_hook"; - theme = "Dracula"; - buffer_font_family = "FiraCode Nerd Font"; - ui_font_size = 16; - buffer_font_size = 16; - show_edit_predictions = true; - }; + features = { + inline_prediction_provider = "zed"; + edit_prediction_provider = "zed"; + copilot = false; + }; + telemetry = { + metrics = false; + }; + lsp = { + rust_analyzer = { + binary = {path_lookup = true;}; + }; + }; + languages = { + Nix = { + language_servers = ["nixd"]; + formatter = { + external = { + command = "alejandra"; + arguments = ["-q" "-"]; + }; + }; + }; + Python = { + language_servers = ["pyrefly"]; + formatter = { + external = { + command = "black"; + arguments = ["-"]; + }; + }; + }; + }; + lsp = { + "pyrefly" = { + command = { + path = "pyrefly"; + args = ["--lsp"]; + env = {}; + }; + settings = {}; + }; + }; + context_servers = { + "some-context-server" = { + command = { + path = "some-command"; + args = ["arg-1" "arg-2"]; + env = {}; + }; + settings = {}; + }; + }; + assistant = { + version = "2"; + default_model = { + provider = "anthropic"; + model = "Claude 3.7 Sonnet"; + }; + }; + language_models = { + anthropic = { + version = "1"; + api_url = "https://api.anthropic.com"; + }; + openai = { + version = "1"; + api_url = "https://api.openai.com/v1"; + }; + ollama = { + api_url = "http://localhost:11434"; + }; + }; + ssh_connections = [ + { + host = "152.53.85.162"; + nickname = "m3-atlas"; + args = ["-i" "~/.ssh/m3tam3re"]; + } + { + host = "95.217.189.186"; + port = 2222; + nickname = "self-host-playbook"; + args = ["-i" "~/.ssh/self-host-playbook"]; + "projects" = [ + { + paths = ["/etc/nixos/current-systemconfig"]; + } + ]; + } + ]; + auto_update = false; + format_on_save = "on"; + vim_mode = true; + load_direnv = "shell_hook"; + theme = "Dracula"; + buffer_font_family = "FiraCode Nerd Font"; + ui_font_size = 16; + buffer_font_size = 16; + show_edit_predictions = true; }; }; + }; } diff --git a/home/features/desktop/default.nix b/home/features/desktop/default.nix index ceeb9ec..cb802db 100644 --- a/home/features/desktop/default.nix +++ b/home/features/desktop/default.nix @@ -9,8 +9,7 @@ ./office.nix ./rofi.nix ./theme.nix - ./wayland.nix - ./wofi.nix + ./waybar.nix ]; xdg = { @@ -72,8 +71,9 @@ home.packages = with pkgs; [ appimage-run - # anytype + anytype # blueberry + bemoji brave # brightnessctl # clipman @@ -81,7 +81,6 @@ # eww # firefox-devedition file-roller - google-chrome hyprpanel seahorse sushi diff --git a/home/features/desktop/gaming.nix b/home/features/desktop/gaming.nix index 016aaca..dbf8284 100644 --- a/home/features/desktop/gaming.nix +++ b/home/features/desktop/gaming.nix @@ -15,7 +15,7 @@ in { gamescope goverlay mangohud - protonup-ng + protonplus ]; }; } diff --git a/home/features/desktop/wayland.nix b/home/features/desktop/waybar.nix similarity index 100% rename from home/features/desktop/wayland.nix rename to home/features/desktop/waybar.nix diff --git a/home/features/desktop/wofi.nix b/home/features/desktop/wofi.nix deleted file mode 100644 index c8da548..0000000 --- a/home/features/desktop/wofi.nix +++ /dev/null @@ -1,6 +0,0 @@ -{pkgs, ...}: { - home.packages = with pkgs; [ - wofi - bemoji - ]; -}