diff options
| m--------- | config/nvim | 0 | ||||
| -rwxr-xr-x | config/qutebrowser/userscripts/dl_music | 2 | ||||
| -rwxr-xr-x | config/xorg/init.sh | 2 | ||||
| -rw-r--r-- | config/zsh/zshrc | 6 | ||||
| -rw-r--r-- | configuration.nix | 8 | ||||
| -rw-r--r-- | hardware/thinkpad-e14/default.nix | 7 | ||||
| -rw-r--r-- | home.nix | 3 | ||||
| -rw-r--r-- | modules/torrent.nix | 2 | ||||
| -rw-r--r-- | packages.nix | 9 | ||||
| -rw-r--r-- | packages/sensible-apps/install.sh | 4 |
10 files changed, 24 insertions, 19 deletions
diff --git a/config/nvim b/config/nvim -Subproject 01ae9b6e7d4d639f61dba51f5dc30ad934f8103 +Subproject 4b76b122b800d027bf63e6a67664e27de057612 diff --git a/config/qutebrowser/userscripts/dl_music b/config/qutebrowser/userscripts/dl_music index 39e6ac0..31694f1 100755 --- a/config/qutebrowser/userscripts/dl_music +++ b/config/qutebrowser/userscripts/dl_music @@ -4,7 +4,7 @@ cd ~/Downloads/music/untagged; ~/scripts/notify.sh "Downloading audio in the background..."; -youtube-dl \ +yt-dlp \ --add-metadata \ --ignore-errors \ --output '%(title)s.%(ext)s' \ diff --git a/config/xorg/init.sh b/config/xorg/init.sh index 854712b..d3a2473 100755 --- a/config/xorg/init.sh +++ b/config/xorg/init.sh @@ -21,3 +21,5 @@ xset r rate 350 30; amixer set Capture nocap; amixer set Master off; +dbus-update-activation-environment --systemd DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY || true; + diff --git a/config/zsh/zshrc b/config/zsh/zshrc index cc97978..6522186 100644 --- a/config/zsh/zshrc +++ b/config/zsh/zshrc @@ -17,9 +17,6 @@ setopt share_history # share command history data export ZSH_CUSTOM_CONF_FILES="$HOME/.config/zsh"; -# FZF integration -source <(fzf --zsh); - for f in $ZSH_CUSTOM_CONF_FILES/*.zsh; do source $f; done; source $ZSH_CUSTOM_CONF_FILES/aliases.zsh; @@ -28,6 +25,9 @@ if [[ "$DIRENV_DISABLE_HOOK" != "1" ]]; then eval "$(direnv hook zsh)" fi; +# FZF integration +source <(fzf --zsh); + # Plugins # source ~/.config/zshplugins/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh; diff --git a/configuration.nix b/configuration.nix index 792179a..af97a11 100644 --- a/configuration.nix +++ b/configuration.nix @@ -46,7 +46,7 @@ in services.blueman.enable = false; # Enable sound. - sound.enable = false; + # sound.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true; @@ -79,6 +79,7 @@ in services.atd.enable = true; + # programs.darling.enable = true; # macos emu virtualisation = { docker = { enable = true; @@ -111,7 +112,6 @@ in common.default = "*"; }; }; - programs.darling.enable = true; # macos emu # programs.tmux = { # enable = true; @@ -147,9 +147,11 @@ in }; fonts.packages = with pkgs; [ # jetbrains-mono - (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) + (nerdfonts.override { fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ]; }) cozette noto-fonts-emoji + inter + roboto ]; services.logind = { diff --git a/hardware/thinkpad-e14/default.nix b/hardware/thinkpad-e14/default.nix index 65de753..4390a60 100644 --- a/hardware/thinkpad-e14/default.nix +++ b/hardware/thinkpad-e14/default.nix @@ -82,10 +82,11 @@ nixpkgs.config.packageOverrides = pkgs: { vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; }; - hardware.opengl = { + hardware.graphics = { enable = true; - driSupport = true; - driSupport32Bit = true; + # enable32Bit = true; + # driSupport = true; + # driSupport32Bit = true; extraPackages = with pkgs; [ intel-media-driver # intel-vaapi-driver @@ -98,7 +98,8 @@ in maxCacheTtl = 864000; defaultCacheTtl = 864000; enableSshSupport = false; - pinentryFlavor = "qt"; + pinentryPackage = pkgs.pinentry-qt; + # pinentryFlavor = "qt"; # pinentryFlavor = null; # extraConfig = '' # pinentry-program ${localPkgs.anypinentry}/bin/anypinentry diff --git a/modules/torrent.nix b/modules/torrent.nix index 9266f44..9e74aca 100644 --- a/modules/torrent.nix +++ b/modules/torrent.nix @@ -2,7 +2,7 @@ let downloadsDir = "/home/imsohexy/Downloads/dl"; incompleteDownloadsDir = "/home/imsohexy/Downloads/dl/incomplete"; - watchTorrentFilesOn = "/home/an/Downloads/qute"; + watchTorrentFilesOn = "/home/imsohexy/Downloads/qute"; in { services.transmission = { diff --git a/packages.nix b/packages.nix index 40f0326..4faf47c 100644 --- a/packages.nix +++ b/packages.nix @@ -34,6 +34,7 @@ let gcc gnumake nodejs_20 + bun # bspwm # sxhkd @@ -72,7 +73,7 @@ let # Media spotify sxiv - youtube-dl + yt-dlp imagemagick ffmpeg-full feh @@ -183,11 +184,9 @@ in hardware.steam-hardware.enable = true; programs.gamemode.enable = true; - programs.darling.enable = true; - programs.alvr = { - enable = true; - openFirewall = true; + enable = false; + openFirewall = false; }; # Security wrappers diff --git a/packages/sensible-apps/install.sh b/packages/sensible-apps/install.sh index ab66e01..3ff9225 100644 --- a/packages/sensible-apps/install.sh +++ b/packages/sensible-apps/install.sh @@ -1,8 +1,8 @@ apps=" sensible-terminal exec $TERMINAL sensible-editor exec $EDITOR -sensible-browser $BROWSER -sensible-private-browser $PRIVATE_BROWSER +sensible-browser exec $BROWSER +sensible-private-browser exec $PRIVATE_BROWSER "; BIN=$out/bin; |