diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/git.nix | 11 | ||||
| -rw-r--r-- | home/home.nix | 30 | ||||
| -rw-r--r-- | home/shells/fish.nix | 17 | ||||
| -rw-r--r-- | home/shells/starship.nix | 10 | ||||
| -rw-r--r-- | home/terminal/btop.nix | 6 | ||||
| -rw-r--r-- | home/terminal/fish.nix | 64 | ||||
| -rw-r--r-- | home/terminal/foot.nix (renamed from home/terminals/foot.nix) | 0 | ||||
| -rw-r--r-- | home/terminal/starship.nix | 111 | ||||
| -rw-r--r-- | home/terminal/utils.nix | 26 | ||||
| -rw-r--r-- | home/wayland/niri/niri.nix | 1 | ||||
| -rw-r--r-- | home/xdg.nix | 4 |
11 files changed, 228 insertions, 52 deletions
diff --git a/home/git.nix b/home/git.nix new file mode 100644 index 0000000..dc11881 --- /dev/null +++ b/home/git.nix @@ -0,0 +1,11 @@ +{ ... }: +{ + programs.git = { + enable = true; + settings = { + user.name = "adikro"; + user.email = "adikro@disroot.org"; + init.defaultBranch = "main"; + }; + }; +} diff --git a/home/home.nix b/home/home.nix index f4342a2..f606bd5 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,9 +1,8 @@ { pkgs, inputs, ... }: - { imports = [ # Window Managers - ./wayland/hyprland/hyprland.nix + # ./wayland/hyprland/hyprland.nix ./wayland/niri/niri.nix # Wayland specific programs ./wayland/waybar.nix @@ -12,14 +11,17 @@ ./editors/nixvim.nix ./editors/helix.nix # Programs - ./terminals/foot.nix - ./shells/fish.nix - ./shells/starship.nix + ./terminal/foot.nix + ./terminal/fish.nix + ./terminal/starship.nix + ./terminal/utils.nix + ./terminal/btop.nix ./programs/spicetify.nix ./programs/nixcord.nix ./programs/yazi.nix # Other ./xdg.nix + ./git.nix ]; home.username = "adam"; @@ -27,11 +29,8 @@ home.stateVersion = "25.05"; home.packages = with pkgs; [ + ncdu halloy - xdg-utils - wofi - librewolf - firefox equibop inputs.prismlauncher.packages.${pkgs.stdenv.hostPlatform.system}.prismlauncher inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww @@ -40,9 +39,7 @@ satty veracrypt brave - ripgrep qbittorrent-enhanced - fastfetch foot bitwarden-desktop yt-dlp_git @@ -56,17 +53,6 @@ alsa-utils ]; - programs.btop.enable = true; - - programs.git = { - enable = true; - settings = { - user.name = "adikro"; - user.email = "adikro@disroot.org"; - init.defaultBranch = "main"; - }; - }; - gtk = { enable = true; colorScheme = "dark"; diff --git a/home/shells/fish.nix b/home/shells/fish.nix deleted file mode 100644 index 9634249..0000000 --- a/home/shells/fish.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ ... }: - -{ - programs.fish = { - enable = true; - - interactiveShellInit = - '' - set fish_greeting - fastfetch - ''; - - shellAliases = { - gs = "git status"; - }; - }; -} diff --git a/home/shells/starship.nix b/home/shells/starship.nix deleted file mode 100644 index bd4aa3c..0000000 --- a/home/shells/starship.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ ... }: -{ - programs.starship = { - enable = true; - - settings = { - add_newline = true; - }; - }; -} diff --git a/home/terminal/btop.nix b/home/terminal/btop.nix new file mode 100644 index 0000000..dcd59ed --- /dev/null +++ b/home/terminal/btop.nix @@ -0,0 +1,6 @@ +{ ... }: +{ + programs.btop = { + enable = true; + }; +} diff --git a/home/terminal/fish.nix b/home/terminal/fish.nix new file mode 100644 index 0000000..f1ad64d --- /dev/null +++ b/home/terminal/fish.nix @@ -0,0 +1,64 @@ +{ pkgs, ... }: +{ + programs.fish = { + enable = true; + + interactiveShellInit = '' + set fish_greeting + fastfetch + ''; + + shellAliases = { + nos = "nh os switch"; + nob = "nh os boot"; + nfu = "nix flake update"; + ll = "ls -lah"; + la = "ls -A"; + md = "mkdir -p"; + rmf = "rm -rf"; + gl = "git log --oneline --graph --decorate"; + untar = "tar -xzvf"; + tarc = "tar -czvf"; + ff = "fastfetch"; + cat = "bat"; + ls = "eza"; + find = "fd"; + grep = "rg"; + }; + + plugins = [ + { + name = "transient-fish"; + src = pkgs.fishPlugins.transient-fish.src; + } + { + name = "fishbang"; + src = pkgs.fishPlugins.fishbang.src; + } + { + name = "puffer"; + src = pkgs.fishPlugins.puffer.src; + } + { + name = "pisces"; + src = pkgs.fishPlugins.pisces.src; + } + { + name = "fzf-fish"; + src = pkgs.fishPlugins.fzf-fish.src; + } + { + name = "fish-you-should-use"; + src = pkgs.fishPlugins.fish-you-should-use.src; + } + { + name = "colored-man-pages"; + src = pkgs.fishPlugins.colored-man-pages.src; + } + { + name = "fifc"; + src = pkgs.fishPlugins.fifc.src; + } + ]; + }; +} diff --git a/home/terminals/foot.nix b/home/terminal/foot.nix index 5c3098b..5c3098b 100644 --- a/home/terminals/foot.nix +++ b/home/terminal/foot.nix diff --git a/home/terminal/starship.nix b/home/terminal/starship.nix new file mode 100644 index 0000000..82ab84e --- /dev/null +++ b/home/terminal/starship.nix @@ -0,0 +1,111 @@ +{ ... }: +{ + programs.starship = { + enable = true; + settings = { + add_newline = true; + aws.disabled = true; + battery.disabled = true; + buf.disabled = true; + bun.disabled = true; + c.format = "[$symbol ]($style)"; + cpp = { + disabled = false; + format = "[$symbol ]($style)"; + }; + cmake.disabled = true; + cobol.disabled = true; + # cmd_duration = { + # min_time = 3; + # show_notifications = true; + # min_time_to_notify = 30; + # }; + conda.disabled = true; + container.disabled = true; + crystal.disabled = true; + daml.disabled = true; + dart.disabled = true; + deno.disabled = true; + directory = { + truncate_to_repo = false; + read_only = ""; + }; + docker_context = { + format = "[$symbol ]($style)"; + symbol = ""; + }; + dotnet.disabled = true; + elixir.disabled = true; + elm.disabled = true; + erlang.disabled = true; + fennel.disabled = true; + fortran.disabled = true; + gcloud.disabled = true; + git_commit.tag_symbol = ""; + git_status = { + conflicted = ""; + ahead = ""; + behind = ""; + diverged = ""; + renamed = ""; + deleted = "x"; + }; + gleam.disabled = true; + golang.disabled = true; + guix_shell.disabled = true; + gradle.disabled = true; + haskell.disabled = true; + haxe.disabled = true; + helm.disabled = true; + hostname.format = "[$hostname ]($style) "; + java.disabled = true; + jobs.symbol = ""; + julia.disabled = true; + kotlin.disabled = true; + lua.disabled = true; + meson.disabled = true; + mojo.disabled = true; + nats.disabled = true; + netns.disabled = true; + nim.disabled = true; + nix_shell.format = "[$symbol$state ]($style)"; + nodejs.disabled = true; + ocaml.disabled = true; + odin.disabled = true; + opa.disabled = true; + openstack.disabled = true; + package.disabled = true; + perl.disabled = true; + php.disabled = true; + pixi.disabled = true; + pulumi.disabled = true; + purescript.disabled = true; + python = { + symbol = ""; + format = "[$symbol ]($style)"; + }; + quarto.disabled = true; + rlang.disabled = true; + raku.disabled = true; + red.disabled = true; + ruby.disabled = true; + rust.symbol = ""; + scala.disabled = true; + singularity.disabled = true; + solidity.disabled = true; + spack.disabled = true; + # sudo = { + # format = "[sudo ]($style)"; + # disabled = false; + # }; + swift.disabled = true; + terraform.disabled = true; + typst.disabled = true; + vagrant.disabled = true; + vlang.disabled = true; + vcsh.disabled = true; + xmake.disabled = true; + zig.disabled = true; + }; + }; +} diff --git a/home/terminal/utils.nix b/home/terminal/utils.nix new file mode 100644 index 0000000..c408e4a --- /dev/null +++ b/home/terminal/utils.nix @@ -0,0 +1,26 @@ +{ pkgs, ... }: +{ + programs.zoxide = { + enable = true; + options = [ + "--cmd cd" + ]; + }; + programs.bat = { + enable = true; + config = { + theme = "gruvbox-dark"; + tabs = "2"; + }; + }; + home.packages = with pkgs; [ + fzf + fd + chafa + hexyl + eza + ripgrep + procs + fastfetch + ]; +} diff --git a/home/wayland/niri/niri.nix b/home/wayland/niri/niri.nix index e14f224..60a5e16 100644 --- a/home/wayland/niri/niri.nix +++ b/home/wayland/niri/niri.nix @@ -68,7 +68,6 @@ }; }; spawn-at-startup = [ - { command = [ "dbus-update-activation-environment" "--systemd" "DISPLAY" "WAYLAND_DISPLAY" "XDG_CURRENT_DESKTOP" "SWAYSOCK" "XDG_SESSION_TYPE" "NIXOS_OZONE_WL" ]; } { command = [ "${lib.getExe pkgs.xwayland-satellite}" ]; } { command = [ "awww-daemon" ]; } { command = [ "wl-paste --watch cliphist store" ]; } diff --git a/home/xdg.nix b/home/xdg.nix index be43d92..a587d04 100644 --- a/home/xdg.nix +++ b/home/xdg.nix @@ -16,7 +16,7 @@ extraConfig = { XDG_PROJECTS_DIR = "$HOME/proj"; - XDG_GAMES_DIR = "$HOME/Games"; + XDG_GAMES_DIR = "$HOME/games"; XDG_MEDIA_DIR = "/media"; XDG_SS_DIR = "/media/ss"; XDG_CLIPS_DIR = "/media/clips"; @@ -26,7 +26,7 @@ }; home.sessionVariables = { XDG_PROJECTS_DIR = "$HOME/proj"; - XDG_GAMES_DIR = "$HOME/Games"; + XDG_GAMES_DIR = "$HOME/games"; XDG_MEDIA_DIR = "/media"; XDG_SS_DIR = "/media/ss"; XDG_CLIPS_DIR = "/media/clips"; |