diff options
| -rw-r--r-- | flake.nix | 7 | ||||
| -rw-r--r-- | nixos/configuration.nix | 4 | ||||
| -rw-r--r-- | nixos/environment.nix | 11 | ||||
| -rw-r--r-- | nixos/home.nix | 27 | ||||
| -rw-r--r-- | nixos/terminal_workspace/default.nix | 6 | ||||
| -rw-r--r-- | nixos/terminal_workspace/tmux.nix (renamed from nixos/tmux.nix) | 0 | ||||
| -rw-r--r-- | nixos/terminal_workspace/zellij.nix | 6 |
7 files changed, 47 insertions, 14 deletions
@@ -50,6 +50,10 @@ rust = false; zig = false; }; + terminalworkspace = { + tmux = false; + zellij = true; + }; # This is where I have keep the dotfiles folder, replace it accordingly symlinkRoot = "/home/${username}/dotfiles"; @@ -63,7 +67,8 @@ inherit system; specialArgs = { inherit quickshell inputs system - username hostname unstable symlinkRoot opt languages; + username hostname unstable symlinkRoot + opt languages terminalworkspace; }; modules = [ diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 0cdad27..7bb1948 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -10,9 +10,9 @@ ./desktop-environment.nix ./environment.nix ./nvim.nix - ./languages ./apps.nix - ./tmux.nix + ./languages + ./terminal_workspace ./opt ]; diff --git a/nixos/environment.nix b/nixos/environment.nix index b934f2a..0919898 100644 --- a/nixos/environment.nix +++ b/nixos/environment.nix @@ -3,6 +3,16 @@ programs.nix-ld.enable = true; environment.systemPackages = with pkgs; [ man-pages-posix + uutils-coreutils-noprefix + fd + bat + eza + xh + hyperfine + delta + tokei + wiki-tui + fastfetch pipes vim @@ -24,7 +34,6 @@ zoxide starship - eza fzf termusic lazygit diff --git a/nixos/home.nix b/nixos/home.nix index 6852e57..a18ac97 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -20,16 +20,16 @@ function fish_prompt -d "Write out the prompt" (set_color $fish_color_cwd) (prompt_pwd) (set_color normal) end -if status is-interactive - set fish_greeting - - if not set -q TMUX - tmux new-session -d -s "main" -c "~/dev" - if not set -q VSCODE_PID - tmux -u a - end - end -end +# if status is-interactive +# set fish_greeting +# +# if not set -q TMUX +# tmux new-session -d -s "main" -c "~/dev" +# if not set -q VSCODE_PID +# tmux -u a +# end +# end +# end function tsnode set filename (basename $argv[1] .ts) @@ -48,6 +48,9 @@ alias py=python alias tmux="tmux -u" alias snvim="sudo -E -s nvim" alias ls="eza" +alias cat="bat" +alias find="fd" +alias cloc="tokei" alias scrcpy="scrcpy --render-driver=opengl" alias wisdom="fortune ~/.config/fortune/showerthoughts | cowsay | lolcat" function mkcd @@ -68,7 +71,11 @@ set ANDROID_NDK_ROOT /opt/android-ndk set ANDROID_HOME /opt/android-sdk ''; }; + # programs.nushell = { + # enable = true; + # }; environment.systemPackages = with pkgs; [ + nushell home-manager ]; } diff --git a/nixos/terminal_workspace/default.nix b/nixos/terminal_workspace/default.nix new file mode 100644 index 0000000..862cbb1 --- /dev/null +++ b/nixos/terminal_workspace/default.nix @@ -0,0 +1,6 @@ +{ config, pkgs, terminalworkspace, ... }: +{ + imports = + (if terminalworkspace.tmux then [ ./tmux.nix ] else []) ++ + (if terminalworkspace].zellij then [ ./zellij.nix ] else []); +} diff --git a/nixos/tmux.nix b/nixos/terminal_workspace/tmux.nix index fa59ec4..fa59ec4 100644 --- a/nixos/tmux.nix +++ b/nixos/terminal_workspace/tmux.nix diff --git a/nixos/terminal_workspace/zellij.nix b/nixos/terminal_workspace/zellij.nix new file mode 100644 index 0000000..549fe9f --- /dev/null +++ b/nixos/terminal_workspace/zellij.nix @@ -0,0 +1,6 @@ +{ config, pkgs, ... }: +{ + environment.systemPackages = with pkgs; [ + zellij + ]; +} |