Merge pull request 'nvidia-wayland' (#1) from nvidia-wayland into master

Reviewed-on: https://git.sortug.com/polwex/nixconf/pulls/1

1 files changed, 56 insertions, 33 deletions

diff --git a/hosts/local/i3.nix b/hosts/local/i3.nix
index 50b9afa..ba84982 100644
--- a/hosts/local/i3.nix
+++ b/hosts/local/i3.nix
@@ -12,11 +12,13 @@
       extraPackages = with pkgs; [
         dmenu
         i3status
+        i3status-rust
         i3lock
         i3blocks
       ];
     };
   };
+  # TODO check autotiling
   services.displayManager.defaultSession = "none+i3";
 
   environment.sessionVariables = {
@@ -27,9 +29,15 @@
   # gnome stuff
   services.gvfs.enable = true;
   programs.dconf.enable = true;
+  # screen tearing
+  services.picom = {
+    enable = true;
+    vSync = true;
+  };
   environment.systemPackages = with pkgs; [
+    #notifications
+    dunst
     # gnome stuff
-    gnome.adwaita-icon-theme
     nautilus
     polybar
     rofi
@@ -40,18 +48,28 @@
     # screenshots
     flameshot
     shutter
+    xclip
     maim
 
     kitty
     alacritty
+    ghostty
     signal-desktop
     tdesktop
     brave
     gimp
     vlc
+    #
+    mpv
+    celluloid
+    ffmpeg-full
+    nv-codec-headers
+    #
+    smplayer
     thunderbird
     kmail
     firefox
+    vivaldi
     chromium
     pavucontrol
     # icons
@@ -91,36 +109,37 @@
       defaultFonts.sansSerif = ["DejaVu Sans"];
       defaultFonts.serif = ["DejaVu Serif" "Source Han Serif SC"];
     };
-    packages = with pkgs; [
-      fira-code
-      fira
-      cooper-hewitt
-      ibm-plex
-      jetbrains-mono
-      iosevka
-      spleen
-      fira-code-symbols
-      powerline-fonts
-      nerdfonts
-      arphic-ukai
-      arphic-uming
-      dejavu_fonts
-      font-awesome
-      inconsolata # monospaced
-      noto-fonts
-      noto-fonts-cjk-sans
-      noto-fonts-emoji
-      noto-fonts-extra
-      powerline-fonts
-      source-han-sans-japanese
-      source-han-sans-korean
-      source-han-sans-simplified-chinese
-      source-han-sans-traditional-chinese
-      source-sans-pro
-      ubuntu_font_family
-      wqy_microhei
-      wqy_zenhei
-    ];
+    packages = with pkgs;
+      [
+        fira-code
+        fira
+        cooper-hewitt
+        ibm-plex
+        jetbrains-mono
+        iosevka
+        spleen
+        fira-code-symbols
+        powerline-fonts
+        arphic-ukai
+        arphic-uming
+        dejavu_fonts
+        font-awesome
+        inconsolata # monospaced
+        noto-fonts
+        noto-fonts-cjk-sans
+        noto-fonts-emoji
+        noto-fonts-extra
+        powerline-fonts
+        source-han-sans-japanese
+        source-han-sans-korean
+        source-han-sans-simplified-chinese
+        source-han-sans-traditional-chinese
+        source-sans-pro
+        ubuntu_font_family
+        wqy_microhei
+        wqy_zenhei
+      ]
+      ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
   };
 
   # screen capture
@@ -133,7 +152,7 @@
   ## Remove sound.enable or set it to false if you had it set previously, as sound.enable is only meant for ALSA-based configurations
 
   # rtkit is optional but recommended
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
@@ -148,5 +167,9 @@
   # pipewire requires these off
   # sound.enable = true;
   # hardware.pulseaudio.enable = true;
-  # hardware.bluetooth.enable = true;
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = true;
+  };
+  services.blueman.enable = true;
 }