discord experimentatioj

hosts/goopnet-interface/default.nix

@@ -17,16 +17,18 @@
     # debug
     strace ltrace lsof
     # apps
-    firefox qalculate-gtk krita inkscape handbrake
+    firefox qalculate-gtk krita inkscape onlyoffice-bin vlc
     # compatibility
     wineWowPackages.waylandFull winetricks
     # misc
-    bat file which prismlauncher yt-dlp wl-screenrec
+    bat file which yt-dlp wl-screenrec
+    # games
+    prismlauncher
   ] ++ (with pkgs.my; [
     # none yet
   ]) ++ (with pkgs.gnome; [
     # yay gnomeware!!!!!!!!!!!!!! yum
-    nautilus gnome-disk-utility ghex pkgs.gnome-text-editor pkgs.baobab file-roller gnome-system-monitor loupe
+    nautilus gnome-font-viewer gnome-disk-utility ghex pkgs.gnome-text-editor pkgs.baobab file-roller gnome-system-monitor loupe
   ]);
 
   modules = {
@@ -55,6 +57,8 @@
       waybar.enable = true;
       batsignal.enable = true;
       wob.enable = true;
+      gammastep.enable = true;
+      clipse.enable = true;
 
       # display manager
       sddm.enable = true;

modules/desktop/clipse.nix

@@ -0,0 +1,37 @@
+{ lib, config, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.modules.desktop.clipse;
+in {
+  options.modules.desktop.clipse = {
+    enable = mkEnableOption "Enable clipse, a generic clipboard manager";
+    package = mkOption {
+      type = types.package;
+      default = pkgs.clipse;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    # runtime dependencies
+    user.packages = with pkgs; [ wl-clipboard ];
+
+    hm.wayland.windowManager.hyprland.settings = let
+      class = "clipse";
+    in {
+      exec-once = [ "${lib.getExe cfg.package} -listen-shell" ];
+      
+      windowrulev2 = [
+        "float, class:^${class}$"
+        "size 622 652, class:^${class}$"
+        "center, class:^${class}$"
+        "stayfocused, class:^${class}$"
+        "dimaround, class:^${class}$"
+      ];
+
+      bind = [
+        "$mod, V, exec, ${lib.getExe pkgs.wezterm} start --class ${class} -e '${lib.getExe cfg.package}'"
+      ];
+    };
+  };
+}

modules/desktop/gammastep.nix

@@ -0,0 +1,21 @@
+{ lib, config, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.modules.desktop.gammastep;
+in {
+  options.modules.desktop.gammastep = {
+    enable = mkEnableOption "Enable gammastep, a blue-light filter for Wayland desktop environments";
+  };
+
+  config = mkIf cfg.enable {
+    hm.wayland.windowManager.hyprland.settings.exec-once = [ "${pkgs.gammastep}/bin/gammastep-indicator" ];
+    hm.services.gammastep = {
+      enable = true;
+      # portland, oregon
+      latitude = 45.3112;
+      longitude = -122.4055;
+      provider = "manual";
+    };
+  };
+}

modules/desktop/hyprland.nix

@@ -174,7 +174,7 @@ in {
         exec-once = [ 
           "${lib.getExe pkgs.networkmanagerapplet}"                          # network applet
           "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1" # polkit agent
-          "${lib.getExe pkgs.wl-clip-persist} --clipboard primary"           # to fix wl clipboards disappearing
+          "${lib.getExe pkgs.wl-clip-persist} --clipboard regular"           # to fix wl clipboards disappearing
         ];
 
         env = [
@@ -197,35 +197,56 @@ in {
           # common popups
           "float, class:org.gnome.FileRoller"
           "size 1100 650, class:org.gnome.FileRoller"
+          "center, class:org.gnome.FileRoller"
           "float, class:org.gnome.Loupe"
           "size 1100 650, class:org.gnome.Loupe"
+          "center class:org.gnome.Loupe"
           "float, class:com.gabm.satty"
           "size 1100 650, class:com.gabm.satty"
+          "center 1100 650, class:com.gabm.satty"
           "float, initialTitle:^Open Folder$"
           "size 1100 650, initialTitle:^Open Folder$"
+          "center, initialTitle:^Open Folder$"
           "float, initialTitle:^Open File$"
           "size 1100 650, initialTitle:^Open File$"
+          "center, initialTitle:^Open File$"
           "float, initialTitle:^Open Files$"
           "size 1100 650, initialTitle:^Open Files$"
+          "center, initialTitle:^Open Files$"
           "float, initialTitle:^Save As$"
           "size 1100 650, initialTitle:^Save As$"
+          "center, initialTitle:^Save As$"
           "float, initialTitle:^Select a file to open$"
           "size 1100 650, initialTitle:^Select a file to open$"
+          "center, initialTitle:^Select a file to open$"
           "float, initialTitle:^File Upload$"
           "size 1100 650, initialTitle:^File Upload$"
+          "center, initialTitle:^File Upload$"
 
           "float, class:\.exe$"
 
           # fix focus
           "stayfocused, class:^gcr-prompter"
+          "dimaround, class:^gcr-prompter"
           "stayfocused, class:^pinentry-"
+          "dimaround, class:^pinentry-"
           "stayfocused, class:^polkit-"
+          "dimaround, class:^polkit-"
           "stayfocused, class:^rofi-"
 
+          # firefox pip
+          "float, title:^Picture-in-Picture$"
+          "pin, title:^Picture-in-Picture$"
+          "noborder, title:^Picture-in-Picture$"
+          "keepaspectratio, title:^Picture-in-Picture$"
+          # discord pip
+          "pin, initialTitle:^Discord Popout$"
+          "float, initialTitle:^Discord Popout$"
+
           # workspace moving
-          "workspace 1, class:^firefox"
-          "workspace 2, class:code-url-handler"
-          "workspace 4, class:vesktop"
+          "workspace 1 silent, class:^firefox"
+          "workspace 2 silent, class:code-url-handler"
+          "workspace 4 silent, class:vesktop"
         ];
 
         blurls = [
@@ -249,9 +270,9 @@ in {
             popups = true;
           };
 
-          drop_shadow = false;
-          #shadow_range = 4;
-          #shadow_render_power = 3;
+          drop_shadow = true;
+          shadow_range = 4;
+          shadow_render_power = 3;
         };
 
         animations = {

modules/desktop/themes/catppuccin/default.nix

@@ -73,8 +73,8 @@ in {
             col.inactive_border=$surface0
           }
           decoration {
-            col.shadow=$surface0
-            col.shadow_inactive=$surface0
+            col.shadow=$crust
+            col.shadow_inactive=$crust
           }
           misc {
             background_color=$crust
@@ -95,6 +95,10 @@ in {
       };
 
       rofi = ./rofi.rasi;
+
+      wezterm = ''
+        config.color_scheme = 'Catppuccin ${pascalCase variant}'
+      '';
     };
   };
 }

modules/desktop/themes/default.nix

@@ -58,6 +58,8 @@ in {
     };
 
     rofi = mkOpt (nullOr path) null;
+
+    wezterm = mkOpt (nullOr str) null;
   };
 
   config = mkIf (cfg.active != null) {
@@ -78,12 +80,14 @@ in {
       cursorTheme = cfg.cursorTheme;
       iconTheme = cfg.iconTheme;
       theme = cfg.gtkTheme;
+      gtk3.extraConfig.gtk-application-prefer-dark-theme = mkIf cfg.dark "1";
+      gtk4.extraConfig.gtk-application-prefer-dark-theme = mkIf cfg.dark "1";
     };
 
-    hm.qt = {
+    qt = {
       enable = true;
-      platformTheme.name = "gtk";
-      style.name = "gtk2";
+      platformTheme = "gnome";
+      style = "adwaita";
     };
 
     hm.home.pointerCursor = {

modules/security.nix

@@ -59,6 +59,8 @@ in {
 
     # personal computer? no firewall ty :3
     networking.firewall.enable = false;
+
+    # TODO: usbguard
   } // (mkIf cfg.useDoas {
     security.sudo.enable = false;
     security.doas.enable = true;

modules/software/distractions/discord.nix

@@ -5,7 +5,6 @@ let
   cfg = config.modules.software.distractions.discord;
   flags = [
     "--flag-switches-begin"
-    "--flag-switches-end"
     "--disable-gpu-memory-buffer-video-frames"
     "--enable-accelerated-mjpeg-decode"
     "--enable-accelerated-video"
@@ -13,36 +12,38 @@ let
     "--enable-native-gpu-memory-buffers"
     "--enable-zero-copy"
     "--ignore-gpu-blocklist"
-    "--disable-features=UseOzonePlatform"
+    "--enable-features=UseOzonePlatform"
     "--enable-features=VaapiVideoDecoder"
+    "--enable-features=VaapiVideoEncoder"
+    "--enable-features=WebRTCPipeWireCapturer"
+    "--flag-switches-end"
   ];
+  vanillaDiscordPackage = pkgs.discord-canary.override {
+    withOpenASAR = true;
+    withVencord = true;
+  };
+  package = if cfg.armcord then pkgs.armcord else (if cfg.vesktop then pkgs.vesktop else vanillaDiscordPackage);
 in {
   options.modules.software.distractions.discord = {
     enable = mkEnableOption "Enable discord, a social messaging app";
-    vesktop = mkEnableOption "Use vesktop, an alternative discord client.";
+    armcord = mkEnableOption "Use Armcord, an alternative Electron client";
+    vesktop = mkEnableOption "Use Vesktop, an alternative Electron client with vencord preinstalled";
   };
 
-  config = mkIf cfg.enable (mkMerge [
-    (mkIf (!cfg.vesktop) {
-      user.packages = let
-        discord = (pkgs.discord-canary.override {
-          withOpenASAR = true;
-          withVencord = true;
-        }).overrideAttrs (old: {
-          preInstall = ''
-            gappsWrapperArgs=+("--add-flags" "${concatStringsSep " " flags}")
-          '';
-        });
-      in [ discord ];
-    })
-    (mkIf cfg.vesktop {
+  config = mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = !(cfg.armcord && cfg.vesktop);
+        message = "You must either enable Armcord or Vesktop, not both";
+      }
+    ];
+
     user.packages = [
-        (pkgs.vesktop.overrideAttrs (old: {
+      (package.overrideAttrs (old: {
         preInstall = ''
           gappsWrapperArgs+=("--add-flags" "${concatStringsSep " " flags}")
         '';
       }))
     ];
-    })
-  ]);
+  };
 }

modules/software/editors/micro.nix

@@ -12,6 +12,7 @@ in {
     schemeName = "generated";
   in mkIf cfg.enable {
     environment.variables.EDITOR = "micro";
+    environment.variables.MICRO_TRUECOLOR = "1";
 
     hm.programs.micro = {
       enable = true;
@@ -23,7 +24,7 @@ in {
         tabsize = 2;
         tabstospaces = true;
 
-        colorScheme = schemeName;
+        colorscheme = schemeName;
       };
     };
 

modules/software/system/fish.nix

@@ -10,9 +10,17 @@ in {
   };
 
   config = mkIf cfg.enable {
-    user.packages = with pkgs; [ bat fd fzf grc ];
-
-    environment.systemPackages = with pkgs.fishPlugins; [ fzf-fish tide ];
+    # runtime dependencies of plugins
+    user.packages = with pkgs; [ 
+      # fzf-fish
+      bat fd fzf 
+      # grc
+      grc 
+      # tide
+      fishPlugins.tide 
+      # done
+      libnotify
+    ];
 
     users.defaultUserShell = pkgs.fish;
     programs.fish.enable = true;
@@ -20,7 +28,14 @@ in {
       colorScript = nix-colors-lib.shellThemeFromScheme { scheme = config.colorScheme; };
     in {
       enable = true;
-      plugins = [ { name = "grc"; src = pkgs.fishPlugins.grc.src; } ];
+      plugins = with pkgs.fishPlugins; [ 
+        { name = "fzf-fish"; src = fzf-fish.src; } 
+        { name = "grc"; src = grc.src; } 
+        { name = "tide"; src = tide.src; } 
+        { name = "done"; src = done.src; }
+
+        { name = "autopair"; src = autopair.src; }
+      ];
       interactiveShellInit = ''
         sh ${colorScript}
       '';

modules/software/system/wezterm.nix

@@ -24,11 +24,12 @@ in {
         config.font_size = ${toString fonts.monospaceBitmap.size}
         config.freetype_load_flags = 'MONOCHROME'
         config.enable_wayland = false
-        config.color_scheme = 'Catppuccin Mocha'
         config.use_fancy_tab_bar = false
         config.use_resize_increments = true
         config.initial_cols = 120
         config.initial_rows = 40
+        config.window_background_opacity = 0.8
+        ${config.modules.desktop.themes.wezterm or ""}
 
         config.window_frame = {
           font = wezterm.font '${fonts.sansSerif.family}',