Squash merge dev into master

home-manager/cobray.nix

@@ -16,6 +16,8 @@
     ./modules/zellij.nix
     ./modules/ffmpeg.nix
     ./modules/emulators.nix
+    ./modules/discord.nix
+    ./modules/brave.nix
   ];
 
   home.username = "cobray";
@@ -28,7 +30,6 @@
   home.packages = with pkgs; [
     coreutils
     gnused
-    gnugrep
     findutils
     yazi
     htop

home-manager/modules/brave.nix

@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  programs.brave = {
+    enable = true;
+    package = pkgs.brave;
+  };
+}

home-manager/modules/discord.nix

@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    discord
+    vesktop
+  ];
+}

home-manager/modules/emulators.nix

@@ -1,7 +1,4 @@
-{
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   home.packages = with pkgs; [
     mgba
     desmume
@@ -9,7 +6,7 @@
     pcsx2
     ryujinx
     mupen64plus
-    dolphin-emu
+    dolphin-emu # might remove. causes a long time to build
     retroarch
     mednafen
     joycond

home-manager/modules/fish.nix

@@ -1,14 +1,10 @@
-{
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   home.packages = with pkgs; [
     fish-rust
-    starship
     fzf
     bat
     eza
     fd
-    ripgrep
+    ugrep
   ];
 }

home-manager/modules/lazygit.nix

@@ -1,15 +1,16 @@
-{
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   home.packages = with pkgs; [
     lazygit
+    git
+    git-lfs
+    gitAndTools.gh
+    gitAndTools.diff-so-fancy
   ];
 
   programs.git = {
     enable = true;
     includes = [
-      { path = "./.secrets/.git-config"; }
+      {path = "./.secrets/.git-config";}
     ];
     extraConfig = {
       credential.helper = "store --file ./.secrets/.git-credentials";

home-manager/modules/nvim.nix

@@ -6,18 +6,39 @@
   home.packages = with pkgs; [
     neovim
     gnugrep
-    fd
-    fzf
-    nodejs
-    gcc
     git
     luajit
     luaPackages.luarocks
+    gopls
+    haskell-language-server
+    jdt-language-server
+    clang-tools
+    vscode-langservers-extracted
+    marksman
     nil
-    lua-language-server
+    taplo
+    yaml-language-server
+    sqls
+    alejandra
+    stylua
+    shfmt
+    yamlfmt
+    luaPackages.luacheck
+    yamllint
+    hadolint
+    shellcheck
+    cppcheck
+    rubocop
+    phpPackages.php-codesniffer
+    phpPackages.phpstan
+    checkstyle
+    tflint
+    sqlfluff
+    tree-sitter
+    luajitPackages.jsregexp
+    jq
     curl
     unzip
-    alejandra
   ];
 
   home.sessionVariables = {

home-manager/modules/picom.nix

@@ -1,7 +1,4 @@
-{
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   home.packages = with pkgs; [
     picom
   ];

home-manager/modules/polybar.nix

@@ -1,6 +1,3 @@
-{
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   home.packages = pkgs.polybar.all;
 }