Kaynağa Gözat

dms rename to dux, use dux files, try to use dux-greeter but not work

Johan Rong 1 hafta önce
ebeveyn
işleme
429ba7c6bd

+ 59 - 21
flake.lock

@@ -1,34 +1,29 @@
 {
   "nodes": {
-    "dank-greeter": {
-      "inputs": {
-        "dank-qml-common": "dank-qml-common",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
+    "dank-qml-common": {
+      "flake": false,
       "locked": {
-        "lastModified": 1792609211,
-        "narHash": "sha256-ZHbhVOg0p2PpxrynYaEFafGgnuR43e4DXEIEusw3b/Q=",
-        "owner": "AvengeMedia",
-        "repo": "dank-greeter",
-        "rev": "d85f83edd799bcf58841bbd2b536e04058918319",
+        "lastModified": 1792513666,
+        "narHash": "sha256-RDqPdPrM5lnwRrfFGLz3IwgTjCV2Ie+nrTD3ldj1t/s=",
+        "owner": "duxlabs-dev",
+        "repo": "dux-qml-common",
+        "rev": "ebf5e6c002da1bdaa4aaa2f319fea7b8507abc42",
         "type": "github"
       },
       "original": {
-        "owner": "AvengeMedia",
-        "repo": "dank-greeter",
+        "owner": "duxlabs-dev",
+        "repo": "dux-qml-common",
         "type": "github"
       }
     },
-    "dank-qml-common": {
+    "dank-qml-common_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1792513666,
-        "narHash": "sha256-RDqPdPrM5lnwRrfFGLz3IwgTjCV2Ie+nrTD3ldj1t/s=",
+        "lastModified": 1792597131,
+        "narHash": "sha256-2t9btOQ2owoRv/fgeonlr8cHVt2NUvUu9iXdZd9+QFc=",
         "owner": "duxlabs-dev",
         "repo": "dux-qml-common",
-        "rev": "ebf5e6c002da1bdaa4aaa2f319fea7b8507abc42",
+        "rev": "5715e8ea868f3a131a0f54c7a5875e9a95f2f253",
         "type": "github"
       },
       "original": {
@@ -37,7 +32,7 @@
         "type": "github"
       }
     },
-    "dank-qml-common_2": {
+    "dank-qml-common_3": {
       "flake": false,
       "locked": {
         "lastModified": 1792513666,
@@ -55,7 +50,7 @@
     },
     "dux": {
       "inputs": {
-        "dank-qml-common": "dank-qml-common_2",
+        "dank-qml-common": "dank-qml-common",
         "flake-compat": "flake-compat",
         "nixpkgs": [
           "nixpkgs"
@@ -76,6 +71,48 @@
         "type": "github"
       }
     },
+    "dux-files": {
+      "inputs": {
+        "dank-qml-common": "dank-qml-common_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1792610641,
+        "narHash": "sha256-UD6rFz2L3K0Ju6KabPAP1Vu0vxFd/xq13ekkl494Ohc=",
+        "owner": "duxlabs-dev",
+        "repo": "dux-files",
+        "rev": "240d78ed175eb20fd9e7f86becec75c06f1c0407",
+        "type": "github"
+      },
+      "original": {
+        "owner": "duxlabs-dev",
+        "repo": "dux-files",
+        "type": "github"
+      }
+    },
+    "dux-greeter": {
+      "inputs": {
+        "dank-qml-common": "dank-qml-common_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1792609211,
+        "narHash": "sha256-ZHbhVOg0p2PpxrynYaEFafGgnuR43e4DXEIEusw3b/Q=",
+        "owner": "duxlabs-dev",
+        "repo": "dux-greeter",
+        "rev": "d85f83edd799bcf58841bbd2b536e04058918319",
+        "type": "github"
+      },
+      "original": {
+        "owner": "duxlabs-dev",
+        "repo": "dux-greeter",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -299,8 +336,9 @@
     },
     "root": {
       "inputs": {
-        "dank-greeter": "dank-greeter",
         "dux": "dux",
+        "dux-files": "dux-files",
+        "dux-greeter": "dux-greeter",
         "home-manager": "home-manager",
         "mangowm": "mangowm",
         "nix-flatpak": "nix-flatpak",

+ 13 - 8
flake.nix

@@ -8,14 +8,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.7.0";
-    dux = {
-      url = "github:duxlabs-dev/dux-shell/stable";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    dank-greeter = {
-      url = "github:AvengeMedia/dank-greeter";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     mangowm = {
       url = "github:mangowm/mango";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -27,6 +19,19 @@
       url = "github:SoaOaoS/something-x";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    dux = {
+      url = "github:duxlabs-dev/dux-shell/stable";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    dux-greeter = {
+      url = "github:duxlabs-dev/dux-greeter";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    dux-files = {
+      url = "github:duxlabs-dev/dux-files";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =

+ 30 - 0
home/modules/apps/dux-files.nix

@@ -0,0 +1,30 @@
+{ pkgs, inputs, ... }:
+
+{
+  imports = [
+    inputs.dux-files.homeModules.default
+  ];
+
+  programs.dux-files = {
+    enable = true;
+
+    systemd = {
+      enable = true;
+      target = "graphical-session.target";
+      restartIfChanged = true;
+    };
+
+    settings = {
+      themeMode = "dark";
+      radiusStrength = 50;
+      defaultView = "list";
+      vimKeys = false;
+    };
+
+    portal = {
+      enable = true;
+      preferred = true;
+      desktop = "hyprland";
+    };
+  };
+}

+ 1 - 1
home/modules/desktop/hyprland/default.nix

@@ -31,7 +31,7 @@ in
       enable = true;
 
       defaultApplications = {
-        "inode/directory" = [ "org.kde.dolphin.desktop" ];
+        # "inode/directory" = [ "org.kde.dolphin.desktop" ];
 
         "x-scheme-handler/http" = "firefox.desktop";
         "x-scheme-handler/https" = "firefox.desktop";

+ 1 - 1
home/modules/desktop/hyprland/lua/modules/keybindings.lua

@@ -2,7 +2,7 @@ local mainMod = "ALT"
 local secMod = "SUPER"
 
 local terminal    = "alacritty"
-local fileManager = "dolphin"
+local fileManager = "dfiles"
 local editor = "nvim"
 
 -- Example binds, see https://wiki.hypr.land/Configuring/Basics/Binds/ for more

+ 1 - 1
home/modules/desktop/mango/default.nix

@@ -28,7 +28,7 @@
         "ALT,P,pseudo"
         "ALT,F,fullscreen"
         "ALT,SHIFT,SPACE,float"
-        "SUPER,E,spawn,dolphin"
+        "SUPER,E,spawn,dfiles"
         "SUPER,Q,spawn,firefox"
         "SUPER,S,spawn,spotify"
         "SUPER,D,spawn,vesktop"

+ 1 - 0
hosts/nixstation/home/default.nix

@@ -8,6 +8,7 @@
     ./hyprland.nix
 
     ../../../home/modules/apps/alacritty.nix
+    ../../../home/modules/apps/dux-files.nix
     ../../../home/modules/apps/firefox.nix
     ../../../home/modules/apps/fish
     ../../../home/modules/apps/emacs

+ 1 - 1
nixos/modules/desktop/hyprland/default.nix

@@ -13,7 +13,7 @@
 
     kdePackages.kdenlive
     kdePackages.ark
-    kdePackages.dolphin
+    # kdePackages.dolphin
     kdePackages.qtsvg 
     kdePackages.kio
     kdePackages.kio-fuse

+ 1 - 1
nixos/modules/desktop/mango/default.nix

@@ -16,7 +16,7 @@
 
     kdePackages.kdenlive
     kdePackages.ark
-    kdePackages.dolphin
+    # kdePackages.dolphin
     kdePackages.qtsvg 
     kdePackages.kio
     kdePackages.kio-fuse

+ 1 - 1
nixos/modules/greeter/dank-greeter/common.nix → nixos/modules/greeter/dux-greeter/common.nix

@@ -5,7 +5,7 @@ let
 in
 {
   imports = [
-    inputs.dms.nixosModules.greeter
+    inputs.dux-greeter.nixosModules.default
   ];
 
   services.displayManager.dms-greeter = {

+ 0 - 0
nixos/modules/greeter/dank-greeter/hyprland.nix → nixos/modules/greeter/dux-greeter/hyprland.nix