diff options
| -rw-r--r-- | hosts/jupiter/config.nix | 20 | ||||
| -rw-r--r-- | hosts/jupiter/hjem.nix (renamed from hosts/jupiter/home.nix) | 5 | ||||
| -rw-r--r-- | hosts/jupiter/nixos.nix (renamed from hosts/jupiter/system.nix) | 7 | ||||
| -rw-r--r-- | modules/desktop/nixos/programs/blackbox.nix | 2 | ||||
| -rw-r--r-- | modules/desktop/options.nix | 1 | ||||
| -rw-r--r-- | modules/services/nixos/selfhost/default.nix | 6 | ||||
| -rw-r--r-- | modules/terminal/hjem/programs/broot.nix | 29 | ||||
| -rw-r--r-- | modules/terminal/hjem/programs/helix.nix | 2 | ||||
| -rw-r--r-- | modules/terminal/hjem/programs/tmux.nix | 35 | ||||
| -rw-r--r-- | modules/terminal/options.nix | 1 |
10 files changed, 63 insertions, 45 deletions
diff --git a/hosts/jupiter/config.nix b/hosts/jupiter/config.nix index 27bda45..ea33143 100644 --- a/hosts/jupiter/config.nix +++ b/hosts/jupiter/config.nix @@ -1,15 +1,4 @@ -{inputs, ...}: { - nix-furnace = { - extraHomeModules = [ - ./home.nix - ]; - - extraSystemModules = [ - ./system.nix - inputs.hjem.nixosModules.default - ]; - }; - +{ collinux = { theme = "adwaita"; @@ -21,6 +10,8 @@ desktop = { gnome.enable = true; + gdm.enable = true; + programs = { firefox.enable = true; blackbox.enable = true; @@ -39,10 +30,14 @@ }; helix = { + theme = "adwaita"; enable = true; hardMode = false; }; + tmux.enable = true; + broot.enable = true; + git = { enable = true; userName = "Collin Williams"; @@ -60,6 +55,7 @@ networking = { enable = true; networkmanager.enable = true; + tailscale.enable = true; }; audio = { diff --git a/hosts/jupiter/home.nix b/hosts/jupiter/hjem.nix index 137c74a..33d260a 100644 --- a/hosts/jupiter/home.nix +++ b/hosts/jupiter/hjem.nix @@ -1,6 +1,5 @@ {pkgs, ...}: { - home.preferXdgDirectories = true; - home.packages = with pkgs; [ + packages = with pkgs; [ orca-slicer freecad-wayland gimp @@ -8,6 +7,4 @@ bottles musescore ]; - - home.stateVersion = "25.05"; } diff --git a/hosts/jupiter/system.nix b/hosts/jupiter/nixos.nix index 1c63845..268b2bc 100644 --- a/hosts/jupiter/system.nix +++ b/hosts/jupiter/nixos.nix @@ -18,8 +18,13 @@ systemd.network.wait-online.enable = false; # fix for weird wifi issue + # music stuff services.pipewire.jack.enable = true; - environment.systemPackages = with pkgs; [puredata vital helvum]; + environment.systemPackages = with pkgs; [vital helvum]; + + fonts.packages = [pkgs.nerd-fonts.iosevka]; system.stateVersion = "25.05"; + + nixpkgs.hostPlatform = "x86_64-linux"; } diff --git a/modules/desktop/nixos/programs/blackbox.nix b/modules/desktop/nixos/programs/blackbox.nix index 37567b5..9cff44a 100644 --- a/modules/desktop/nixos/programs/blackbox.nix +++ b/modules/desktop/nixos/programs/blackbox.nix @@ -20,6 +20,8 @@ in show-scrollbars = false; terminal-padding = lib.gvariant.mkTuple (builtins.map lib.gvariant.mkInt16 [10 10 10 10]); + font = "Iosevka Nerd Font 12"; + floating-controls = false; show-headerbar = true; }; diff --git a/modules/desktop/options.nix b/modules/desktop/options.nix index 72dda95..994b13d 100644 --- a/modules/desktop/options.nix +++ b/modules/desktop/options.nix @@ -111,6 +111,7 @@ in { foot.enable = mkEnableOption "foot"; blackbox.enable = mkEnableOption "blackbox"; + alacritty.enable = mkEnableOption "alacritty"; research.enable = mkEnableOption "zathura, Xournal++, Zotero, Zotero Connector"; }; diff --git a/modules/services/nixos/selfhost/default.nix b/modules/services/nixos/selfhost/default.nix index 03dbe4f..d3b884a 100644 --- a/modules/services/nixos/selfhost/default.nix +++ b/modules/services/nixos/selfhost/default.nix @@ -1,5 +1,11 @@ { + lib, + config, + ... +}: { imports = [ ./navidrome.nix ]; + + qt.style = lib.optionalAttrs (config.collinux.theme == "adwaita") {name = "adwaita-dark";}; } diff --git a/modules/terminal/hjem/programs/broot.nix b/modules/terminal/hjem/programs/broot.nix index 72098f8..2907a85 100644 --- a/modules/terminal/hjem/programs/broot.nix +++ b/modules/terminal/hjem/programs/broot.nix @@ -4,21 +4,22 @@ lib, ... }: let - cfg = config.collinux.terminal.shells.fish; + cfg = config.collinux.terminal.programs.broot; - conf = { - skin = catppuccin_skin; - verbs = [ - { - name = "open-code"; - key = "enter"; - execution = "$EDITOR +{line} {file}"; - working_dir = "{root}"; - apply_to = "file"; - leave_broot = true; - } - ]; - }; + conf = + { + verbs = [ + { + name = "open-code"; + key = "enter"; + execution = "$EDITOR +{line} {file}"; + working_dir = "{root}"; + apply_to = "file"; + leave_broot = true; + } + ]; + } + // (lib.optionalAttrs (cfg.theme == "catppuccin") {skin = catppuccin_skin;}); catppuccin_skin = { input = "rgb(205, 214, 244) none"; diff --git a/modules/terminal/hjem/programs/helix.nix b/modules/terminal/hjem/programs/helix.nix index 2c30881..e66877b 100644 --- a/modules/terminal/hjem/programs/helix.nix +++ b/modules/terminal/hjem/programs/helix.nix @@ -134,7 +134,7 @@ if cfg.theme == "catppuccin" then "catppuccin_mocha_transparent" else if cfg.theme == "adwaita" - then "adwaita_dark" + then "adwaita-dark" else ""; }; in diff --git a/modules/terminal/hjem/programs/tmux.nix b/modules/terminal/hjem/programs/tmux.nix index 6ff485c..738e729 100644 --- a/modules/terminal/hjem/programs/tmux.nix +++ b/modules/terminal/hjem/programs/tmux.nix @@ -104,7 +104,7 @@ done ''; - scripts.launchSessionizer = ''broot --only-folders --conf ~/.config/tmux/broot/sessionizer.toml''; + scripts.launchSessionizer = ''${pkgs.broot}/bin/broot --only-folders --conf ~/.config/tmux/broot/sessionizer.toml''; # -- FIND FILE -- broot_file_config = { @@ -132,7 +132,7 @@ ]; }; - scripts.launchFindFile = ''broot --conf ~/.config/tmux/broot/file.toml''; + scripts.launchFindFile = ''${pkgs.broot}/bin/broot --conf ~/.config/tmux/broot/file.toml''; # -- BAR -- scripts.battery = '' @@ -161,20 +161,27 @@ tmux set -g window-status-separator "" tmux set -g status-right "#[fg=color243]%l:%M #[fg=red]#(${scriptsDir}/battery.sh) " + ''; - bg_dark="#181825" + scripts.catpuccinNoBorders = + if (cfg.theme == "catppuccin") + then '' + bg_dark="#181825" - ## pane borders - tmux set -g pane-border-style fg=$bg_dark,bg=$bg_dark - tmux set -g pane-active-border-style fg=$bg_dark,bg=$bg_dark + ## pane borders + tmux set -g pane-border-style fg=$bg_dark,bg=$bg_dark + tmux set -g pane-active-border-style fg=$bg_dark,bg=$bg_dark - ## pane backgrounds - # Set the foreground/background color for the active window - tmux set -g window-active-style bg=$bg + ## pane backgrounds + # Set the foreground/background color for the active window + tmux set -g window-active-style bg=bg - # Set the foreground/background color for all other windows - tmux set -g window-style bg=$bg_dark - ''; + # Set the foreground/background color for all other windows + tmux set -g window-style bg=$bg_dark + '' + else '' + tmux set -g status-bg "#262626" + ''; # -- FZF EXEC -- scripts.tmuxDoc = '' @@ -194,7 +201,7 @@ tmux list-commands -F $'#{command_list_name}#{?command_list_alias,\n#{command_list_alias},}' } - selected_cmd=$(all_cmds | fzf --bind 'enter:accept-or-print-query,tab:replace-query,alt-backspace:clear-query' --prompt : --preview "~/.config/tmux/scripts/tmux-doc.sh $(printf '{}' | cut -d' ' -f1)") + selected_cmd=$(all_cmds | ${pkgs.fzf}/bin/fzf --bind 'enter:accept-or-print-query,tab:replace-query,alt-backspace:clear-query' --prompt : --preview "~/.config/tmux/scripts/tmux-doc.sh $(printf '{}' | cut -d' ' -f1)") test -z "$selected_cmd" && exit tmux $(echo "$selected_cmd" | sed "s@~@$HOME@g") @@ -271,6 +278,7 @@ # Statusbar run-shell "${scriptsDir}/bar.sh" + run-shell "${scriptsDir}/catppuccin-borders.sh" # Scrollback set-window-option -g mode-keys vi @@ -322,6 +330,7 @@ in # Bar ".config/tmux/scripts/battery.sh" = e scripts.battery; ".config/tmux/scripts/bar.sh" = e scripts.bar; + ".config/tmux/scripts/catppuccin-borders.sh" = e scripts.catpuccinNoBorders; ".config/tmux/tmux.conf".text = tmux-conf; }; diff --git a/modules/terminal/options.nix b/modules/terminal/options.nix index 8799c0b..47f2057 100644 --- a/modules/terminal/options.nix +++ b/modules/terminal/options.nix @@ -62,6 +62,7 @@ in { fzf = mkProgramOption "fzf fuzzy finder"; bat = mkProgramOption "bat cat replacement"; eza = mkProgramOption "eza ls replacement"; + broot = mkProgramOption "broot"; }; }; }; |