update

flake.lock

@@ -8,15 +8,16 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1728326430,
+        "lastModified": 1731591309,
-        "narHash": "sha256-tV1ABHuA1HItMdCTuNdA8fMB+qw7LpjvI945VwMSABI=",
+        "narHash": "sha256-2qL6CAoQjCJLsxpy0Ac/9pLFoItf3L9KMCSLpoJ6jSw=",
         "owner": "Aylur",
         "repo": "ags",
-        "rev": "60180a184cfb32b61a1d871c058b31a3b9b0743d",
+        "rev": "67b0e31ded361934d78bddcfc01f8c3fcf781aad",
         "type": "github"
       },
       "original": {
         "owner": "Aylur",
+        "ref": "v1",
         "repo": "ags",
         "type": "github"
       }
@@ -96,11 +97,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1731384210,
+        "lastModified": 1731729795,
-        "narHash": "sha256-tx0rDWEeNIJ+UIAb+4glyknpJai7HU54f8ucUr0GD9E=",
+        "narHash": "sha256-trv2jL/Xo/vddO0C6FvBdxMKEq+jn0Vw/0kIhPe9FHc=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "33cbf67f367cf0a1f5c5ecab5877e32cb5796681",
+        "rev": "c1ca3a49435407dddef89c07961c5ce40f66ff99",
         "type": "gitlab"
       },
       "original": {
@@ -202,11 +203,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731235328,
+        "lastModified": 1731604581,
-        "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
+        "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "60bb110917844d354f3c18e05450606a435d2d10",
+        "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
         "type": "github"
       },
       "original": {
@@ -311,11 +312,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731139594,
+        "lastModified": 1731319897,
-        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
+        "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
+        "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
         "type": "github"
       },
       "original": {
@@ -463,11 +464,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1731364708,
+        "lastModified": 1731748189,
-        "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=",
+        "narHash": "sha256-Zd/Uukvpcu26M6YGhpbsgqm6LUSLz+Q8mDZ5LOEGdiE=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "4c91d52db103e757fc25b58998b0576ae702d659",
+        "rev": "d2bd7f433b28db6bc7ae03d5eca43564da0af054",
         "type": "github"
       },
       "original": {
@@ -484,11 +485,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1731364708,
+        "lastModified": 1731748189,
-        "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=",
+        "narHash": "sha256-Zd/Uukvpcu26M6YGhpbsgqm6LUSLz+Q8mDZ5LOEGdiE=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "4c91d52db103e757fc25b58998b0576ae702d659",
+        "rev": "d2bd7f433b28db6bc7ae03d5eca43564da0af054",
         "type": "github"
       },
       "original": {
@@ -516,11 +517,11 @@
         "tinted-tmux": "tinted-tmux"
       },
       "locked": {
-        "lastModified": 1731090365,
+        "lastModified": 1731657386,
-        "narHash": "sha256-ti3gXhgVpIUL/7w6zDJuH+hOnyTZqxrIX/yYqALmiEI=",
+        "narHash": "sha256-Mm/JL8tFUS1SOmmZDPcswExUxzw0VpHcEyZI1h58CGA=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "6863412636c8f2cb3b7360f747fbd020fbfddf68",
+        "rev": "5ab1207b2fdeb5a022f2dd7cccf6be760f1b150f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -72,7 +72,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     ags = {
-      url = "github:Aylur/ags";
+      url = "github:Aylur/ags/v1";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     sops-nix = {

hosts/laptop/default.nix

@@ -4,7 +4,6 @@
   led.enable = true;
   gnome.enable = true;
   home-manager.users.${username} = {
-    code.enable = true;
     hypridle.enable = true;
   };
 

hosts/server/default.nix

@@ -10,10 +10,10 @@
     ../../modules/system
     ../../modules/secrets
     ../../modules/services
-    ../../modules/services/invidious
+    ../../modules/services/nginx
     ../../modules/services/forgejo
     ../../modules/services/syncthing
     ../../modules/services/immich
-    ../../modules/services/nginx
+    ../../modules/services/invidious
   ];
 }

modules/programs/git/default.nix

@@ -1,11 +1,12 @@
 {
   mail,
   username,
+  domain,
   ...
 }: {
   programs.git = {
     enable = true;
-    userEmail = "${mail.a}";
+    userEmail = "${mail.b}@${domain}";
     userName = "${username}";
     extraConfig = {
       init.defaultBranch = "main";

modules/programs/home.nix

@@ -12,6 +12,7 @@
     ./zoxide
     ./fastfetch
     ./btop
+    ./xdg
     ./misc
   ];
 }

modules/services/invidious/default.nix

@@ -1,8 +1,4 @@
-{
+{domain, ...}: {
-  domain,
-  mail,
-  ...
-}: {
   services.invidious = {
     enable = true;
     settings = {
@@ -14,6 +10,4 @@
   };
   services.invidious.domain = "yt.${domain}";
   services.invidious.nginx.enable = true;
-  security.acme.defaults.email = "${mail}";
-  security.acme.acceptTerms = true;
 }

modules/services/nginx/default.nix

@@ -1,9 +1,13 @@
-{domain, ...}: {
+{
+  domain,
+  mail,
+  ...
+}: {
   services.nginx = {
     virtualHosts."xn--xck.xyz" = {
       forceSSL = true;
       enableACME = true;
-      root = "/var/www/${domain}";
+      root = "/var/www/www.${domain}";
     };
     virtualHosts."${domain}" = {
       forceSSL = true;
@@ -13,7 +17,12 @@
     virtualHosts."www.${domain}" = {
       forceSSL = true;
       enableACME = true;
-      root = "/var/www/${domain}";
+      root = "/var/www/www.${domain}";
+    };
+    virtualHosts."wallpapers.${domain}" = {
+      forceSSL = true;
+      enableACME = true;
+      root = "/var/www/wallpapers.${domain}";
     };
     virtualHosts."4get.${domain}" = {
       forceSSL = true;
@@ -30,10 +39,12 @@
       enableACME = true;
       locations."/".proxyPass = "http://localhost:5000";
     };
-    virtualHosts."wallpapers.${domain}" = {
+    # virtualHosts."yt.${domain}" = {
-      forceSSL = true;
+    # forceSSL = true;
-      enableACME = true;
+    # enableACME = true;
-      root = "/var/www/wallpapers.${domain}";
+    # locations."/".proxyPass = "http://localhost:3000";
-    };
+    # };
   };
+  security.acme.defaults.email = "${mail}";
+  security.acme.acceptTerms = true;
 }

modules/wm/home/code/default.nix

@@ -1,20 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
-  options = {
-    code.enable = lib.mkEnableOption "";
-  };
-  config = lib.mkIf config.code.enable {
-    programs.vscode = {
-      enable = true;
-      package = pkgs.vscodium;
-      extensions = with pkgs.vscode-extensions; [
-        ms-dotnettools.csharp
-        jdinhlife.gruvbox
-      ];
-    };
-  };
-}

modules/wm/home/default.nix

@@ -7,7 +7,6 @@
     ./firefox
     ./clip
     ./rofi
-    ./code
     ./hypridle
     ./dunst
     ./misc

modules/wm/hyprland/default.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   username,
   nixpath,
   ...
@@ -26,7 +25,7 @@
           force_zero_scaling = true;
         };
         monitor = [
-          "DP-3,2560x1440@165.00Hz,auto,1,bitdepth,10"
+          "DP-1,2560x1440@165.00Hz,auto,1,bitdepth,10"
           "eDP-1,prefrered,auto,1"
           "HDMI-A-1,prefrered,auto,1,mirror,eDP-1"
         ];
@@ -87,7 +86,6 @@
           "$mod, Z, exec, sh $sciPath/screen.sh"
           "$mod, V, exec, cliphist list | rofi show -dmenu | cliphist decode | wl-copy"
           "$mod, O, exec, sh $sciPath/mpv.sh"
-          "$mod+Shift, TAB,hyprexpo:expo, toggleoverview"
           "$mod, B, exec, rofimoji"
           "$mod, F, exec, foot -e hx"
           # controls
@@ -160,9 +158,6 @@
           ", XF86AudioMicMute, exec, sh $sciPath/volume.sh -t"
         ];
       };
-      plugins = with pkgs.hyprlandPlugins; [
-        hyprexpo
-      ];
     };
   };
 }