diff --git a/config/base.nix b/config/base.nix index 1c702f8..6463c0b 100644 --- a/config/base.nix +++ b/config/base.nix @@ -124,7 +124,6 @@ environment.systemPackages = with pkgs; [ vim - neovim git openssh rofi @@ -139,9 +138,13 @@ k3sup nixfmt-rfc-style nixd - vault + unstable.neovim + omnisharp-roslyn ]; +systemd.services.NetworkManager-wait-online.enable = false; + + services = { picom.enable = true; openssh = { diff --git a/config/home.nix b/config/home.nix index f528a43..d6474fd 100644 --- a/config/home.nix +++ b/config/home.nix @@ -102,7 +102,7 @@ #LSP # roslyn - roslyn-ls + # roslyn-ls dockerfile-language-server-nodejs docker-compose-language-service bash-language-server @@ -156,7 +156,6 @@ vial thunderbird alacritty - neovim fastfetch lazygit byzanz diff --git a/flake.nix b/flake.nix index 220f73c..23e38cc 100644 --- a/flake.nix +++ b/flake.nix @@ -83,7 +83,15 @@ inherit inputs outputs; myhostname = "work-desktop"; }; - modules = [ ./maskiner/work-desktop/configuration.nix ]; + modules = [ + ( + { nixpkgs, ... }: + { + nixpkgs.overlays = [ overlay-unstable ]; + } + ) + ./maskiner/work-desktop/configuration.nix + ]; }; lillen = nixpkgs.lib.nixosSystem { specialArgs = { diff --git a/maskiner/work-desktop/configuration.nix b/maskiner/work-desktop/configuration.nix index 0034ee5..893d33b 100644 --- a/maskiner/work-desktop/configuration.nix +++ b/maskiner/work-desktop/configuration.nix @@ -24,8 +24,13 @@ k3s cifs-utils nfs-utils + docker-slim ]; + networking.firewall = { + allowedTCPPorts = [ 5173 ]; + }; + services.k3s.enable = false; services.openiscsi = { diff --git a/shared/lazygit.nix b/shared/lazygit.nix index a8ff41d..1230b45 100644 --- a/shared/lazygit.nix +++ b/shared/lazygit.nix @@ -5,21 +5,38 @@ enable = true; settings = { gui = { - theme = { - activeBorderColor = [ "#f5a97f" "bold" ]; - inactiveBorderColor = [ "#a5adcb" ]; - optionsTextColor = [ "#8aadf4" ]; - selectedLineBgColor = [ "#363a4f" ]; - cherryPickedCommitBgColor = [ "#494d64" ]; - cherryPickedCommitFgColor = [ "#f5a97f" ]; - unstagedChangesColor = [ "#ed8796" ]; - defaultFgColor = [ "#cad3f5" ]; - searchingActiveBorderColor = [ "#eed49f" ]; - }; + # Mocha + # theme = { + # activeBorderColor = [ "#f5a97f" "bold" ]; + # inactiveBorderColor = [ "#a5adcb" ]; + # optionsTextColor = [ "#8aadf4" ]; + # selectedLineBgColor = [ "#363a4f" ]; + # cherryPickedCommitBgColor = [ "#494d64" ]; + # cherryPickedCommitFgColor = [ "#f5a97f" ]; + # unstagedChangesColor = [ "#ed8796" ]; + # defaultFgColor = [ "#cad3f5" ]; + # searchingActiveBorderColor = [ "#eed49f" ]; + # }; + # + # authorColors = { + # "*" = "#b7bdf8"; + # }; + # Latte + theme = { + activeBorderColor = [ "#fe640b" "bold" ]; + inactiveBorderColor = [ "#6c6f85" ]; + optionsTextColor = [ "#1e66f5" ]; + selectedLineBgColor = [ "#ccd0da" ]; + cherryPickedCommitBgColor = [ "#bcc0cc" ]; + cherryPickedCommitFgColor = [ "#fe640b" ]; + unstagedChangesColor = [ "#d20f39" ]; + defaultFgColor = [ "#4c4f69" ]; + searchingActiveBorderColor = [ "#df8e1d" ]; + }; - authorColors = { - "*" = "#b7bdf8"; - }; + authorColors = { + "*" = "#7287fd"; + }; showRandomTip = false; showBottomLine = false; sidePanelWidth = 0.5; diff --git a/shared/oh-my-posh.nix b/shared/oh-my-posh.nix index bbac0b9..07a882b 100644 --- a/shared/oh-my-posh.nix +++ b/shared/oh-my-posh.nix @@ -6,29 +6,29 @@ settings = { "$schema"= "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json"; # Macchiato - "palette" = { - "os"= "#ACB0BE"; - "closer"= "p:os"; - "pink"= "#F5BDE6"; - "lavender"= "#B7BDF8"; - "blue"= "#8aadf4"; - "peach" = "#f5a97f"; - "red" = "#ed8796"; - "green" = "#a6da95"; - "mauve" = "#c6a0f6"; - }; - # Latte # "palette" = { # "os"= "#ACB0BE"; # "closer"= "p:os"; - # "pink"= "#ea76cb"; + # "pink"= "#F5BDE6"; # "lavender"= "#B7BDF8"; # "blue"= "#8aadf4"; - # "peach" = "#fe640b"; - # "red" = "#d20f39"; - # "green" = "#40a02b"; - # "mauve" = "#8839ef"; + # "peach" = "#f5a97f"; + # "red" = "#ed8796"; + # "green" = "#a6da95"; + # "mauve" = "#c6a0f6"; # }; + # Latte + "palette" = { + "os"= "#ACB0BE"; + "closer"= "p:os"; + "pink"= "#ea76cb"; + "lavender"= "#B7BDF8"; + "blue"= "#8aadf4"; + "peach" = "#fe640b"; + "red" = "#d20f39"; + "green" = "#40a02b"; + "mauve" = "#8839ef"; + }; "blocks"= [ { "alignment"= "left";