update

flake.lock

@@ -84,11 +84,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732896163,
-        "narHash": "sha256-eS0vSZT0ZUguR6Jf6CyupvDn4m+r/mgN6Vtg61ECYC0=",
+        "lastModified": 1733788855,
+        "narHash": "sha256-sGn4o9KFoGRSWDQlBKpv8dkNQ2/ODS9APopZD1/FP2Y=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "2c928a199d56191d7a53f29ccafa56238c8ce4e5",
+        "rev": "d59fee8696cd48f69cf79f65992269df9891ba86",
         "type": "github"
       },
       "original": {
@@ -246,11 +246,11 @@
         "zig": "zig"
       },
       "locked": {
-        "lastModified": 1732920523,
-        "narHash": "sha256-/Udch6RRLBSjluDXjQHWpiYFFJR15g+qV263ibVBwoc=",
+        "lastModified": 1733867032,
+        "narHash": "sha256-2ddDF3j8aI70WdWIn+Gsef4XGM2+grIlaEtHlkZmWdY=",
         "ref": "refs/heads/main",
-        "rev": "3c637a2777885dab9f8bb9d2b7c36411d62e1e4c",
-        "revCount": 8136,
+        "rev": "59df17a699f6f13700823124cefaf91fb0c37d4f",
+        "revCount": 8196,
         "type": "git",
         "url": "ssh://git@github.com/ghostty-org/ghostty"
       },
@@ -358,11 +358,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733075221,
-        "narHash": "sha256-1U+OGR6FWNem2Zrv92b1T64s+vw5MAFT3Prh+vWy/1I=",
+        "lastModified": 1733769654,
+        "narHash": "sha256-aVvYDt8eitZVF6fdOrSoIzYRkQ5Gh6kfRvqkiaDRLL0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7f78e2d1c6a9db76444e02a73f0669ebb79f8833",
+        "rev": "e952e94955dcc6fa2120c1430789fc41363f5237",
         "type": "github"
       },
       "original": {
@@ -498,11 +498,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1732837521,
-        "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
+        "lastModified": 1733759999,
+        "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
+        "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
         "type": "github"
       },
       "original": {
@@ -632,11 +632,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1733055058,
-        "narHash": "sha256-ow5onhv9g0zekp3TeCnKD8f1n8G7jbh4wh9XfrohrsE=",
+        "lastModified": 1733790761,
+        "narHash": "sha256-fVGS1j4mBnjH0xle2NsfMbW51OwQiECXw7D7Jv123Gw=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "4e881be4521f123ad42b27f498b12d533b252b57",
+        "rev": "efdfb9935fe1e8c17f3bdedfb5585852c1ca3387",
         "type": "github"
       },
       "original": {

flake.nix

@@ -160,7 +160,7 @@
 
           scripts = {
             tidy.exec = ''
-              alejandra -e ./users/configs/desktop/hyprland/default.nix .
+              alejandra .
             '';
           };
         }

hosts/common/default.nix

@@ -33,17 +33,6 @@ in {
       experimental-features = nix-command flakes
       warn-dirty = false
     '';
-
-    settings = {
-      substituters = [
-        "https://hyprland.cachix.org"
-      ];
-      trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
-      trusted-users = [
-        "root"
-        "daniel"
-      ];
-    };
   };
 
   # Set time zone.

hosts/common/graphical/default.nix

@@ -51,7 +51,6 @@
   };
 
   programs = {
-    hyprland.enable = true;
     sway.enable = true;
 
     steam = {

users/configs/desktop/default.nix

@@ -3,7 +3,6 @@
     # ./i3
     # ./i3status-rust
     # ./polybar
-    ./hyprland
     ./river
     ./sway
     ./tofi

users/configs/desktop/hyprland/default.nix

@@ -1,220 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  hostname,
-  ...
-}: let
-  closer = pkgs.writeShellApplication {
-    name = "closer";
-
-    runtimeInputs = with pkgs; [jq xdotool];
-
-    text = ''
-      if [ "$(hyprctl activewindow -j | jq -r ".class")" = "Steam" ]; then
-        xdotool getactivewindow windowunmap
-      else
-        hyprctl dispatch killactive ""
-      fi
-    '';
-  };
-in {
-  home.packages = with pkgs; [
-    swaybg
-  ];
-
-  home.file = {
-    ".config/hypr/macchiato.conf" = {
-      source = ./macchiato.conf;
-    };
-  };
-
-  services.blueman-applet.enable = true;
-
-  wayland.windowManager.hyprland = {
-    enable = true;
-    package = pkgs.hyprland;
-    xwayland = {
-      enable = true;
-    };
-    extraConfig =
-      (builtins.readFile ./${hostname}.conf)
-      + ''
-        # See https://wiki.hyprland.org/Configuring/Keywords/ for more
-
-        # Execute your favorite apps at launch
-        exec-once = waybar
-        exec-once = swaybg -i ~/wallpapers/wallpaper.jpg
-
-        # Source a file (multi-file configs)
-        # source = ~/.config/hypr/myColors.conf
-        source = ./macchiato.conf
-
-        # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
-        input {
-            kb_layout = gb
-            kb_variant =
-            kb_model =
-            kb_options = caps:escape
-            kb_rules =
-
-            follow_mouse = 2
-
-            touchpad {
-                natural_scroll = yes
-                middle_button_emulation = yes
-                scroll_factor = 0.5
-            }
-
-            accel_profile = flat
-            sensitivity = 0.5 # -1.0 - 1.0, 0 means no modification.
-        }
-
-        general {
-            # See https://wiki.hyprland.org/Configuring/Variables/ for more
-
-            gaps_in = 5
-            gaps_out = 10
-            border_size = 2
-            col.active_border = $green
-            col.inactive_border = rgba(595959aa)
-
-            layout = dwindle
-        }
-
-        decoration {
-            # See https://wiki.hyprland.org/Configuring/Variables/ for more
-
-            rounding = 10
-            blur {
-              enabled = true
-              size = 3
-              passes = 1
-            }
-
-            drop_shadow = yes
-            shadow_range = 4
-            shadow_render_power = 3
-            col.shadow = rgba(1a1a1aee)
-
-            dim_inactive = true
-            dim_strength = 0.1
-        }
-
-        animations {
-            enabled = yes
-
-            # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
-
-            bezier = myBezier, 0.05, 0.9, 0.1, 1.05
-
-            animation = windows, 1, 1, myBezier
-            animation = windowsOut, 1, 2, default, popin 80%
-            animation = border, 0, 2, default
-            animation = borderangle, 0, 2, default
-            animation = fade, 0, 2, default
-            animation = workspaces, 1, 1, default
-        }
-
-        dwindle {
-            # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
-            pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-            preserve_split = yes # you probably want this
-        }
-
-        master {
-            # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-            new_is_master = true
-        }
-
-        gestures {
-            # See https://wiki.hyprland.org/Configuring/Variables/ for more
-            workspace_swipe = true
-            workspace_swipe_fingers = 4
-        }
-
-        misc {
-          disable_hyprland_logo = true
-        }
-
-        xwayland {
-          force_zero_scaling = true
-        }
-
-        # Example windowrule v1
-        # windowrule = float, ^(kitty)$
-        # Example windowrule v2
-        # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
-        # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-
-        # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-        bind = $mainMod, return, exec, kitty
-        bind = $mainMod, Q, exec, ${closer}/bin/closer
-        bind = $mainMod, D, exec, tofi-drun --drun-launch=true
-        bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)"
-
-        bind = $mainMod SHIFT, P, exit
-
-        # Move focus with mainMod + vim keys
-        bind = $mainMod, H, movefocus, l
-        bind = $mainMod, L, movefocus, r
-        bind = $mainMod, K, movefocus, u
-        bind = $mainMod, J, movefocus, d
-
-        # Move focus with mainMod + vim keys
-        bind = $mainMod, left, movewindow, l
-        bind = $mainMod, right, movewindow, r
-        bind = $mainMod, up, movewindow, u
-        bind = $mainMod, down, movewindow, d
-
-        # Switch workspaces with mainMod + [0-9]
-        bind = $mainMod, 1, workspace, 1
-        bind = $mainMod, 2, workspace, 2
-        bind = $mainMod, 3, workspace, 3
-        bind = $mainMod, 4, workspace, 4
-        bind = $mainMod, 5, workspace, 5
-        bind = $mainMod, 6, workspace, 6
-        bind = $mainMod, 7, workspace, 7
-        bind = $mainMod, 8, workspace, 8
-        bind = $mainMod, 9, workspace, 9
-        bind = $mainMod, 0, workspace, 10
-
-        # Move active window to a workspace with mainMod + SHIFT + [0-9]
-        bind = $mainMod SHIFT, 1, movetoworkspace, 1
-        bind = $mainMod SHIFT, 2, movetoworkspace, 2
-        bind = $mainMod SHIFT, 3, movetoworkspace, 3
-        bind = $mainMod SHIFT, 4, movetoworkspace, 4
-        bind = $mainMod SHIFT, 5, movetoworkspace, 5
-        bind = $mainMod SHIFT, 6, movetoworkspace, 6
-        bind = $mainMod SHIFT, 7, movetoworkspace, 7
-        bind = $mainMod SHIFT, 8, movetoworkspace, 8
-        bind = $mainMod SHIFT, 9, movetoworkspace, 9
-        bind = $mainMod SHIFT, 0, movetoworkspace, 10
-
-        bind = $mainMod, U, movetoworkspace, -1
-        bind = $mainMod, I, movetoworkspace, +1
-
-        bind = $mainMod SHIFT, space, togglefloating,
-
-        bind = $mainMod, F, fullscreen,
-
-        bind=$mainMod, escape, exec, swaylock -i ~/wallpapers/lock.png
-
-        binde=, XF86AudioLowerVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%-
-        bind=, XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-        binde=, XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%+
-
-        binde=, XF86MonBrightnessUp, exec, xbacklight -inc 10
-        binde=, XF86MonBrightnessDown, exec, xbacklight -dec 10
-
-        # Move/resize windows with mainMod + LMB/RMB and dragging
-        bindm = $mainMod, mouse:272, movewindow
-        bindm = $mainMod, mouse:273, resizewindow
-        bind = $mainMod, mouse:274, togglefloating
-      '';
-  };
-
-  services.mako = {
-    enable = true;
-  };
-}

users/configs/desktop/hyprland/dingbox.conf

@@ -1,7 +0,0 @@
-monitor=,preferred,auto,1.25
-
-$mainMod = CTRL + SHIFT + ALT
-
-bind = $mainMod + SUPER, Q, exit,
-bind = $mainMod, M, workspace, -1
-bind = $mainMod, comma, workspace, +1

users/configs/desktop/hyprland/elderbug.conf

@@ -1,7 +0,0 @@
-monitor=,preferred,auto,1.25
-
-$mainMod = CTRL + SHIFT + ALT
-
-bind = $mainMod + SUPER, Q, exit,
-bind = $mainMod, M, workspace, -1
-bind = $mainMod, comma, workspace, +1

users/configs/desktop/hyprland/macchiato.conf

@@ -1,30 +0,0 @@
-$rosewater = 0xfff4dbd6
-$flamingo  = 0xfff0c6c6
-$pink      = 0xfff5bde6
-$mauve     = 0xffc6a0f6
-$red       = 0xffed8796
-$maroon    = 0xffee99a0
-$peach     = 0xfff5a97f
-$yellow    = 0xffeed49f
-$green     = 0xffa6da95
-$teal      = 0xff8bd5ca
-$sky       = 0xff91d7e3
-$sapphire  = 0xff7dc4e4
-$blue      = 0xff8aadf4
-$lavender  = 0xffb7bdf8
-
-$text      = 0xffcad3f5
-$subtext1  = 0xffb8c0e0
-$subtext0  = 0xffa5adcb
-
-$overlay2  = 0xff939ab7
-$overlay1  = 0xff8087a2
-$overlay0  = 0xff6e738d
-
-$surface2  = 0xff5b6078
-$surface1  = 0xff494d64
-$surface0  = 0xff363a4f
-
-$base      = 0xff24273a
-$mantle    = 0xff1e2030
-$crust     = 0xff181926

users/configs/desktop/hyprland/pingbox.conf

@@ -1,75 +0,0 @@
-monitor=eDP-1,preferred,auto,1.33
-monitor=,preferred,auto,1.25
-
-$mainMod = SUPER
-
-bind = $mainMod + SHIFT + CTRL, Q, exit,
-bind = $mainMod + CTRL, H, workspace, -1
-bind = $mainMod + CTRL, L, workspace, +1
-bind = $mainMod + SHIFT, H, movetoworkspace, -1
-bind = $mainMod + SHIFT, L, movetoworkspace, +1
-
-# Add super as an alternative mainMod for when I plug in a keyboard
-$altMod = CTRL + SHIFT + ALT
-
-bind = $altMod + SUPER, Q, exit,
-bind = $altMod, M, workspace, -1
-bind = $altMod, comma, workspace, +1
-
-# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $altMod, return, exec, kitty
-bind = $altMod, Q, exec, ${closer}/bin/closer
-bind = $altMod, D, exec, tofi-drun --drun-launch=true
-bind = $altMod SHIFT, S, exec, grim -g "$(slurp)"
-
-# Move focus with altMod + vim keys
-bind = $altMod, H, movefocus, l
-bind = $altMod, L, movefocus, r
-bind = $altMod, K, movefocus, u
-bind = $altMod, J, movefocus, d
-
-# Move focus with altMod + vim keys
-bind = $altMod, left, movewindow, l
-bind = $altMod, right, movewindow, r
-bind = $altMod, up, movewindow, u
-bind = $altMod, down, movewindow, d
-
-# Switch workspaces with altMod + [0-9]
-bind = $altMod, 1, workspace, 1
-bind = $altMod, 2, workspace, 2
-bind = $altMod, 3, workspace, 3
-bind = $altMod, 4, workspace, 4
-bind = $altMod, 5, workspace, 5
-bind = $altMod, 6, workspace, 6
-bind = $altMod, 7, workspace, 7
-bind = $altMod, 8, workspace, 8
-bind = $altMod, 9, workspace, 9
-bind = $altMod, 0, workspace, 10
-
-# Move active window to a workspace with altMod + SHIFT + [0-9]
-bind = $altMod SHIFT, 1, movetoworkspace, 1
-bind = $altMod SHIFT, 2, movetoworkspace, 2
-bind = $altMod SHIFT, 3, movetoworkspace, 3
-bind = $altMod SHIFT, 4, movetoworkspace, 4
-bind = $altMod SHIFT, 5, movetoworkspace, 5
-bind = $altMod SHIFT, 6, movetoworkspace, 6
-bind = $altMod SHIFT, 7, movetoworkspace, 7
-bind = $altMod SHIFT, 8, movetoworkspace, 8
-bind = $altMod SHIFT, 9, movetoworkspace, 9
-bind = $altMod SHIFT, 0, movetoworkspace, 10
-
-bind = $altMod, U, movetoworkspace, -1
-bind = $altMod, I, movetoworkspace, +1
-
-bind = $altMod SHIFT, space, togglefloating,
-
-bind=$altMod, escape, exec, swaylock -i ~/wallpapers/lock.png
-
-# Move/resize windows with altMod + LMB/RMB and dragging
-bindm = $altMod, mouse:272, movewindow
-bindm = $altMod, mouse:273, resizewindow
-
-general {
-    gaps_out = 5
-}
-

users/configs/desktop/hyprland/sidon.conf

@@ -1,10 +0,0 @@
-monitor=HDMI-A-2,3840x2160@60.0,3072x0,1.25
-monitor=DP-3,3840x2160@59.997002,0x0,1.25
-
-workspace=1,monitor:DP-3
-
-$mainMod = CTRL + SHIFT + ALT
-
-bind = $mainMod + SUPER, Q, exit,
-bind = $mainMod, M, workspace, -1
-bind = $mainMod, comma, workspace, +1

users/configs/desktop/sway/default.nix

@@ -36,7 +36,7 @@ in {
         };
         "type:pointer" = {
           accel_profile = "flat";
-          pointer_accel = "-0.2";
+          pointer_accel = "0.1";
         };
       };
       output = {
@@ -64,7 +64,9 @@ in {
         "${mod}+Shift+s" = "exec grim -g \"$(slurp)\"";
 
         "${mod}+Shift+Space" = "floating toggle";
+        "${hyper}+Shift+Space" = "floating toggle";
         "${mod}+Space" = "focus mode_toggle";
+        # "${hyper}+Space" = "focus mode_toggle";
 
         "${mod}+h" = "focus left";
         "${mod}+j" = "focus down";

users/daniel/default.nix

@@ -31,6 +31,7 @@
     gnumake
     go
     gopls
+    jujutsu
     lua-language-server
     minisign
     nb