From a14212472584a9b872970554ff55e5b222b46c01 Mon Sep 17 00:00:00 2001 From: deva Date: Thu, 12 Sep 2024 16:49:06 -0400 Subject: [PATCH] rewrite time! --- modules/home/ags.nix | 29 +++++++---- modules/home/dev/default.nix | 33 +++++++----- modules/home/dv.nix | 2 +- modules/home/term/default.nix | 2 - modules/home/term/wezterm.lua | 26 ++++++++-- modules/nixos/fonts.nix | 4 +- modules/nixos/gui.nix | 23 +++++++- modules/nixos/nix-ld.nix | 6 ++- modules/nixos/sound.nix | 1 + waves.nix | 98 +++++++++++++++++------------------ 10 files changed, 141 insertions(+), 83 deletions(-) diff --git a/modules/home/ags.nix b/modules/home/ags.nix index 7fb44b8..c517fcf 100644 --- a/modules/home/ags.nix +++ b/modules/home/ags.nix @@ -1,13 +1,20 @@ -{inputs, pkgs, ...}: { - imports = [inputs.ags.homeManagerModules.default]; - programs.ags = { - enable = true; +{ + inputs, + pkgs, + ... +}: { + imports = [inputs.ags.homeManagerModules.default]; + home.packages = with pkgs; [ + sassc + ]; + programs.ags = { + enable = true; - # additional packages to add to gjs's runtime - extraPackages = with pkgs; [ - gtksourceview - webkitgtk - accountsservice - ]; - }; + # additional packages to add to gjs's runtime + extraPackages = with pkgs; [ + gtksourceview + webkitgtk + accountsservice + ]; + }; } diff --git a/modules/home/dev/default.nix b/modules/home/dev/default.nix index 5e7dd63..49f310c 100644 --- a/modules/home/dev/default.nix +++ b/modules/home/dev/default.nix @@ -1,11 +1,11 @@ {pkgs, ...}: { - imports = [ - ./git.nix - ./ssh.nix - ./gpg.nix - ]; + imports = [ + ./git.nix + ./ssh.nix + ./gpg.nix + ]; - home.packages = with pkgs; [ + home.packages = with pkgs; [ unstable.bruno unstable.xclip unstable.just @@ -22,11 +22,20 @@ unstable.jetbrains.idea-community unstable.cascadia-code unstable.jdk17 + # unstable.lua + unstable.lua51Packages.lua + unstable.tree-sitter + unstable.luarocks + unstable.gnumake + unstable.ast-grep unstable.ncdu - unstable.gh-dash - unstable.hurl - unstable.jnv - unstable.rustscan - unstable.slides - ]; + unstable.gh-dash + unstable.hurl + unstable.jnv + unstable.rustscan + unstable.slides + unstable.markdownlint-cli2 + unstable.fx + unstable.jq + ]; } diff --git a/modules/home/dv.nix b/modules/home/dv.nix index d58e99f..2966a4f 100644 --- a/modules/home/dv.nix +++ b/modules/home/dv.nix @@ -17,7 +17,7 @@ # gui ./gui-core.nix ./ags.nix - ./niri.nix + # ./niri.nix ]; nix = { diff --git a/modules/home/term/default.nix b/modules/home/term/default.nix index ebab986..ea6fa35 100644 --- a/modules/home/term/default.nix +++ b/modules/home/term/default.nix @@ -138,7 +138,6 @@ in { unstable.tailspin unstable.viddy netscanner - atuin kalker unstable.steam-run fd @@ -211,7 +210,6 @@ in { zinit light Aloxaf/fzf-tab zinit light zsh-users/zsh-syntax-highlighting zinit light zsh-users/zsh-autosuggestions - zinit light atuinsh/atuin # snippets zinit snippet OMZP::git diff --git a/modules/home/term/wezterm.lua b/modules/home/term/wezterm.lua index d5e2606..17a40db 100644 --- a/modules/home/term/wezterm.lua +++ b/modules/home/term/wezterm.lua @@ -2,7 +2,7 @@ local wezterm = require("wezterm") local config = wezterm.config_builder() -config.color_scheme = "camellia-hope-dark" +config.color_scheme = "Catppuccin Macchiato" config.use_fancy_tab_bar = false config.window_decorations = "RESIZE" config.hide_tab_bar_if_only_one_tab = true @@ -14,9 +14,9 @@ config.font = wezterm.font_with_fallback({ -- { family = "Rec Mono Waves", weight = "Regular" }, { family = "JuliaMono", weight = "Regular" }, -- "CozetteHiDpi", - "Symbols Nerd Font Mono", + "Symbols Nerd Font", }) -config.font_size = 10 +config.font_size = 14 -- config.cell_width = 0.88 config.set_environment_variables = { @@ -34,4 +34,24 @@ config.window_padding = { config.default_cursor_style = "SteadyBar" +-- wayland support +config.enable_wayland = false + +config.unix_domains = { + { + name = "unix", + }, +} +config.freetype_load_flags = "DEFAULT" +config.window_background_opacity = 0.95 +config.max_fps = 144 +config.scrollback_lines = 10000 + +-- This causes `wezterm` to act as though it was started as +-- `wezterm connect unix` by default, connecting to the unix +-- domain on startup. +-- If you prefer to connect manually, leave out this line. +-- config.default_gui_startup_args = { "connect", "unix" } +config.ssh_domains = wezterm.default_ssh_domains() + return config diff --git a/modules/nixos/fonts.nix b/modules/nixos/fonts.nix index e6ab857..0c5a31d 100644 --- a/modules/nixos/fonts.nix +++ b/modules/nixos/fonts.nix @@ -6,7 +6,7 @@ antialias = true; defaultFonts = { emoji = ["Noto Color Emoji"]; - monospace = ["Rec Mono Waves" "Symbols Nerd Font" "Noto Color Emoji"]; + monospace = ["JuliaMono" "Symbols Nerd Font" "Noto Color Emoji"]; serif = ["Noto Serif" "Noto Color Emoji"]; sansSerif = ["Overpass" "Nunito" "Noto Color Emoji"]; }; @@ -30,7 +30,7 @@ pkgs.material-design-icons (pkgs.google-fonts.override {fonts = ["Overpass" "Nunito"];}) - (pkgs.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];}) + (pkgs.unstable.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];}) ]; }; } diff --git a/modules/nixos/gui.nix b/modules/nixos/gui.nix index 6462967..6661d0d 100644 --- a/modules/nixos/gui.nix +++ b/modules/nixos/gui.nix @@ -1 +1,22 @@ -{...}: {} +{pkgs, ...}: { + services.xserver.enable = true; + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; + environment.gnome.excludePackages = + (with pkgs; [ + # for packages that are pkgs.* + gnome-tour + gnome-connections + ]) + ++ (with pkgs.gnome; [ + # for packages that are pkgs.gnome.* + epiphany # web browser + geary # email reader + evince # document viewer + ]); + + programs.hyprland.enable = true; + programs.hyprlock.enable = true; + services.hypridle.enable = true; + programs.hyprland.xwayland.enable = true; +} diff --git a/modules/nixos/nix-ld.nix b/modules/nixos/nix-ld.nix index 784b106..ee62925 100644 --- a/modules/nixos/nix-ld.nix +++ b/modules/nixos/nix-ld.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { # Enable nix ld programs.nix-ld.enable = true; @@ -8,6 +7,7 @@ at-spi2-atk at-spi2-core atk + readline cairo cups curl @@ -55,6 +55,8 @@ xorg.libxcb xorg.libxkbfile xorg.libxshmfence + fzf zlib + libgit2 ]; } diff --git a/modules/nixos/sound.nix b/modules/nixos/sound.nix index 0f2b69d..3f0fd9d 100644 --- a/modules/nixos/sound.nix +++ b/modules/nixos/sound.nix @@ -12,4 +12,5 @@ rate = 48000; }; }; + hardware.pulseaudio.enable = false; } diff --git a/waves.nix b/waves.nix index a5faf4e..862785c 100644 --- a/waves.nix +++ b/waves.nix @@ -1,45 +1,44 @@ { -config, -lib, -pkgs, -outputs, -inputs, -... -}: -{ - imports = [ - ./waves-hardware.nix - inputs.nix-gaming.nixosModules.pipewireLowLatency - ./modules/nixos/virtualisation.nix - ./modules/nixos/kanata.nix - ./modules/nixos/services.nix - ./modules/nixos/localnameresolution.nix - ./modules/nixos/syncthing.nix - ./modules/nixos/users.nix - ./modules/nixos/adb.nix - ./modules/nixos/console.nix - ./modules/nixos/fonts.nix - ./modules/nixos/nvidia.nix - ./modules/nixos/gui.nix - ./modules/nixos/i18n.nix - ./modules/nixos/zsh.nix - ./modules/nixos/nix-ld.nix - ]; + config, + lib, + pkgs, + outputs, + inputs, + ... +}: { + imports = [ + ./waves-hardware.nix + inputs.nix-gaming.nixosModules.pipewireLowLatency + ./modules/nixos/virtualisation.nix + ./modules/nixos/kanata.nix + ./modules/nixos/services.nix + ./modules/nixos/localnameresolution.nix + ./modules/nixos/syncthing.nix + ./modules/nixos/users.nix + ./modules/nixos/adb.nix + ./modules/nixos/console.nix + ./modules/nixos/fonts.nix + ./modules/nixos/nvidia.nix + ./modules/nixos/gui.nix + ./modules/nixos/i18n.nix + ./modules/nixos/zsh.nix + ./modules/nixos/nix-ld.nix + ]; - system.stateVersion = "24.05"; + system.stateVersion = "24.05"; - nixpkgs.config = { - allowUnfree = true; - cudaSupport = true; - }; - nixpkgs.overlays = [ - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - ]; - nix = let - flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs; - in { + nixpkgs.config = { + allowUnfree = true; + cudaSupport = true; + }; + nixpkgs.overlays = [ + outputs.overlays.additions + outputs.overlays.modifications + outputs.overlays.unstable-packages + ]; + nix = let + flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs; + in { settings = { # Enable flakes and new 'nix' command experimental-features = "nix-command flakes"; @@ -72,23 +71,24 @@ inputs, nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs; }; - environment.systemPackages = with pkgs; [ - unstable.neovim - fuse3 - floorp - localsend - parsec-bin - ]; + environment.systemPackages = with pkgs; [ + unstable.neovim + python3 + fuse3 + floorp + localsend + parsec-bin + ]; -# security + # security security = { sudo.wheelNeedsPassword = false; # don't ask password for wheel group, disk is encrypted with a secure password & ssh auth with password is disabled! # enable trusted platform module 2 support tpm2.enable = true; }; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; networking.hostName = "waves"; networking.networkmanager.enable = true; boot.supportedFilesystems = ["ntfs"];