diff --git a/home/features/cli/nushell.nix b/home/features/cli/nushell.nix index d20d778..7fd8829 100644 --- a/home/features/cli/nushell.nix +++ b/home/features/cli/nushell.nix @@ -22,6 +22,7 @@ in { $env.VISUAL = "zed" $env.XDG_DATA_HOME = $"($env.HOME)/.local/share" $env.FZF_DEFAULT_COMMAND = "fd --type f --exclude .git --follow --hidden" + $env.SSH_AUTH_SOCK = "/run/user/1000/gnupg/S.gpg-agent.ssh" $env.FLAKE = $"($env.HOME)/p/nixos/nixos-config" source /run/agenix/${config.home.username}-secrets ''; diff --git a/home/features/desktop/coding.nix b/home/features/desktop/coding.nix index af8694a..d3c12d5 100644 --- a/home/features/desktop/coding.nix +++ b/home/features/desktop/coding.nix @@ -18,98 +18,98 @@ 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; - }; + # 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; + # }; }; }; } diff --git a/home/features/desktop/hyprland.nix b/home/features/desktop/hyprland.nix index 74319b7..b1575a6 100644 --- a/home/features/desktop/hyprland.nix +++ b/home/features/desktop/hyprland.nix @@ -123,6 +123,17 @@ "size 250 50, title:^(floating-pomodoro)$" "move 12 100%-150,title:^(floating-pomodoro)$" "pin,title:^(floating-pomodoro)$" + "float, initialTitle:.*streamlabs.com.*" + "pin, initialTitle:.*streamlabs.com.*" + "size 800 400, initialTitle:.*streamlabs.com.*" + "move 100%-820 102, initialTitle:.*alert-box.*" + "move 100%-820 512, initialTitle:.*chat-box.*" + "opacity 0.5 override, initialTitle:.*streamlabs.com.*" + "idleinhibit focus, initialTitle:.*streamlabs.com.*" + "noanim, initialTitle:.*streamlabs.com.*" + "noborder, initialTitle:.*streamlabs.com.*" + "noshadow, initialTitle:.*streamlabs.com.*" + "noblur, initialTitle:.*streamlabs.com.*" ]; "$mainMod" = "SUPER"; @@ -134,6 +145,7 @@ "$mainMod SHIFT, t, exec, launch-timer" "$mainMod SHIFT, e, exec, kitty -e zellij_nvim" "$mainMod, o, exec, hyprctl setprop activewindow opaque toggle" + "$mainMod, r, exec, hyprctl dispatch focuswindow \"initialtitle:.*alert-box.*\" && hyprctl dispatch moveactive exact 4300 102 && hyprctl dispatch focuswindow \"initialtitle:.*chat-box.*\" && hyprctl dispatch moveactive exact 4300 512" "$mainMod, b, exec, thunar" "$mainMod SHIFT, B, exec, vivaldi" "$mainMod, Escape, exec, wlogout -p layer-shell" diff --git a/home/m3tam3re/home.nix b/home/m3tam3re/home.nix index 87f7f80..340f1dc 100644 --- a/home/m3tam3re/home.nix +++ b/home/m3tam3re/home.nix @@ -190,6 +190,11 @@ user = "admin"; identityFile = "~/.ssh/m3tam3re"; }; + "m3-prox-1" = { + hostname = "192.168.1.110"; + user = "root"; + identityFile = "~/.ssh/m3tam3re"; + }; "shp-old" = { hostname = "95.217.3.250"; port = 2222; diff --git a/hosts/m3-hermes/default.nix b/hosts/m3-hermes/default.nix index ab50d23..03dddc4 100644 --- a/hosts/m3-hermes/default.nix +++ b/hosts/m3-hermes/default.nix @@ -9,42 +9,6 @@ services.cloud-init = { enable = true; - network.enable = true; - settings = { - system_info = { - distro = "nixos"; - network = { - renderers = ["networkd"]; - }; - default_user = { - name = "ops"; - }; - }; - - users = ["default"]; - - ssh_pwauth = false; - - chpasswd = { - expire = false; - }; - - cloud_init_modules = [ - "migrator" - "seed_random" - "growpart" - "resizefs" - ]; - - cloud_config_modules = [ - "disk_setup" - "mounts" - "set-passwords" - "ssh" - ]; - - cloud_final_modules = []; - }; }; users.users.root.initialPassword = "nixos"; @@ -54,7 +18,6 @@ }; networking = { - useDHCP = false; useNetworkd = true; firewall.enable = true; };