refactor(aichat): disable mayichat and rename config to aichat

refactor(hyprland): separate hyprpaper config into its own module

feat(services): add hyprpaper service with updated wallpaper settings

home/programs/aichat.nix

@@ -8,7 +8,9 @@
   imports = [
     ../../modules/aichat.nix
   ];
-  programs.mayichat = {
+
+  disabledModules = ["programs/aichat.nix"];
+  programs.aichat = {
     enable = true;
     enableFishIntegration = true;
     enableNushellIntegration = false;

home/services/default.nix

@@ -3,13 +3,14 @@
     ./swaync.nix
     ./swayosd.nix
     ./kdeconnect.nix
-    ./hyprland.nix
     ./gtk.nix
     ./anyrun.nix
     ./ironbar
     ./gui.nix
     ./eww.nix
-    ./hyprmon.nix
     ./xdg.nix
+    ./hyprmon.nix
+    ./hyprland.nix
+    ./hyprpaper.nix
   ];
 }

home/services/hyprland.nix

@@ -1,15 +1,10 @@
 {
   pkgs,
   device,
-  lib,
   ...
 }:
 # lib.optionalAttrs device.isNix
 {
-  imports = [
-    ../../modules/hyprpaper.nix
-  ];
-
   # services.hyprpolkitagent.enable = true;
   services.hypridle = {
     enable = device.is "ryu";
@@ -29,20 +24,6 @@
   services.hyprsunset = {
     enable = device.is "ryu";
   };
-  programs.hyprpaper = let
-    wallpapers = import ../../utils/wallhaven.nix {inherit pkgs;};
-  in {
-    enable = device.is "ryu";
-    # enable = true;
-    systemd.enable = true;
-    systemd.target = "hyprland-session.target";
-    settings.preload = wallpapers.all;
-    settings.wallpapers = {
-      "${device.monitors.primary}" = wallpapers.moon;
-      "${device.monitors.secondary}" = wallpapers.frieren_3;
-      "${device.monitors.tertiary}" = wallpapers.shapes;
-    };
-  };
   programs.hyprlock = {
     enable = device.is "ryu";
   };
@@ -206,7 +187,9 @@
         "$mainModShift, Q, killactive,"
         "$mainModShift, s, exec, ${pkgs.hyprshot}/bin/hyprshot -m region"
         # "$mainMod, M, exit,"
-        "$mainMod, t, togglefloating,"
+        "$mainModShift, f, togglefloating,"
+        "$mainModShift, f, pin"
+        "$mainModShift, f, alterzorder, top"
         "$mainMod, f, fullscreen,"
         "$mainMod, g, fullscreenstate,0,2"
         "$mainMod, d, exec, ${pkgs.anyrun}/bin/anyrun"

home/services/hyprpaper.nix

@@ -0,0 +1,30 @@
+{
+  pkgs,
+  device,
+  config,
+  ...
+}: {
+  imports = [
+    ../../modules/hyprpaper.nix
+  ];
+  programs.hyprpaper = let
+    wallpapers = import ../../utils/wallhaven.nix {inherit pkgs;};
+    nextcloudWallpapers = name: config.home.homeDirectory + "/Nextcloud/Wallpapers/" + name;
+    silksongFleas = nextcloudWallpapers "silksong-fleas.jpg";
+  in {
+    enable = device.is "ryu";
+    # enable = true;
+    systemd.enable = true;
+    systemd.target = "hyprland-session.target";
+    settings.preload =
+      wallpapers.all
+      ++ [
+        silksongFleas
+      ];
+    settings.wallpapers = {
+      "${device.monitors.primary}" = silksongFleas;
+      "${device.monitors.secondary}" = wallpapers.frieren_3;
+      "${device.monitors.tertiary}" = wallpapers.hornet;
+    };
+  };
+}

modules/aichat.nix

@@ -5,7 +5,7 @@
   ...
 }:
 with lib; let
-  cfg = config.programs.mayichat;
+  cfg = config.programs.aichat;
   yamlFormat = pkgs.formats.yaml {};
   fishIntegration = ''
     function _aichat_fish
@@ -64,7 +64,7 @@ with lib; let
   '';
 in {
   options = {
-    programs.mayichat = {
+    programs.aichat = {
       enable = mkEnableOption "aichat";
       package = mkPackageOption pkgs "aichat" {};
 

neovim/default.nix

@@ -224,11 +224,11 @@ in {
     };
 
     neotest = {
-      enable = false;
+      enable = true;
       settings = {
-        # adapters = [
-        #   ''require('rustaceanvim.neotest')''
-        # ];
+        adapters = [
+          ''require('rustaceanvim.neotest')''
+        ];
       };
     };
     neorg = {
@@ -393,7 +393,7 @@ in {
       };
     };
     rustaceanvim = {
-      enable = false;
+      enable = true;
       settings = {
         server = {
           on_attach =
@@ -509,7 +509,7 @@ in {
         # sourcekit.enable = true;
         openscad_lsp.enable = true;
         rust_analyzer = {
-          enable = true;
+          enable = false;
           installCargo = false;
           installRustc = false;
           settings = {

nixos/mirai/services/gitea.nix

@@ -75,22 +75,22 @@
         };
       };
     };
-    gitea-actions-runner = {
-      instances = {
-        mirai = {
-          enable = true;
-          name = "mirai";
-          url = "https://git.darksailor.dev";
-          labels = [
-            "ubuntu-latest:docker://catthehacker/ubuntu:full-latest"
-            "ubuntu-22.04:docker://catthehacker/ubuntu:full-22.04"
-            "ubuntu-20.04:docker://catthehacker/ubuntu:full-20.04"
-            "native:host"
-          ];
-          tokenFile = "${config.sops.templates."GITEA_REGISTRATION_TOKEN.env".path}";
-        };
-      };
-    };
+    # gitea-actions-runner = {
+    #   instances = {
+    #     mirai = {
+    #       enable = true;
+    #       name = "mirai";
+    #       url = "https://git.darksailor.dev";
+    #       labels = [
+    #         "ubuntu-latest:docker://catthehacker/ubuntu:full-latest"
+    #         "ubuntu-22.04:docker://catthehacker/ubuntu:full-22.04"
+    #         "ubuntu-20.04:docker://catthehacker/ubuntu:full-20.04"
+    #         "native:host"
+    #       ];
+    #       tokenFile = "${config.sops.templates."GITEA_REGISTRATION_TOKEN.env".path}";
+    #     };
+    #   };
+    # };
     caddy = {
       virtualHosts."git.darksailor.dev".extraConfig = ''
         reverse_proxy localhost:3000
@@ -148,9 +148,10 @@
   systemd.services.gitea = {
     after = ["sops-install-secrets.service"];
   };
-  systemd.services."gitea-actions-mirai" = {
-    after = ["gitea.service"];
-  };
+
+  # systemd.services."gitea-actions-mirai" = {
+  #   after = ["gitea.service"];
+  # };
 
   # systemd.services.gitea-oauth-setup = let
   #   name = "authelia";

nixos/ryu/apps/default.nix

@@ -4,6 +4,7 @@
   ...
 }: {
   imports = [
-    ./alvr.nix
+    # ./alvr.nix
+    ./easyeffects.nix
   ];
 }

nixos/ryu/apps/easyeffects.nix

@@ -0,0 +1,7 @@
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  environment.systemPackages = with pkgs; [easyeffects];
+}

nixos/ryu/configuration.nix

@@ -9,6 +9,7 @@
     ./services
     ./programs
     ./containers
+    ./apps
   ];
 
   # sops = {

utils/wallhaven.nix

@@ -11,6 +11,10 @@ in rec {
     url = "https://w.wallhaven.cc/full/8o/wallhaven-8ow3q1.jpg";
     sha256 = "1qn2rv4y4550ag3yjrcj70jry6vxakbqskpwanyrghw2lmlhy7rf";
   };
+  hornet = getWall {
+    url = "https://w.wallhaven.cc/full/6l/wallhaven-6ld5pl.jpg";
+    sha256 = "07dsizb6rzzbc97azhrih2ahxkjnv9qfvj0hfkhrc7wkjilhbk89";
+  };
   moon = getWall {
     url = "https://w.wallhaven.cc/full/6o/wallhaven-6o1zp7.png";
     sha256 = "07c1yc3haa25ik3icqm85ppb5x888adxcyh9pmyz79n7ma8z7sil";
@@ -36,6 +40,5 @@ in rec {
     sha256 = "11w5lfqg6ip6zhiwfw63gv08f55kqbfnhmv7iq07mfspny36w840";
   };
 
-  anime = [frieren_3];
-  all = [lights shapes cloud skull moon] ++ anime;
+  all = [lights shapes cloud skull moon hornet frieren_3];
 }