From fd34ac7c62453bd2707532a8e2e096b1ea7face2 Mon Sep 17 00:00:00 2001 From: iFargle Date: Mon, 28 Aug 2023 11:47:56 +0900 Subject: [PATCH] Rearrange things, add notes, configure vscode hm module --- README.md | 2 +- .../common/software/cli/doom-emacs.d/config.el | 4 +++- .../common/software/cli/doom-emacs.d/init.el | 4 ++-- home-manager/common/software/gui/vscodium.nix | 14 +++++++++++++- .../nixos-laptop/desktops/hyprland/default.nix | 12 ++++++------ .../hyprland/{ => gruvbox}/hyprland-conf.nix | 0 .../desktops/hyprland/{ => gruvbox}/mako-conf.nix | 0 .../desktops/hyprland/{ => gruvbox}/rofi-conf.nix | 0 .../hyprland/{ => gruvbox}/swaylock-conf.nix | 0 .../hyprland/{ => gruvbox}/swayosd-conf.nix | 0 .../hyprland/{ => gruvbox}/waybar-conf.nix | 0 nixos/common/desktops/hyprland/default.nix | 4 +++- nixos/common/services/tailscale.nix | 2 +- nixos/default.nix | 1 - nixos/hosts/nixos-laptop/default.nix | 10 +++++++++- 15 files changed, 38 insertions(+), 15 deletions(-) rename home-manager/hosts/nixos-laptop/desktops/hyprland/{ => gruvbox}/hyprland-conf.nix (100%) rename home-manager/hosts/nixos-laptop/desktops/hyprland/{ => gruvbox}/mako-conf.nix (100%) rename home-manager/hosts/nixos-laptop/desktops/hyprland/{ => gruvbox}/rofi-conf.nix (100%) rename home-manager/hosts/nixos-laptop/desktops/hyprland/{ => gruvbox}/swaylock-conf.nix (100%) rename home-manager/hosts/nixos-laptop/desktops/hyprland/{ => gruvbox}/swayosd-conf.nix (100%) rename home-manager/hosts/nixos-laptop/desktops/hyprland/{ => gruvbox}/waybar-conf.nix (100%) diff --git a/README.md b/README.md index 15933d87..874ef39b 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ nixos-rebuild switch --flake '/etc/nixos#' * [ ] vscodium and user-config.js file? * [ ] rofi - bitwarden-cli / bitwarden-menu ([Link](https://search.nixos.org/packages?channel=23.05&show=bitwarden-menu&from=0&size=50&sort=relevance&type=packages&query=bitwarden)) * [ ] Try and submit this as a nixpkg - [Link](https://github.com/SylEleuth/gruvbox-plus-icon-pack) -* [ ] doom-emacs / spacemacs overlay install / configuration +* [x] doom-emacs / spacemacs overlay install / configuration * [ ] gnome-terminal theming (or alternatives) --- diff --git a/home-manager/common/software/cli/doom-emacs.d/config.el b/home-manager/common/software/cli/doom-emacs.d/config.el index 0de4792e..093c709d 100644 --- a/home-manager/common/software/cli/doom-emacs.d/config.el +++ b/home-manager/common/software/cli/doom-emacs.d/config.el @@ -1 +1,3 @@ -(setq doom-theme 'doom-gruvbox) \ No newline at end of file +(setq doom-theme 'doom-gruvbox) + +(setq doom-themes-treemacs-theme "doom-colors") \ No newline at end of file diff --git a/home-manager/common/software/cli/doom-emacs.d/init.el b/home-manager/common/software/cli/doom-emacs.d/init.el index 737986b2..c3a2c415 100644 --- a/home-manager/common/software/cli/doom-emacs.d/init.el +++ b/home-manager/common/software/cli/doom-emacs.d/init.el @@ -39,11 +39,11 @@ minimap ; show a map of the code on the side modeline ; snazzy, Atom-inspired modeline, plus API nav-flash ; blink cursor line after big motions - neotree ; a project drawer, like NERDTree for vim + ;;neotree ; a project drawer, like NERDTree for vim ophints ; highlight the region an operation acts on (popup +defaults) ; tame sudden yet inevitable temporary windows tabs ; a tab bar for Emacs - ;;treemacs ; a project drawer, like neotree but cooler + treemacs ; a project drawer, like neotree but cooler ;;unicode ; extended unicode support for various languages vc-gutter ; vcs diff in the fringe vi-tilde-fringe ; fringe tildes to mark beyond EOB diff --git a/home-manager/common/software/gui/vscodium.nix b/home-manager/common/software/gui/vscodium.nix index ae8db5bb..cc7d66c5 100644 --- a/home-manager/common/software/gui/vscodium.nix +++ b/home-manager/common/software/gui/vscodium.nix @@ -2,10 +2,22 @@ programs.vscode = { enable = true; package = pkgs.vscodium; + enableUpdateCheck = false; + enableExtensionUpdateCheck = false; extensions = with pkgs.vscode-extensions; [ waderyan.gitblame vscodevim.vim - + oderwat.indent-rainbow + naumovs.color-highlight + + # Themes + jdinhlife.gruvbox + github.github-vscode-theme + enkia.tokyo-night + dracula-theme.theme-dracula ]; + userSettings = { + + }; }; } \ No newline at end of file diff --git a/home-manager/hosts/nixos-laptop/desktops/hyprland/default.nix b/home-manager/hosts/nixos-laptop/desktops/hyprland/default.nix index 6bb852c9..e3c48e7c 100644 --- a/home-manager/hosts/nixos-laptop/desktops/hyprland/default.nix +++ b/home-manager/hosts/nixos-laptop/desktops/hyprland/default.nix @@ -1,10 +1,10 @@ { ... }: { imports = [ - ./hyprland-conf.nix - ./mako-conf.nix - ./rofi-conf.nix - ./swaylock-conf.nix - ./waybar-conf.nix - ./swayosd-conf.nix + ./gruvbox/hyprland-conf.nix + ./gruvbox/mako-conf.nix + ./gruvbox/rofi-conf.nix + ./gruvbox/swaylock-conf.nix + ./gruvbox/waybar-conf.nix + ./gruvbox/swayosd-conf.nix ]; } diff --git a/home-manager/hosts/nixos-laptop/desktops/hyprland/hyprland-conf.nix b/home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/hyprland-conf.nix similarity index 100% rename from home-manager/hosts/nixos-laptop/desktops/hyprland/hyprland-conf.nix rename to home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/hyprland-conf.nix diff --git a/home-manager/hosts/nixos-laptop/desktops/hyprland/mako-conf.nix b/home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/mako-conf.nix similarity index 100% rename from home-manager/hosts/nixos-laptop/desktops/hyprland/mako-conf.nix rename to home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/mako-conf.nix diff --git a/home-manager/hosts/nixos-laptop/desktops/hyprland/rofi-conf.nix b/home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/rofi-conf.nix similarity index 100% rename from home-manager/hosts/nixos-laptop/desktops/hyprland/rofi-conf.nix rename to home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/rofi-conf.nix diff --git a/home-manager/hosts/nixos-laptop/desktops/hyprland/swaylock-conf.nix b/home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/swaylock-conf.nix similarity index 100% rename from home-manager/hosts/nixos-laptop/desktops/hyprland/swaylock-conf.nix rename to home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/swaylock-conf.nix diff --git a/home-manager/hosts/nixos-laptop/desktops/hyprland/swayosd-conf.nix b/home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/swayosd-conf.nix similarity index 100% rename from home-manager/hosts/nixos-laptop/desktops/hyprland/swayosd-conf.nix rename to home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/swayosd-conf.nix diff --git a/home-manager/hosts/nixos-laptop/desktops/hyprland/waybar-conf.nix b/home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/waybar-conf.nix similarity index 100% rename from home-manager/hosts/nixos-laptop/desktops/hyprland/waybar-conf.nix rename to home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/waybar-conf.nix diff --git a/nixos/common/desktops/hyprland/default.nix b/nixos/common/desktops/hyprland/default.nix index c9d156d0..bbb640f5 100644 --- a/nixos/common/desktops/hyprland/default.nix +++ b/nixos/common/desktops/hyprland/default.nix @@ -92,12 +92,14 @@ pkgs.xdg-utils # Utilities for better X/Wayland integration pkgs.bitwarden-cli # Bitwarden for rofi pkgs.bitwarden-menu # Bitwarden for rofi - inputs.nixpkgs-wayland.packages.${platform}.wayprompt # from nixpkgs-wayland exclusively - pinentry UI pkgs.pulsemixer # TUI Pipewire / volume management # Themes pkgs.gruvbox-gtk-theme # Gruvbox Theme pkgs.papirus-icon-theme # Papirus Icons + + # wayland-packages + inputs.nixpkgs-wayland.packages.${platform}.wayprompt # from nixpkgs-wayland exclusively - pinentry UI ]; # Enable sound with pipewire. diff --git a/nixos/common/services/tailscale.nix b/nixos/common/services/tailscale.nix index 85d76a1b..b92ea6fb 100644 --- a/nixos/common/services/tailscale.nix +++ b/nixos/common/services/tailscale.nix @@ -1,5 +1,5 @@ { config, pkgs, ... }: { # Enable tailscale and open port 22 on it - services = { tailscale.enable = true; }; + services.tailscale.enable = true; networking.firewall.interfaces.tailscale0.allowedTCPPorts = [ 22 ]; } \ No newline at end of file diff --git a/nixos/default.nix b/nixos/default.nix index f0a5b228..db05e9fe 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -21,7 +21,6 @@ # List packages installed in system profile environment.systemPackages = with pkgs; [ sbctl - powerline-go wget killall curl diff --git a/nixos/hosts/nixos-laptop/default.nix b/nixos/hosts/nixos-laptop/default.nix index 76152039..907c433e 100644 --- a/nixos/hosts/nixos-laptop/default.nix +++ b/nixos/hosts/nixos-laptop/default.nix @@ -12,6 +12,11 @@ boot.kernelModules = [ "kvm-intel" "acpi_call" ]; boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ]; + # This expects the following: + # /boot is "VFAT" fstype with label "BOOT" + # / is "btrfs" fstype with label "ROOT" + # swap is "swap" fstype with label "SWAP" + fileSystems."/" = { device = "/dev/disk/by-label/ROOT"; fsType = "btrfs"; @@ -93,15 +98,18 @@ environment.systemPackages = with pkgs; [ # Fingerprint software - fprintd + fprintd + # nVidia gpu options vulkan-loader vulkan-validation-layers vulkan-tools gwe nvtop-nvidia + # Game related things gamemode + # WINE wineWowPackages.stable winetricks