diff --git a/nixosConfigurations/common/hm/nushell.nix b/nixosConfigurations/common/hm/nushell.nix index ff8fae8..339a13c 100644 --- a/nixosConfigurations/common/hm/nushell.nix +++ b/nixosConfigurations/common/hm/nushell.nix @@ -32,6 +32,7 @@ environmentVariables = { GNUPGHOME = hmConfig.programs.gpg.homedir; + SSH_AUTH_SOCK = "/run/user/1000/ssh-agent"; }; }; diff --git a/nixosConfigurations/vinheim/default.nix b/nixosConfigurations/vinheim/default.nix index 942bc24..4d61b02 100644 --- a/nixosConfigurations/vinheim/default.nix +++ b/nixosConfigurations/vinheim/default.nix @@ -134,7 +134,7 @@ neovim = { enable = true; - defaultEditor = true; + defaultEditor = false; }; }; } diff --git a/nixosConfigurations/vinheim/hardware.nix b/nixosConfigurations/vinheim/hardware.nix index 99835f0..0f68709 100644 --- a/nixosConfigurations/vinheim/hardware.nix +++ b/nixosConfigurations/vinheim/hardware.nix @@ -87,6 +87,7 @@ bluetooth.enable = true; + bluetooth.powerOnBoot = true; pulseaudio.enable = false; }; diff --git a/nixosConfigurations/vinheim/users.nix b/nixosConfigurations/vinheim/users.nix index 1cd52a6..4faf0ee 100644 --- a/nixosConfigurations/vinheim/users.nix +++ b/nixosConfigurations/vinheim/users.nix @@ -36,6 +36,9 @@ in { }) inputs.catppuccin.homeManagerModules.catppuccin inputs.ags.homeManagerModules.default + + ../common/hm/helix.nix + ../common/hm/nushell.nix ]; home.packages = with pkgs; [ @@ -106,136 +109,27 @@ in { accent = "green"; }; - programs.helix = { + programs.yazi = { enable = true; - settings = { - theme = "gruvbox"; - editor.cursor-shape = { - normal = "block"; - insert = "bar"; - select = "underline"; - }; - }; - extraPackages = with pkgs; [pyright ruff alejandra]; - languages = { - language = [ + enableNushellIntegration = true; + enableBashIntegration = true; + keymap = { + input.prepend_keymap = [ { - name = "nix"; - auto-format = true; - formatter.command = "alejandra"; + run = "close"; + on = [""]; + desc = "Cancel input"; } - { - name = "python"; - language-id = "python"; - roots = ["pyproject.toml" "setup.py" "poetry.lock" "uv.lock" "pdm.lock"]; - language-servers = ["ruff" "pyright"]; - auto-format = true; - formatter = { - command = "ruff"; - args = ["format" "-"]; - }; - file-types = ["py"]; - comment-token = "#"; - shebangs = ["python"]; + run = ''shell "$SHELL" --block''; + on = "!"; + desc = "Drop in shell"; } ]; - - language-server = { - pyright = { - command = "pyright-langserver"; - args = ["--stdio"]; - config.python.analysis = { - venvPath = "."; - venv = ".venv"; - lint = true; - inlayHint.enable = true; - autoSearchPaths = true; - diagnosticMode = "workspace"; - useLibraryCodeForType = true; - logLevel = "Error"; - typeCheckingMode = "off"; - autoImoprtCompletion = true; - reportOptionalSubscript = false; - reportOptionalMemberAccess = false; - }; - }; - ruff = { - command = "ruff"; - args = ["server"]; - environment = {RUFF_TRACE = "messages";}; - }; - }; }; }; programs = { - nushell = { - enable = true; - # The config.nu can be anywhere you want if you like to edit your Nushell with Nu - #configFile.source = ./.../config.nu; - # for editing directly to config.nu - extraConfig = '' - let carapace_completer = {|spans| - carapace $spans.0 nushell $spans | from json - } - $env.config = { - show_banner: false, - completions: { - case_sensitive: false # case-sensitive completions - quick: true # set to false to prevent auto-selecting completions - partial: true # set to false to prevent partial filling of the prompt - algorithm: "fuzzy" - external: { - enable: true - max_results: 100 - completer: $carapace_completer - } - } - } - ''; - }; - - carapace = { - enable = true; - enableNushellIntegration = true; - enableBashIntegration = true; - }; - - starship = { - enable = true; - enableNushellIntegration = true; - enableBashIntegration = true; - settings = { - add_newline = true; - format = '' - $all $fill $time - $character - ''; - fill = { - symbol = " "; - }; - line_break = { - disabled = true; - }; - directory = { - truncate_to_repo = false; - }; - time = { - disabled = false; - use_12hr = true; - }; - character = { - success_symbol = "[❯](bold green)"; - error_symbol = "[❯](bold red)"; - }; - nix_shell = { - symbol = " "; - heuristic = true; - }; - }; - }; - # General fish = { enable = true; @@ -404,4 +298,9 @@ in { }; fonts.packages = with pkgs; [nerd-fonts.jetbrains-mono liberation_ttf]; + + services.ollama = { + enable = true; + acceleration = false; + }; }