From de65eecbabd1a5376662ad45050bc84470e35e49 Mon Sep 17 00:00:00 2001 From: ChUrl Date: Wed, 12 Jul 2023 22:53:53 +0200 Subject: [PATCH] Slim down servenix for VM even more --- home/christoph/default.nix | 82 +++++++++++++-------------- home/christoph/servenix/default.nix | 87 +++++++++++++++++++++-------- system/servenix/default.nix | 27 ++++++--- 3 files changed, 126 insertions(+), 70 deletions(-) diff --git a/home/christoph/default.nix b/home/christoph/default.nix index ec3be56b..704a2da7 100644 --- a/home/christoph/default.nix +++ b/home/christoph/default.nix @@ -391,8 +391,8 @@ rec { protonvpn-cli # yt-dlp # download videos (from almost anywhere) # HM program filezilla - dnsmasq # For Access Point/Hotspot - linux-wifi-hotspot + # dnsmasq # For Access Point/Hotspot + # linux-wifi-hotspot # spotdl-4_1_6 # My derivation as temporary fix spotdl @@ -448,8 +448,8 @@ rec { kdenlive krita inkscape - handbrake - makemkv + # handbrake + # makemkv AusweisApp2 @@ -635,45 +635,45 @@ rec { userName = "ChUrl"; }; - helix = { - enable = true; + # helix = { + # enable = true; - # NOTE: Syntax changed - # languages = [ - # { - # name = "verilog"; - # roots = [ - # ".svls.toml" - # ".svlint.toml" - # ]; - # language-server = { - # command = "svls"; - # args = []; - # }; - # } - # ]; + # # NOTE: Syntax changed + # # languages = [ + # # { + # # name = "verilog"; + # # roots = [ + # # ".svls.toml" + # # ".svlint.toml" + # # ]; + # # language-server = { + # # command = "svls"; + # # args = []; + # # }; + # # } + # # ]; - # https://docs.helix-editor.com/configuration.html - settings = { - # theme = "base16_terminal"; - editor = { - scrolloff = 10; - mouse = false; # Default true - middle-click-paste = false; # Default true - line-number = "relative"; - cursorline = true; - auto-completion = true; # Default - bufferline = "multiple"; - cursor-shape = { - normal = "block"; - insert = "bar"; - select = "underline"; - }; - lsp.display-messages = true; - indent-guides.render = false; - }; - }; - }; # NOTE: If error occurs after system update on fish init run "ssh-add" + # # https://docs.helix-editor.com/configuration.html + # settings = { + # # theme = "base16_terminal"; + # editor = { + # scrolloff = 10; + # mouse = false; # Default true + # middle-click-paste = false; # Default true + # line-number = "relative"; + # cursorline = true; + # auto-completion = true; # Default + # bufferline = "multiple"; + # cursor-shape = { + # normal = "block"; + # insert = "bar"; + # select = "underline"; + # }; + # lsp.display-messages = true; + # indent-guides.render = false; + # }; + # }; + # }; # NOTE: If error occurs after system update on fish init run "ssh-add" keychain = { enable = true; diff --git a/home/christoph/servenix/default.nix b/home/christoph/servenix/default.nix index b541fed4..4e92cb4f 100644 --- a/home/christoph/servenix/default.nix +++ b/home/christoph/servenix/default.nix @@ -16,36 +16,79 @@ rec { ]; config = { - modules = { - hyprland = { - kb-layout = "us"; - kb-variant = "altgr-intl"; + # Use mkForce to not pull the entire ballast from /home/christoph/default.nix - monitors = { - "HDMI-A-3" = { - width = 1920; - height = 1080; - rate = 60; - x = 0; - y = 0; - scale = 1; - }; - }; - - workspaces = { - "HDMI-A-3" = [1 2 3 4 5 6 7 8 9 10]; - }; - }; - - waybar.monitor = "HDMI-A-3"; + modules = lib.mkForce { + fish.enable = true; + helix.enable = true; + nnn.enable = true; }; - # Use mkForce to not pull the entire ballast from /home/christoph/default.nix home.packages = with pkgs; lib.mkForce [ ffmpeg_5-full # v5, including ffplay imagemagick # Convert image (magic) + gdu # Alternative to du-dust (I like it better) + duf # Disk usage analyzer (for all disk overview) + fd # find alternative + sd # sed alternative + fclones # duplicate file finder unrar p7zip + ffmpegthumbnailer # Video thumbnails + mediainfo + tree # Folder preview + progress + wget # download that shit + cachix ]; + + programs = lib.mkForce { + home-manager.enable = true; + + bat = { + enable = true; + + themes = { + catppuccin-latte = builtins.readFile (pkgs.fetchFromGitHub { + owner = "catppuccin"; + repo = "bat"; + rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1"; + sha256 = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw="; + } + "/Catppuccin-latte.tmTheme"); + }; + + config = { + theme = "catppuccin-latte"; + }; + }; + + exa.enable = true; + + ssh.enable = true; + + starship = let + flavour = "latte"; # One of `latte`, `frappe`, `macchiato`, or `mocha` + in { + enable = true; + enableFishIntegration = config.modules.fish.enable; + settings = + { + # Other config here + format = "$all"; # Remove this line to disable the default prompt format + palette = "catppuccin_${flavour}"; + } + // builtins.fromTOML (builtins.readFile + (pkgs.fetchFromGitHub + { + owner = "catppuccin"; + repo = "starship"; + rev = "3e3e54410c3189053f4da7a7043261361a1ed1bc"; + sha256 = "sha256-soEBVlq3ULeiZFAdQYMRFuswIIhI9bclIU8WXjxd7oY="; + } + + /palettes/${flavour}.toml)); + }; + + yt-dlp.enable = true; + }; }; } diff --git a/system/servenix/default.nix b/system/servenix/default.nix index d1838396..d9cb90e7 100644 --- a/system/servenix/default.nix +++ b/system/servenix/default.nix @@ -49,19 +49,32 @@ }; }; - # Low latency audio - # musnix = { - # enable = true; - # # musnix.soundcardPciId = ; - # }; - services.xserver = { + enable = lib.mkForce false; + # Configure keymap in X11 layout = "us"; xkbVariant = "altgr-intl"; # videoDrivers = [ "nvidia" ]; # NVIDIA # videoDrivers = ["amdgpu"]; - videoDrivers = ["intel"]; + # videoDrivers = ["intel"]; }; + + programs = lib.mkForce { + fish.enable = true; + firejail.enable = true; + git.enable = true; + neovim.enable = true; + starship.enable = true; + }; + + services = { + pipewire.enable = lib.mkForce false; + printing.enable = lib.mkForce false; + avahi.enable = lib.mkForce false; + flatpak.enable = lib.mkForce false; + }; + + virtualisation.qemu.guestAgent.enable = true; }