From a8973b070b46d487abc003106219656601e7bd8b Mon Sep 17 00:00:00 2001 From: albert Date: Mon, 6 Jan 2025 13:12:00 -0800 Subject: [PATCH] Update --- home-manager/common/desktops/gnome/dconf.nix | 26 +++++++++++++------ .../common/desktops/gnome/default.nix | 3 ++- home-manager/common/software/cli/nixvim.nix | 1 + .../common/software/cli/nixvim/base.nix | 23 ++++++++-------- .../common/software/cli/nixvim/keymaps.nix | 2 ++ nixos/common/services/tailscale.nix | 2 +- 6 files changed, 35 insertions(+), 22 deletions(-) diff --git a/home-manager/common/desktops/gnome/dconf.nix b/home-manager/common/desktops/gnome/dconf.nix index f7be8726..2890f34a 100644 --- a/home-manager/common/desktops/gnome/dconf.nix +++ b/home-manager/common/desktops/gnome/dconf.nix @@ -18,7 +18,7 @@ with lib.hm.gvariant; "org/gnome/Console" = { custom-font = "JetBrainsMono Nerd Font 10"; last-window-maximised = false; - last-window-size = mkTuple [ 980 791 ]; + last-window-size = mkTuple [ 980 793 ]; theme = "night"; use-system-font = false; }; @@ -260,7 +260,7 @@ with lib.hm.gvariant; disable-user-extensions = false; disabled-extensions = [ "apps-menu@gnome-shell-extensions.gcampax.github.com" "status-icons@gnome-shell-extensions.gcampax.github.com" "windowsNavigator@gnome-shell-extensions.gcampax.github.com" "light-style@gnome-shell-extensions.gcampax.github.com" "wattmeter@bb" ]; enabled-extensions = [ "blur-my-shell@aunetx" "dash-to-panel@jderose9.github.com" "hibernate-status@dromi" "launch-new-instance@gnome-shell-extensions.gcampax.github.com" "nightthemeswitcher@romainvigier.fr" "drive-menu@gnome-shell-extensions.gcampax.github.com" "tilingshell@ferrarodomenico.com" "user-theme@gnome-shell-extensions.gcampax.github.com" "workspace-indicator@gnome-shell-extensions.gcampax.github.com" "arcmenu@arcmenu.com" "tailscale@joaophi.github.com" "system-monitor@gnome-shell-extensions.gcampax.github.com" "wattmeter-forked@clementherve.fr" "battery-usage-wattmeter@halfmexicanhalfamazing.gmail.com" ]; - favorite-apps = [ "org.gnome.Nautilus.desktop" "firefox.desktop" "org.gnome.Console.desktop" "bitwarden.desktop" "steam.desktop" "logseq.desktop" ]; + favorite-apps = [ "org.gnome.Nautilus.desktop" "firefox.desktop" "com.mitchellh.ghostty.desktop" "bitwarden.desktop" "steam.desktop" "logseq.desktop" ]; last-selected-power-profile = "power-saver"; welcome-dialog-last-shown-version = "47.2"; }; @@ -273,7 +273,7 @@ with lib.hm.gvariant; menu-button-icon = "Distro_Icon"; menu-button-position-offset = 0; prefs-visible-page = 0; - recently-installed-apps = [ "org.gnome.Podcasts.desktop" "com.mitchellh.ghostty.desktop" ]; + recently-installed-apps = [ "org.gnome.Podcasts.desktop" ]; search-entry-border-radius = mkTuple [ true 25 ]; }; @@ -345,7 +345,7 @@ with lib.hm.gvariant; appicon-margin = 0; appicon-padding = 4; appicon-style = "NORMAL"; - available-monitors = [ 1 0 ]; + available-monitors = [ 0 1 ]; desktop-line-custom-color = "rgb(255,255,255)"; desktop-line-use-custom-color = false; dot-position = "BOTTOM"; @@ -363,15 +363,19 @@ with lib.hm.gvariant; {"0":"MIDDLE","1":"MIDDLE"} ''; panel-element-positions = '' - {"0":[{"element":"showAppsButton","visible":false,"position":"stackedTL"},{"element":"activitiesButton","visible":false,"position":"stackedTL"},{"element":"leftBox","visible":true,"position":"stackedTL"},{"element":"taskbar","visible":true,"position":"stackedTL"},{"element":"centerBox","visible":true,"position":"stackedBR"},{"element":"rightBox","visible":true,"position":"stackedBR"},{"element":"systemMenu","visible":true,"position":"stackedBR"},{"element":"dateMenu","visible":true,"position":"stackedBR"},{"element":"desktopButton","visible":false,"position":"stackedBR"}],"1":[{"element":"showAppsButton","visible":false,"position":"stackedTL"},{"element":"activitiesButton","visible":false,"position":"stackedTL"},{"element":"leftBox","visible":true,"position":"stackedTL"},{"element":"taskbar","visible":true,"position":"stackedTL"},{"element":"centerBox","visible":true,"position":"stackedBR"},{"element":"rightBox","visible":true,"position":"stackedBR"},{"element":"systemMenu","visible":true,"position":"stackedBR"},{"element":"dateMenu","visible":true,"position":"stackedBR"},{"element":"desktopButton","visible":false,"position":"stackedBR"}]} + {"0":[{"element":"showAppsButton","visible":false,"position":"stackedTL"},{"element":"activitiesButton","visible":false,"position":"stackedTL"},{"element":"leftBox","visible":true,"position":"stackedTL"},{"element":"taskbar","visible":true,"position":"stackedTL"},{"element":"centerBox","visible":true,"position":"stackedBR"},{"element":"rightBox","visible":true,"position":"stackedBR"},{"element":"systemMenu","visible":true,"position":"stackedBR"},{"element":"dateMenu","visible":true,"position":"stackedBR"},{"element":"desktopButton","visible":false,"position":"stackedBR"}],"1":[{"element":"showAppsButton","visible":false,"position":"stackedTL"},{"element":"activitiesButton","visible":false,"position":"stackedTL"},{"element":"leftBox","visible":true,"position":"stackedTL"},{"element":"taskbar","visible":true,"position":"stackedTL"},{"element":"centerBox","visible":true,"position":"stackedBR"},{"element":"rightBox","visible":true,"position":"stackedBR"},{"element":"systemMenu","visible":true,"position":"stackedBR"},{"element":"dateMenu","visible":true,"position":"stackedBR"},{"element":"desktopButton","visible":false,"position":"stackedBR"}]}\n ''; + panel-element-positions-monitors-sync = true; panel-lengths = '' {"0":100,"1":100} ''; + panel-positions = '' + {"0":"BOTTOM","1":"BOTTOM"} + ''; panel-sizes = '' {"0":32,"1":32} ''; - primary-monitor = 1; + primary-monitor = 0; progress-show-count = true; secondarymenu-contains-appmenu = true; secondarymenu-contains-showdetails = false; @@ -389,6 +393,12 @@ with lib.hm.gvariant; window-preview-title-position = "TOP"; }; + "org/gnome/shell/extensions/lilypad" = { + lilypad-order = []; + reorder = true; + rightbox-order = []; + }; + "org/gnome/shell/extensions/nightthemeswitcher/commands" = { enabled = false; }; @@ -397,8 +407,8 @@ with lib.hm.gvariant; location = mkTuple [ (mkDouble "35.41022341351844") (mkDouble "-119.071093") ]; manual-schedule = false; nightthemeswitcher-ondemand-keybinding = [ "t" ]; - sunrise = mkDouble "7.497937335858353"; - sunset = mkDouble "16.58457472081959"; + sunrise = mkDouble "7.4979164484922585"; + sunset = mkDouble "16.58634668559352"; }; "org/gnome/shell/extensions/system-monitor" = { diff --git a/home-manager/common/desktops/gnome/default.nix b/home-manager/common/desktops/gnome/default.nix index e3dd2b9d..58d308c9 100644 --- a/home-manager/common/desktops/gnome/default.nix +++ b/home-manager/common/desktops/gnome/default.nix @@ -2,7 +2,8 @@ { ... }: { imports = [ ./dconf.nix - ../../software/gui/ghostty.nix + # TODO Re-eanble this when in hm 24.11 + # ../../software/gui/ghostty.nix ]; programs.bash.sessionVariables = { DISABLE_TMUX = "true"; diff --git a/home-manager/common/software/cli/nixvim.nix b/home-manager/common/software/cli/nixvim.nix index d4ae0623..1458a6fd 100644 --- a/home-manager/common/software/cli/nixvim.nix +++ b/home-manager/common/software/cli/nixvim.nix @@ -36,6 +36,7 @@ diagnostics.virtual_lines.only_current_line = true; plugins = { + todo-comments.enable = true; ollama = { enable = true; model = "qwen2.5-coder:3b"; diff --git a/home-manager/common/software/cli/nixvim/base.nix b/home-manager/common/software/cli/nixvim/base.nix index 08877ad1..051d829f 100644 --- a/home-manager/common/software/cli/nixvim/base.nix +++ b/home-manager/common/software/cli/nixvim/base.nix @@ -52,7 +52,7 @@ # pretty stuff # Fancify markdown et al - headlines.enable = true; + render-markdown.enable = true; # Rainbow matching {} [] () 's rainbow-delimiters.enable = true; # Colorize hex colors inline @@ -221,72 +221,71 @@ enable = true; settings.win.border = "rounded"; settings.spec = [ -# "b" = "Manage buffers..."; { __unkeyed-1 = "b"; group = "Buffers"; icon = "󰓩 "; } -# "c" = "Colorscheme..."; { __unkeyed-1 = "c"; group = "Colorschemes"; icon = "󰉦 "; } -# "g" = "Git Options..."; { __unkeyed-1 = "g"; group = "Git"; icon = " "; } -# "l" = "LSP Options..."; { __unkeyed-1 = "l"; group = "LSP"; icon = "" ; } -# "n" = "NvimTree / Noice..."; { __unkeyed-1 = "n"; group = "NvimTree / Noice"; icon = " "; } -# "t" = "Trouble..."; { __unkeyed-1 = "t"; group = "Trouble"; icon = " "; } -# "T" = "ToggleTerm..."; + { + __unkeyed-1 = "m"; + group = "MultiCursor..."; + icon = "󰇀"; + } { __unkeyed-1 = "T"; group = "ToggleTerm"; icon = " "; } -# "w" = "Manage Windows..."; { __unkeyed-1 = "w"; group = "Windows"; icon = " "; } -# "wo" = "Open New..."; { __unkeyed-1 = "wo"; group = "Open New..."; icon = " "; } -# "wr" = "Resize..."; { __unkeyed-1 = "wr"; group = "Resize"; icon = "󰩨 "; } -# "m" = "Multicursor..."; { __unkeyed-1 = "m"; group = "Milticursor"; icon = "󰇀 "; } + { + __unkeyed-1 = "o"; + group = "Ollama..."; + icon = "󱜸 "; + } ]; }; diff --git a/home-manager/common/software/cli/nixvim/keymaps.nix b/home-manager/common/software/cli/nixvim/keymaps.nix index 34c0aadb..bdec50da 100644 --- a/home-manager/common/software/cli/nixvim/keymaps.nix +++ b/home-manager/common/software/cli/nixvim/keymaps.nix @@ -52,6 +52,8 @@ (nmap "tf" ":Trouble" // desc "[F]ocus") (nmap "tt" ":TroubleToggle" // desc "[T]oggle") (nmap "tc" ":TroubleClose" // desc "[C]lose") + # ToDo + (nmap "td" ":Trouble todo" // desc "To[D]o") # Window Management (nmap "wh" ":wincmd h" // desc "Move left") (nmap "wl" ":wincmd l" // desc "Move right") diff --git a/nixos/common/services/tailscale.nix b/nixos/common/services/tailscale.nix index 30a09065..81cc6c08 100644 --- a/nixos/common/services/tailscale.nix +++ b/nixos/common/services/tailscale.nix @@ -23,7 +23,7 @@ # (external or internal) is promtail/loki. # Setting them manually here helps. - # TODO: Update these when I move the server to warsaw-ovh-01 + # NOTE: Update these when I move the server to warsaw-ovh-01 networking.extraHosts = '' 100.64.0.5 influx.sysctl.io 100.64.0.5 loki.sysctl.io