x1carbon config

flake.lock

@@ -25,11 +25,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772218752,
+        "lastModified": 1776454077,
-        "narHash": "sha256-G8nArvOTZXU8DRvrzAdz3Elcj6kA/vMtvY9mrGLATtA=",
+        "narHash": "sha256-7zSUFWsU0+jlD7WB3YAxQ84Z/iJurA5hKPm8EfEyGJk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f3a30376bb9eb2f6f61816be7d6ed954b6d2a3b9",
+        "rev": "565e5349208fe7d0831ef959103c9bafbeac0681",
         "type": "github"
       },
       "original": {
@@ -45,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771734689,
+        "lastModified": 1775970782,
-        "narHash": "sha256-/phvMgr1yutyAMjKnZlxkVplzxHiz60i4rc+gKzpwhg=",
+        "narHash": "sha256-7jt9Vpm48Yy5yAWigYpde+HxtYEpEuyzIQJF4VYehhk=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "8f590b832326ab9699444f3a48240595954a4b10",
+        "rev": "bedba5989b04614fc598af9633033b95a937933f",
         "type": "github"
       },
       "original": {
@@ -60,11 +60,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1771969195,
+        "lastModified": 1775490113,
-        "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=",
+        "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e",
+        "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
         "type": "github"
       },
       "original": {
@@ -75,11 +75,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1771848320,
+        "lastModified": 1776169885,
-        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
+        "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
+        "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
         "type": "github"
       },
       "original": {

home-manager/hyprland/default.nix

@@ -31,7 +31,7 @@ let
     exec-once = [
       # "/usr/lib/polkit-kde-authentication-agent-1"
       # "dunst"
-      "swww-daemon"
+      "awww-daemon"
       # "copyq --start-server"
       # "wl-paste --type text --watch cliphist store"
       # "wl-paste --type image --watch cliphist store"
@@ -105,6 +105,7 @@ let
       "SUPER, E, exec, $terminal"
       "SUPER, Q, killactive,"
       "SUPER, L, exec, $lock"
+      "SUPER_SHIFT, L, exec, hyprctl dispatch dpms off"
       "SUPER_SHIFT, M, exec, loginctl terminate-user $USER"
 
       # prsc
@@ -223,7 +224,7 @@ in
   options.hare.hyprland.wallpaperCommand = mkOption {
     type = types.nullOr types.str;
     default = null;
-    description = "Command to set the wallpaper (e.g., \"swww img <path>\"); appended to Hyprland's exec list when provided.";
+    description = "Command to set the wallpaper (e.g., \"awww img <path>\"); appended to Hyprland's exec list when provided.";
   };
 
   config = {
@@ -240,7 +241,7 @@ in
       rosePineHyprcursor
     ]
     ++ (with pkgs; [
-      swww
+      awww
       eww
       hyprshot
     ]);

hosts/arcadia/display.nix

@@ -1,11 +0,0 @@
-{
-  wayland.windowManager.hyprland = {
-    settings = {
-      monitor = [
-        "DP-1, 5120x2880@60, 0x0, 2"
-        "DP-2, 2560x1440@144, 2560x0, 1, transform, 0"
-        "DP-3, 1920x1080@144, -1080x-240, 1, transform, 1"
-      ];
-    };
-  };
-}

hosts/arcadia/hare/home-manager.nix

@@ -8,7 +8,6 @@
   home.stateVersion = "25.05";
   imports = [
     inputs.nix-index-database.homeModules.nix-index
-    ../display.nix
     ../../../home-manager/tofi.nix
     ../../../home-manager/hyprland
     ../../../home-manager/fnott.nix
@@ -22,9 +21,15 @@
     ../../../home-manager/blender.nix
     ../../../home-manager/voicevox.nix
   ];
+
+  wayland.windowManager.hyprland.settings.monitor = [
+        "DP-1, 5120x2880@60, 0x0, 2"
+        "DP-2, 2560x1440@144, 2560x0, 1, transform, 0"
+        "DP-3, 1920x1080@144, -1080x-240, 1, transform, 1"
+  ];
   hare.hyprland = {
     input.sensitivity = -1.0;
-    wallpaperCommand = "swww img /usr/share/wallpaper/arknights-02.jpg";
+    wallpaperCommand = "awww img /usr/share/wallpaper/arknights-02.jpg";
   };
 
   programs.nix-index-database.comma.enable = true;
@@ -33,7 +38,6 @@
     vivaldi
     google-chrome
     discord
-    helvum
     plemoljp
     plemoljp-nf
     prismlauncher
@@ -57,6 +61,7 @@
     bambu-studio
     orca-slicer
     davinci-resolve
+    antigravity
   ];
   services.easyeffects = {
     enable = true;

hosts/x1carbon/hare/home-manager.nix

@@ -18,12 +18,15 @@
   hare.hyprland = {
     style = import ../../../home-manager/hyprland/styles/thin.nix { inherit lib; };
     input.sensitivity = -0.6;
-    wallpaperCommand = "swww img /usr/share/wallpaper/";
+<<<<<<< Updated upstream
+    wallpaperCommand = "awww img /usr/share/wallpaper/";
+=======
+    wallpaperCommand = "swww img /usr/share/wallpaper/001.png";
+>>>>>>> Stashed changes
   };
   home.packages = with pkgs; [
     vivaldi
     discord
-    helvum
     plemoljp
     plemoljp-nf
     prismlauncher

hosts/x1carbon/nixos.nix

@@ -33,7 +33,6 @@ in
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
   programs.nix-ld.enable = true;
-  programs.light.enable = true;
 
   services.openssh.enable = true;
 

programs/desktop/hyprland.nix

@@ -11,7 +11,7 @@
   services.hypridle.enable = true;
 
   environment.systemPackages = with pkgs; [
-    swww
+    awww
     eww
   ];
 }