changes necessary for a nix update

6 files changed, 12 insertions, 41 deletions

diff --git a/home/editors/nixvim.nix b/home/editors/nixvim.nix
index 6bfc119..2ea5b94 100644
--- a/home/editors/nixvim.nix
+++ b/home/editors/nixvim.nix
@@ -91,31 +91,5 @@
         register = "wl-copy";
       };
     };
-
-  #   keymaps = [
-  #   {
-  #     key    = "<Up>";
-  #     action = "<Nop>";
-  #     mode   = [ "n" "i" "v" ];
-  #     options = { silent = true; };
-  #   }
-  #   { key    = "<Down>";
-  #     action = "<Nop>";
-  #     mode   = [ "n" "i" "v" ];
-  #     options = { silent = true; };
-  #   }
-  #   {
-  #     key    = "<Left>";
-  #     action = "<Nop>";
-  #     mode   = [ "n" "i" "v" ];
-  #     options = { silent = true; };
-  #   }
-  #   {
-  #     key    = "<Right>";
-  #     action = "<Nop>";
-  #     mode   = [ "n" "i" "v" ];
-  #     options = { silent = true; };
-  #   }
-  # ];
   };
 }
diff --git a/home/home.nix b/home/home.nix
index f606bd5..121b61c 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -9,7 +9,7 @@
     ./wayland/noctalia.nix
     # Editors
     ./editors/nixvim.nix
-    ./editors/helix.nix
+    # ./editors/helix.nix
     # Programs
     ./terminal/foot.nix
     ./terminal/fish.nix
@@ -29,8 +29,8 @@
   home.stateVersion = "25.05";
 
   home.packages = with pkgs; [
+    bottles
     ncdu
-    halloy
     equibop
     inputs.prismlauncher.packages.${pkgs.stdenv.hostPlatform.system}.prismlauncher
     inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww
diff --git a/home/programs/nixcord.nix b/home/programs/nixcord.nix
index ddd648a..d7978af 100644
--- a/home/programs/nixcord.nix
+++ b/home/programs/nixcord.nix
@@ -1,8 +1,9 @@
-{ inputs, ... }:
+{ inputs, pkgs, ... }:
 {
   imports = [ inputs.nixcord.homeModules.nixcord ];
   programs.nixcord = {
     enable = true;
+    package = pkgs.discord-krisp;
     discord = {
       enable = true;
       vencord.enable = false;
@@ -50,7 +51,7 @@
         customTimestamps.enable = true;
         disableCallIdle.enable = true;
         disableDeepLinks.enable = true;
-        dontFilterMe.enable = true;
+        # dontFilterMe.enable = true;
         dontRoundMyTimestamps.enable = true;
         equicordHelper = {
           enable = true;
diff --git a/home/terminal/fish.nix b/home/terminal/fish.nix
index f1ad64d..ec75de8 100644
--- a/home/terminal/fish.nix
+++ b/home/terminal/fish.nix
@@ -22,8 +22,6 @@
       ff = "fastfetch";
       cat = "bat";
       ls = "eza";
-      find = "fd";
-      grep = "rg";
     };
 
     plugins = [
diff --git a/home/wayland/niri/binds.nix b/home/wayland/niri/binds.nix
index aea36e7..53d2d4e 100644
--- a/home/wayland/niri/binds.nix
+++ b/home/wayland/niri/binds.nix
@@ -42,17 +42,17 @@
     # Screenshot (selection -> copy + save)
     "Mod+S".action = spawn "sh" "-c"
     ''
-      filename="/media/ss/$(date +%Y-%m-%d_%H-%M-%S).png"
+      filename="/media/pics/ss/$(date +%Y-%m-%d_%H-%M-%S).png"
       grim -g "$(slurp)" - | tee "$filename" | wl-copy
     '';
 
     # Screenshot (selection -> save -> edit with satty -> copy edited)
     "Mod+Shift+S".action = spawn "sh" "-c"
     ''
-      filename="/media/ss/$(date +%Y-%m-%d_%H-%M-%S).png"
+      filename="/media/pics/ss/$(date +%Y-%m-%d_%H-%M-%S).png"
       grim -g "$(slurp)" "$filename"
 
-      edited="/media/ss/$(date +%Y-%m-%d_%H-%M-%S)-edited.png"
+      edited="/media/pics/ss/$(date +%Y-%m-%d_%H-%M-%S)-edited.png"
       satty --filename "$filename" --output-filename "$edited"
     '';
 
diff --git a/home/xdg.nix b/home/xdg.nix
index a587d04..07b78f1 100644
--- a/home/xdg.nix
+++ b/home/xdg.nix
@@ -18,9 +18,8 @@
       XDG_PROJECTS_DIR = "$HOME/proj";
       XDG_GAMES_DIR = "$HOME/games";
       XDG_MEDIA_DIR = "/media";
-      XDG_SS_DIR = "/media/ss";
-      XDG_CLIPS_DIR = "/media/clips";
-      XDG_ISO_DIR = "/media/iso";
+      XDG_SS_DIR = "/media/pics/ss";
+      XDG_CLIPS_DIR = "/media/vids/clips";
       XDG_ARCHIVE_DIR = "/media/archive";
     };
   };
@@ -28,9 +27,8 @@
       XDG_PROJECTS_DIR = "$HOME/proj";
       XDG_GAMES_DIR = "$HOME/games";
       XDG_MEDIA_DIR = "/media";
-      XDG_SS_DIR = "/media/ss";
-      XDG_CLIPS_DIR = "/media/clips";
-      XDG_ISO_DIR = "/media/iso";
+      XDG_SS_DIR = "/media/pics/ss";
+      XDG_CLIPS_DIR = "/media/vids/clips";
       XDG_ARCHIVE_DIR = "/media/archive";
       };
 }