flake.lock: bump

flake.nix: refactor; remove walker, xwst, niri

flake.nix

@@ -2,133 +2,60 @@
   description = "unexplrd's personal configuration";
 
   inputs = {
-    # lix = {
+    blueprint.url = "github:numtide/blueprint";
-    #   url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.1.tar.gz";
+    chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
-    #   inputs.nixpkgs.follows = "nixpkgs";
+    dms.url = "github:AvengeMedia/DankMaterialShell/42a283";
-    # };
+    disko.url = "github:nix-community/disko/latest";
-    # neve = {
+    ghostty.url = "github:ghostty-org/ghostty";
-    #   inputs.nixvim.follows = "nixvim";
+    home-manager.url = "github:nix-community/home-manager";
-    #   url = "git+https://gitea.linerds.us/unexplrd/Neve";
+    hyprland.url = "github:hyprwm/Hyprland";
-    # };
+    hyprsunset.url = "github:hyprwm/hyprsunset";
-    # nixvim.url = "github:nix-community/nixvim";
+    lanzaboote.url = "github:nix-community/lanzaboote";
-    systems.url = "github:nix-systems/default";
+    mysecrets.url = "git+ssh://gitea@gitea.linerds.us/unexplrd/nix-secrets";
-    blueprint = {
+    niri-flake.url = "github:sodiboo/niri-flake";
-      url = "github:numtide/blueprint";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.systems.follows = "systems";
-    };
-    chaotic = {
-      url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
-      inputs = {
-        home-manager.follows = "home-manager";
-        nixpkgs.follows = "nixpkgs";
-      };
-    };
-    disko = {
-      url = "github:nix-community/disko/latest";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    dankMaterialShell = {
-      url = "github:AvengeMedia/DankMaterialShell";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    ghostty = {
-      url = "github:ghostty-org/ghostty";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.inputs.systems.follows = "systems";
-    };
-    home-manager = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    hyprland = {
-      url = "github:hyprwm/Hyprland";
-      inputs = {
-        systems.follows = "systems";
-        nixpkgs.follows = "nixpkgs";
-      };
-    };
-    hyprsunset = {
-      url = "github:hyprwm/hyprsunset";
-      inputs = {
-        hyprland-protocols.follows = "hyprland/hyprland-protocols";
-        hyprlang.follows = "hyprland/hyprlang";
-        hyprutils.follows = "hyprland/hyprutils";
-        hyprwayland-scanner.follows = "hyprland/hyprwayland-scanner";
-        nixpkgs.follows = "nixpkgs";
-        systems.follows = "hyprland/systems";
-      };
-    };
-    lanzaboote = {
-      url = "github:nix-community/lanzaboote/v0.4.2";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    mysecrets = {
-      url = "git+ssh://gitea@gitea.linerds.us/unexplrd/nix-secrets";
-      flake = false;
-    };
-    niri = {
-      url = "github:YaLTeR/niri";
-      inputs = {
-        # nixpkgs-stable.follows = "nixpkgs-stable";
-        nixpkgs.follows = "nixpkgs";
-      };
-    };
-    niri-flake = {
-      url = "github:sodiboo/niri-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     nix-flatpak.url = "github:gmodena/nix-flatpak";
-    nix-index-database = {
+    nix-index-database.url = "github:nix-community/nix-index-database";
-      url = "github:nix-community/nix-index-database";
+    nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nixos-cosmic = {
-      url = "github:lilyinstarlight/nixos-cosmic";
-      inputs = {
-        nixpkgs-stable.follows = "nixpkgs-stable";
-        nixpkgs.follows = "nixpkgs";
-      };
-    };
     nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
     nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
-    nixpkgs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-      url = "github:NixOS/nixpkgs/nixos-unstable";
+    sops-nix.url = "github:mic92/sops-nix";
-      # workaround for `unexpected Nix daemon error: error: serialised integer 7022364302122705765 is too large for type 'j'`
+    stylix.url = "github:danth/stylix";
-      # url = "github:NixOS/nixpkgs/pull/413627/head";
+    systems.url = "github:nix-systems/default";
-    };
+    vicinae.url = "github:vicinaehq/vicinae";
-    sops-nix = {
+    zmx.url = "github:brittonr/zmx";
-      url = "github:mic92/sops-nix";
+
-      inputs.nixpkgs.follows = "nixpkgs";
+    blueprint.inputs.nixpkgs.follows = "nixpkgs";
-    };
+    blueprint.inputs.systems.follows = "systems";
-    stylix = {
+    chaotic.inputs.home-manager.follows = "home-manager";
-      url = "github:danth/stylix";
+    chaotic.inputs.nixpkgs.follows = "nixpkgs";
-      inputs = {
+    dms.inputs.nixpkgs.follows = "nixpkgs";
-        # home-manager.follows = "home-manager";
+    disko.inputs.nixpkgs.follows = "nixpkgs";
-        nixpkgs.follows = "nixpkgs";
+    ghostty.inputs.flake-utils.inputs.systems.follows = "systems";
-        systems.follows = "systems";
+    ghostty.inputs.home-manager.follows = "home-manager";
-      };
+    ghostty.inputs.nixpkgs.follows = "nixpkgs";
-    };
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    walker = {
+    hyprland.inputs.nixpkgs.follows = "nixpkgs";
-      url = "github:abenz1267/walker/0f366b1";
+    hyprland.inputs.systems.follows = "systems";
-      inputs = {
+    hyprsunset.inputs.hyprland-protocols.follows = "hyprland/hyprland-protocols";
-        nixpkgs.follows = "nixpkgs";
+    hyprsunset.inputs.hyprlang.follows = "hyprland/hyprlang";
-        systems.follows = "systems";
+    hyprsunset.inputs.hyprutils.follows = "hyprland/hyprutils";
-      };
+    hyprsunset.inputs.hyprwayland-scanner.follows = "hyprland/hyprwayland-scanner";
-    };
+    hyprsunset.inputs.nixpkgs.follows = "nixpkgs";
-    xwst = {
+    hyprsunset.inputs.systems.follows = "hyprland/systems";
-      url = "github:Supreeeme/xwayland-satellite";
+    lanzaboote.inputs.nixpkgs.follows = "nixpkgs";
-      inputs = {
+    mysecrets.flake = false;
-        nixpkgs.follows = "nixpkgs";
+    niri-flake.inputs.nixpkgs-stable.follows = "nixpkgs-stable";
-      };
+    niri-flake.inputs.nixpkgs.follows = "nixpkgs";
-    };
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
-    vicinae = {
+    nixos-cosmic.inputs.nixpkgs-stable.follows = "nixpkgs-stable";
-      url = "github:vicinaehq/vicinae";
+    nixos-cosmic.inputs.nixpkgs.follows = "nixpkgs";
-      inputs = {
+    sops-nix.inputs.nixpkgs.follows = "nixpkgs";
-        nixpkgs.follows = "nixpkgs";
+    stylix.inputs.nixpkgs.follows = "nixpkgs";
-        systems.follows = "systems";
+    stylix.inputs.systems.follows = "systems";
-      };
+    vicinae.inputs.nixpkgs.follows = "nixpkgs";
-    };
+    vicinae.inputs.systems.follows = "systems";
+    zmx.inputs.zig2nix.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = inputs: inputs.blueprint {inherit inputs;};

modules/home/desktop/hyprland/default.nix

@@ -67,7 +67,7 @@ in {
       platformTheme.name = "gtk3";
     };
 
-    programs.walker = import ./programs/walker {inherit config inputs pkgs;};
+    # programs.walker = import ./programs/walker {inherit config inputs pkgs;};
     programs.waybar = import ./programs/waybar {inherit config colors getExe ifLaptop pkgs;};
     wayland.windowManager.hyprland = import ./hyprland.nix {inherit config osConfig perSystem launcher lockscreen;};
     services = import ./services {inherit pkgs lockscreen getExe perSystem;};
@@ -189,7 +189,7 @@ in {
               ExecStart = "${getExe perSystem.hyprsunset.hyprsunset} -t 6500";
             };
         };
-        walker = mkGraphicalService {};
+        # walker = mkGraphicalService {};
       };
     };
   };

modules/home/desktop/niri/default.nix

@@ -24,7 +24,7 @@
 in {
   imports = with inputs; [
     # vicinae.homeManagerModules.default
-    walker.homeManagerModules.default
+    # walker.homeManagerModules.default
   ];
   options = {
     desktop.niri.enable =
@@ -102,7 +102,7 @@ in {
 
     xdg = {
       configFile = {
-        niri = import ./niri.nix commonArgs;
+        # niri = import ./niri.nix commonArgs;
         "mimeapps.list".force = true;
       };
       mime.enable = true;

modules/home/desktop/niri/niri.nix

@@ -246,10 +246,12 @@ in {
         match app-id="org.wezfurlong.wezterm"
         match app-id="com.mitchellh.ghostty"
         default-column-width { proportion 1.0; }
+        draw-border-with-background false
     }
     window-rule {
         match app-id="re.sonny.Junction"
         match app-id="com.github.hluk.copyq"
+        match title=r"^.* - Choose User Profile$"
         open-floating true
         open-focused true
     }
@@ -292,6 +294,8 @@ in {
       Mod+Ctrl+M  { fullscreen-window; }
       Mod+Ctrl+G  { toggle-window-floating; }
 
+      Mod+Shift+M { maximize-window-to-edges; }
+
       Mod+Ctrl+Shift+M { toggle-windowed-fullscreen; }
 
       Mod+Minus         { set-column-width "-10%"; }
@@ -305,7 +309,7 @@ in {
 
       Mod+Ctrl+Space   repeat=false { toggle-overview; }
 
-      Mod+Return       repeat=false { spawn "/bin/sh" "-c" "$TERMINAL"; }
+      Mod+Return       repeat=false { spawn "sh" "-c" "$TERMINAL"; }
       Mod+BackSpace    repeat=false { spawn "sh" "-c" "${launcher}"; }
       Mod+D            repeat=false { spawn "sh" "-c" "${launcher}"; }
       Mod+Ctrl+L       repeat=false { spawn "${lockscreen}"; }

modules/nixos/desktop/dms/default.nix

@@ -10,8 +10,8 @@ with lib; let
   cfg = config.desktop.dms;
 in {
   imports = with inputs; [
-    dankMaterialShell.nixosModules.dankMaterialShell
+    dms.nixosModules.dankMaterialShell
-    dankMaterialShell.nixosModules.greeter
+    dms.nixosModules.greeter
     niri-flake.nixosModules.niri
   ];
   options = {
@@ -28,9 +28,11 @@ in {
     module.desktop.gnome-keyring.enable = true;
     sound.pipewire.enable = true;
 
+    services.gvfs.enable = true;
+
     programs.niri = {
       enable = true;
-      package = perSystem.niri.niri;
+      package = perSystem.niri-flake.niri-unstable;
     };
 
     systemd.user.services.niri-flake-polkit.enable = false;
@@ -39,6 +41,7 @@ in {
       enable = true;
       greeter = {
         enable = true;
+        configHome = "/home/user";
         compositor.name = "niri";
       };
     };