update

.gitignore

@@ -0,0 +1 @@
+*.swp

src/home/gui/default.nix

@@ -8,6 +8,7 @@
     ./gnome.nix
     ./slack.nix
     ./skype.nix
+    ./spotify.nix
     ./vscode.nix
     ./xdg-portal.nix
     ./zathura.nix

src/home/gui/spotify.nix

@@ -0,0 +1,14 @@
+{ pkgs, config, ... }:
+
+{
+  home.packages = with pkgs; [
+    spotify
+  ];
+  
+  custom.persist = {
+    home.directories = [
+      ".config/spotify"
+    ];
+  };
+}
+

src/home/shell/default.nix

@@ -3,6 +3,9 @@
 {
   imports = [
     ./bash.nix
+    ./direnv.nix
+    ./ripgrep.nix
     ./shell.nix
+    ./zoxide.nix
   ];
 }

src/home/shell/direnv.nix

@@ -0,0 +1,19 @@
+_: {
+  programs.direnv = {
+    enable = true;
+    silent = true;
+    nix-direnv.enable = true;
+  };
+
+  custom.shell.packages = {
+    rmdevenv = ''rm .direnv .devenv'';
+    rmdirenv = ''rm .direnv .devenv'';
+  };
+
+  custom.persist = {
+    home = {
+      directories = [ ".local/share/direnv" ];
+      cache.directories = [ ".cache/pip" ];
+    };
+  };
+}

src/home/shell/ripgrep.nix

@@ -0,0 +1,18 @@
+{ config, ... }:
+{
+  programs.ripgrep = {
+    enable = true;
+    arguments = [
+      "--ignore-file=${config.xdg.configHome}/ripgrep/.ignore"
+    ];
+  };
+
+  xdg.configFile."ripgrep/.ignore".text = ''
+    # global ignore file for ripgrep
+    .envrc
+    .ignore
+    *.lock
+    generated.nix
+    generated.json
+  '';
+}

src/home/shell/zoxide.nix

@@ -0,0 +1,18 @@
+_: {
+  home.shellAliases = {
+    z = "zoxide query -i";
+  };
+
+  programs.zoxide = {
+    enable = true;
+    enableBashIntegration = true;
+    enableFishIntegration = true;
+    options = [ "--cmd cd" ];
+  };
+
+  custom.persist = {
+    home = {
+      cache.directories = [ ".local/share/zoxide" ];
+    };
+  };
+}

src/home/ssh.nix

@@ -2,9 +2,13 @@
 
 { 
   programs.ssh = {
-    enable = true;
+    enable = false;
   };
 
+  home.packages = with pkgs; [
+    openssh
+  ];
+
   custom.persist = {
     home.directories = [ 
       ".ssh"

src/hosts/pickwick/default.nix

@@ -24,12 +24,6 @@
   services.fwupd.enable = true;
   hardware.framework.amd-7040.preventWakeOnAC = true;
 
-  services.pipewire = {
-    enable = true;
-    pulse.enable = true;
-    jack.enable = true;
-  };
-
   services.libinput.enable = true;
 
   users.groups.keyd = {};

src/nixos/audio.nix

@@ -0,0 +1,29 @@
+{ pkgs, ... }:
+{
+  # setup pipewire for audio
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
+
+    # disable camera to save battery
+    # https://reddit.com/r/linux/comments/1em8biv/psa_pipewire_has_been_halving_your_battery_life/
+    wireplumber = {
+      enable = true;
+      extraConfig = {
+        "10-disable-camera" = {
+          "wireplumber.profiles" = {
+            main."monitor.libcamera" = "disabled";
+          };
+        };
+      };
+    };
+  };
+
+  hardware.pulseaudio.enable = false;
+
+  environment.systemPackages = with pkgs; [ pwvucontrol ];
+}

src/nixos/default.nix

@@ -7,6 +7,7 @@
 
 {
   imports = [
+    ./audio.nix
     ./1password.nix
     ./impermanence.nix
     ./keyd.nix

src/nixos/nix.nix

@@ -103,6 +103,7 @@ in
           "https://hyprland.cachix.org"
           "https://nix-community.cachix.org"
           "https://ghostty.cachix.org"
+          "https://rayandrew.cachix.org"
         ];
         # allow building and pushing of laptop config from desktop
         trusted-users = [ user ];
@@ -110,6 +111,7 @@ in
           "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
           "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
           "ghostty.cachix.org-1:QB389yTa6gTyneehvqG58y0WnHjQOqgnA+wBnpWWxns="
+          "rayandrew.cachix.org-1:kJnvdWgUyErPGaQWgh/yyu91szgRYD+V/WQ4Dbc4n9M="
         ];
       };
       # // lib.optionalAttrs (config.nix.package.pname == "lix") {