From a40973e93f497f0f53bf8d54c45d975d271e648c Mon Sep 17 00:00:00 2001 From: Ray Andrew Date: Sun, 27 Oct 2024 00:33:43 -0500 Subject: [PATCH] update --- .gitignore | 1 + src/home/gui/default.nix | 1 + src/home/gui/spotify.nix | 14 ++++++++++++++ src/home/shell/default.nix | 3 +++ src/home/shell/direnv.nix | 19 +++++++++++++++++++ src/home/shell/ripgrep.nix | 18 ++++++++++++++++++ src/home/shell/zoxide.nix | 18 ++++++++++++++++++ src/home/ssh.nix | 6 +++++- src/hosts/pickwick/default.nix | 6 ------ src/nixos/audio.nix | 29 +++++++++++++++++++++++++++++ src/nixos/default.nix | 1 + src/nixos/nix.nix | 2 ++ 12 files changed, 111 insertions(+), 7 deletions(-) create mode 100644 .gitignore create mode 100644 src/home/gui/spotify.nix create mode 100644 src/home/shell/direnv.nix create mode 100644 src/home/shell/ripgrep.nix create mode 100644 src/home/shell/zoxide.nix create mode 100644 src/nixos/audio.nix diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1377554 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.swp diff --git a/src/home/gui/default.nix b/src/home/gui/default.nix index 3933212..cf99da0 100644 --- a/src/home/gui/default.nix +++ b/src/home/gui/default.nix @@ -8,6 +8,7 @@ ./gnome.nix ./slack.nix ./skype.nix + ./spotify.nix ./vscode.nix ./xdg-portal.nix ./zathura.nix diff --git a/src/home/gui/spotify.nix b/src/home/gui/spotify.nix new file mode 100644 index 0000000..0cbb6ac --- /dev/null +++ b/src/home/gui/spotify.nix @@ -0,0 +1,14 @@ +{ pkgs, config, ... }: + +{ + home.packages = with pkgs; [ + spotify + ]; + + custom.persist = { + home.directories = [ + ".config/spotify" + ]; + }; +} + diff --git a/src/home/shell/default.nix b/src/home/shell/default.nix index cc90a79..62ca16e 100644 --- a/src/home/shell/default.nix +++ b/src/home/shell/default.nix @@ -3,6 +3,9 @@ { imports = [ ./bash.nix + ./direnv.nix + ./ripgrep.nix ./shell.nix + ./zoxide.nix ]; } diff --git a/src/home/shell/direnv.nix b/src/home/shell/direnv.nix new file mode 100644 index 0000000..bf39716 --- /dev/null +++ b/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" ]; + }; + }; +} diff --git a/src/home/shell/ripgrep.nix b/src/home/shell/ripgrep.nix new file mode 100644 index 0000000..5b3eb71 --- /dev/null +++ b/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 + ''; +} diff --git a/src/home/shell/zoxide.nix b/src/home/shell/zoxide.nix new file mode 100644 index 0000000..d2fc086 --- /dev/null +++ b/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" ]; + }; + }; +} diff --git a/src/home/ssh.nix b/src/home/ssh.nix index b86a2e0..6fd9122 100644 --- a/src/home/ssh.nix +++ b/src/home/ssh.nix @@ -2,9 +2,13 @@ { programs.ssh = { - enable = true; + enable = false; }; + home.packages = with pkgs; [ + openssh + ]; + custom.persist = { home.directories = [ ".ssh" diff --git a/src/hosts/pickwick/default.nix b/src/hosts/pickwick/default.nix index 12ae2ff..7541ba0 100644 --- a/src/hosts/pickwick/default.nix +++ b/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 = {}; diff --git a/src/nixos/audio.nix b/src/nixos/audio.nix new file mode 100644 index 0000000..1de36da --- /dev/null +++ b/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 ]; +} diff --git a/src/nixos/default.nix b/src/nixos/default.nix index 684a89e..5900ebc 100644 --- a/src/nixos/default.nix +++ b/src/nixos/default.nix @@ -7,6 +7,7 @@ { imports = [ + ./audio.nix ./1password.nix ./impermanence.nix ./keyd.nix diff --git a/src/nixos/nix.nix b/src/nixos/nix.nix index f9b3472..81c97a6 100644 --- a/src/nixos/nix.nix +++ b/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") {