3 Commity e745c2d26c ... 96e8f8f90e

Autor SHA1 Wiadomość Data
  Johan Rong 96e8f8f90e configurations for dux shell 1 tydzień temu
  Johan Rong 429ba7c6bd dms rename to dux, use dux files, try to use dux-greeter but not work 1 tydzień temu
  Johan Rong 019718958f update and weridness 1 tydzień temu

+ 65 - 27
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,
@@ -53,9 +48,9 @@
         "type": "github"
       }
     },
-    "dms": {
+    "dux": {
       "inputs": {
-        "dank-qml-common": "dank-qml-common_2",
+        "dank-qml-common": "dank-qml-common",
         "flake-compat": "flake-compat",
         "nixpkgs": [
           "nixpkgs"
@@ -64,15 +59,57 @@
       "locked": {
         "lastModified": 1792523829,
         "narHash": "sha256-hyWdbsyOGXsJxvXG4Tqg0uRI1s3JwPi8DKyWips3Ta8=",
-        "owner": "AvengeMedia",
-        "repo": "DankMaterialShell",
+        "owner": "duxlabs-dev",
+        "repo": "dux-shell",
         "rev": "9b413296b16721f7679fb62e624cb1ed2433fa58",
         "type": "github"
       },
       "original": {
-        "owner": "AvengeMedia",
+        "owner": "duxlabs-dev",
         "ref": "stable",
-        "repo": "DankMaterialShell",
+        "repo": "dux-shell",
+        "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"
       }
     },
@@ -299,8 +336,9 @@
     },
     "root": {
       "inputs": {
-        "dank-greeter": "dank-greeter",
-        "dms": "dms",
+        "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";
-    dms = {
-      url = "github:AvengeMedia/DankMaterialShell/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 =

+ 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/hyprland/modules/config-builder.nix

@@ -58,7 +58,7 @@ in {
       type = types.str;
       default = "";
       example = "dms run";
-      description = "Command executed on hyprland start (e.g. dms-shell, waybar, etc.)";
+      description = "Command executed on hyprland start (e.g. dux-shell, waybar, etc.)";
     };
 
     mainMod = mkOption { type = types.str; default = "ALT"; };

+ 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"

+ 50 - 0
home/modules/shells/dux-shell/apps/dux-files/bookmarks.json

@@ -0,0 +1,50 @@
+{
+ "version": 2,
+ "bookmarks": [
+  {
+   "path": "recent:///",
+   "label": "recent",
+   "icon": ""
+  },
+  {
+   "path": "/home/johron",
+   "label": "johron",
+   "icon": ""
+  },
+  {
+   "path": "/home/johron/Projects",
+   "label": "Projects",
+   "icon": ""
+  },
+  {
+   "path": "/home/johron/Documents",
+   "label": "Documents",
+   "icon": ""
+  },
+  {
+   "path": "/home/johron/Downloads",
+   "label": "Downloads",
+   "icon": ""
+  },
+  {
+   "path": "/home/johron/Pictures",
+   "label": "Pictures",
+   "icon": ""
+  },
+  {
+   "path": "/home/johron/Videos",
+   "label": "Videos",
+   "icon": ""
+  },
+  {
+   "path": "/home/johron/Music",
+   "label": "Music",
+   "icon": ""
+  },
+  {
+   "path": "trash:///",
+   "label": "trash",
+   "icon": ""
+  }
+ ]
+}

+ 77 - 0
home/modules/shells/dux-shell/apps/dux-files/default.nix

@@ -0,0 +1,77 @@
+{ pkgs, inputs, ... }:
+
+{
+  imports = [
+    inputs.dux-files.homeModules.default
+  ];
+
+  home.file.".config/dfiles/bookmarks.json".source = ./bookmarks.json;
+  home.file.".config/dfiles/servers.json".source = ./servers.json;
+
+  programs.dux-files = {
+    enable = true;
+
+    systemd = {
+      enable = true;
+      target = "graphical-session.target";
+      restartIfChanged = true;
+    };
+
+    settings = {
+      animationDuration = 250;
+      clickToOpen = "double";
+      closeBehavior = "hide";
+      colorSource = "auto";
+      confirmTrash = false;
+      customThemeFile = "";
+      defaultSort = "name";
+      defaultSortDescending = false;
+      defaultView = "list";
+      displayFontFamily = "";
+      dragAction = "auto";
+      enableRippleEffects = true;
+      extractOnOpen = true;
+      focusRingColor = "primary";
+      focusRingEnabled = true;
+      focusRingWidth = 1.5;
+      folderCounts = true;
+      foldersFirst = true;
+      fontFamily = "";
+      fontScale = 1;
+      fontSource = "auto";
+      fontWeight = 400;
+      gtkBookmarksOffered = true;
+      language = "";
+      listTyping = "jump";
+      monoFontFamily = "";
+      mountOnClick = true;
+      networkThumbnails = false;
+      openLocationIn = "tab";
+      presetTheme = "purple";
+      radiusStrength = 50;
+      recentFiles = true;
+      reduceMotion = false;
+      registerFileManager = true;
+      rememberFolderViews = true;
+      searchExcludes = [];
+      searchHidden = false;
+      showExtensions = true;
+      showHidden = false;
+      showSystemPartitions = false;
+      sidebarCollapsed = false;
+      springBounce = 1;
+      terminal = "alacritty";
+      themeMode = "auto";
+      thumbnailSizeLimitMb = 64;
+      thumbnails = true;
+      vimKeys = false;
+      windowTitleBars = false;
+    };
+
+    portal = {
+      enable = true;
+      preferred = true;
+      desktop = "hyprland";
+    };
+  };
+}

+ 26 - 0
home/modules/shells/dux-shell/apps/dux-files/servers.json

@@ -0,0 +1,26 @@
+[
+  {
+    "uri": "sftp://moholt/",
+    "name": "moholt",
+    "scheme": "sftp",
+    "lastUsedMs": 1792667054783
+  },
+  {
+    "uri": "sftp://moholt-pub/",
+    "name": "moholt-pub",
+    "scheme": "sftp",
+    "lastUsedMs": 1792667054783
+  },
+  {
+    "uri": "smb://johanhr@sambaad.stud.ntnu.no/johanhr",
+    "name": "sambaad.stud.ntnu.no/johanhr",
+    "scheme": "smb",
+    "lastUsedMs": 1792667001251
+  },
+  {
+    "uri": "smb://johanhr@webedit.ntnu.no/johanhr",
+    "name": "webedit.ntnu.no/johanhr",
+    "scheme": "smb",
+    "lastUsedMs": 1792666964418
+  }
+]

+ 0 - 0
home/modules/shells/dms-shell/clipboard-settings.nix → home/modules/shells/dux-shell/clipboard-settings.nix


+ 3 - 1
home/modules/shells/dms-shell/default.nix → home/modules/shells/dux-shell/default.nix

@@ -5,11 +5,13 @@ let
 in
 {
   imports = [
-    inputs.dms.homeModules.dank-material-shell
+    inputs.dux.homeModules.dank-material-shell
 
     ./settings.nix
     ./clipboard-settings.nix
 
+    ./apps/dux-files
+
     ../../appearance/images
     ../../appearance/theme/breeze-dark.nix
     ../../appearance/theme/notwaita.nix

+ 0 - 0
home/modules/shells/dms-shell/plugin_settings.json → home/modules/shells/dux-shell/plugin_settings.json


+ 98 - 57
home/modules/shells/dms-shell/settings.nix → home/modules/shells/dux-shell/settings.nix

@@ -89,19 +89,19 @@ in
           order = [];
           widgets = [
             {
+              enabled = true;
               id = "dock_launcher";
               widgetId = "dockLauncher";
-              enabled = true;
             }
             {
+              enabled = true;
               id = "dock_apps";
               widgetId = "appsDock";
-              enabled = true;
             }
             {
+              enabled = true;
               id = "dock_trash";
               widgetId = "dockTrash";
-              enabled = true;
             }
           ];
         }
@@ -114,133 +114,167 @@ in
       barElevationEnabled = false;
       controlCenterWidgets = [
         {
-          id = "user";
+          col = 0;
           enabled = true;
-          w = 5;
           h = 1;
-          col = 0;
+          id = "user";
           row = 0;
+          w = 5;
         }
         {
-          id = "settings";
+          col = 5;
           enabled = true;
-          w = 1;
           h = 1;
-          small = true;
-          col = 5;
+          id = "settings";
           row = 0;
+          small = true;
+          w = 1;
         }
         {
-          id = "lock";
+          col = 6;
           enabled = true;
-          w = 1;
           h = 1;
-          small = true;
-          col = 6;
+          id = "lock";
           row = 0;
+          small = true;
+          w = 1;
         }
         {
-          id = "power";
+          col = 7;
           enabled = true;
-          w = 1;
           h = 1;
-          small = true;
-          col = 7;
+          id = "power";
           row = 0;
+          small = true;
+          w = 1;
         }
         {
+          col = 0;
           enabled = true;
-          id = "volumeSlider";
-          w = 4;
           h = 1;
-          col = 0;
+          id = "volumeSlider";
           row = 1;
+          w = 4;
         }
         {
+          col = 4;
           enabled = true;
-          id = "brightnessSlider";
-          w = 4;
           h = 1;
-          col = 4;
+          id = "brightnessSlider";
           row = 1;
+          w = 4;
         }
         {
+          col = 0;
           enabled = true;
-          id = "wifi";
-          w = 4;
           h = 1;
-          col = 0;
+          id = "wifi";
           row = 2;
+          w = 4;
         }
         {
+          col = 4;
           enabled = true;
-          id = "bluetooth";
-          w = 4;
           h = 1;
-          col = 4;
+          id = "bluetooth";
           row = 2;
+          w = 4;
         }
         {
+          col = 0;
           enabled = true;
-          id = "audioOutput";
-          w = 4;
           h = 1;
-          col = 0;
+          id = "audioOutput";
           row = 3;
+          w = 4;
         }
         {
+          col = 4;
           enabled = true;
-          id = "audioInput";
-          w = 4;
           h = 1;
-          col = 4;
+          id = "audioInput";
           row = 3;
+          w = 4;
         }
         {
+          col = 0;
           enabled = true;
-          id = "nightMode";
-          w = 4;
           h = 1;
-          col = 0;
+          id = "nightMode";
           row = 4;
+          w = 4;
         }
         {
+          col = 4;
           enabled = true;
-          id = "idleInhibitor";
-          w = 4;
           h = 1;
-          col = 4;
+          id = "idleInhibitor";
           row = 4;
+          w = 4;
         }
         {
-          id = "edit";
+          col = 0;
           enabled = true;
-          w = 1;
           h = 1;
-          small = true;
-          col = 0;
+          id = "edit";
           row = 5;
+          small = true;
+          w = 1;
         }
         {
-          id = "runningApps";
+          col = 1;
           enabled = true;
-          w = 3;
           h = 1;
-          small = true;
-          col = 1;
+          id = "runningApps";
           row = 5;
+          small = true;
+          w = 3;
         }
         {
-          id = "builtin_vpn";
+          col = 4;
           enabled = true;
-          w = 4;
           h = 1;
-          col = 4;
+          id = "builtin_vpn";
           row = 5;
+          w = 4;
         }
       ];
       appIdSubstitutions = [];
       clockDateFormat = "dddd, d. MMM";
+      dashCards = [
+        {
+          id = "clock";
+          w = 2;
+          h = 1;
+          col = 3;
+          row = 0;
+        }
+        {
+          id = "weather";
+          w = 1;
+          h = 1;
+        }
+        {
+          id = "calendar";
+          w = 5;
+          h = 3;
+          col = 0;
+          row = 1;
+        }
+        {
+          id = "media";
+          w = 3;
+          h = 1;
+          col = 0;
+          row = 0;
+        }
+      ];
+      dashOptions = {
+        overview = {
+          panelColumns = 5;
+          panelRows = 4;
+        };
+      };
       networkPreference = "wifi";
       cursorSettings = {
         dwl = {
@@ -296,10 +330,12 @@ in
               clockCompactMode = false;
               enabled = true;
               id = "clock";
+              clockNotificationBadge = false;
             }
           ];
           clickThrough = false;
           enabled = true;
+          followInterfaceStyle = true;
           fontScale = 1;
           gothCornerRadiusOverride = false;
           gothCornerRadiusValue = 12;
@@ -309,10 +345,10 @@ in
           innerPadding = -4;
           leftWidgets = [
             {
-              id = "workspaceSwitcher";
               enabled = true;
-              showWorkspaceIndex = true;
+              id = "workspaceSwitcher";
               showWorkspaceApps = true;
+              showWorkspaceIndex = true;
             }
             {
               enabled = true;
@@ -374,14 +410,13 @@ in
           squareCorners = true;
           transparency = 1;
           visible = true;
+          widgetFollowInterfaceStyle = true;
           widgetOutlineColor = "primary";
           widgetOutlineEnabled = false;
           widgetOutlineOpacity = 1;
           widgetOutlineThickness = 1;
           widgetPadding = 8;
           widgetTransparency = 1;
-          followInterfaceStyle = true;
-          widgetFollowInterfaceStyle = true;
         }
       ];
       builtInPluginSettings = {
@@ -394,6 +429,12 @@ in
         dms_settings_search = {
           trigger = "?";
         };
+        dms_qr_generator = {
+          trigger = "qrg";
+        };
+        dms_power = {
+          trigger = "pw";
+        };
       };
       configVersion = 42;
     };

+ 0 - 0
home/modules/shells/dms-shell/wm/hyprland/default.nix → home/modules/shells/dux-shell/wm/hyprland/default.nix


+ 2 - 2
hosts/ideapad/home/hyprland.nix

@@ -1,8 +1,8 @@
 { config, pkgs, ... }: {
   imports = [
     ../../../home/modules/desktop/hyprland/modules/config-builder.nix
-    ../../../home/modules/shells/dms-shell
-    ../../../home/modules/shells/dms-shell/wm/hyprland
+    ../../../home/modules/shells/dux-shell
+    ../../../home/modules/shells/dux-shell/wm/hyprland
   ];
 
   programs.hyprlandLua = {

+ 2 - 2
hosts/nixstation/home/hyprland.nix

@@ -1,8 +1,8 @@
 { config, pkgs, ... }: {
   imports = [
     ../../../home/modules/desktop/hyprland/modules/config-builder.nix
-    ../../../home/modules/shells/dms-shell
-    ../../../home/modules/shells/dms-shell/wm/hyprland
+    ../../../home/modules/shells/dux-shell
+    ../../../home/modules/shells/dux-shell/wm/hyprland
   ];
 
   programs.hyprlandLua = {

+ 2 - 2
hosts/ono/home/hyprland.nix

@@ -1,8 +1,8 @@
 { config, pkgs, ... }: {
   imports = [
     ../../../home/modules/desktop/hyprland/modules/config-builder.nix
-    ../../../home/modules/shells/dms-shell
-    ../../../home/modules/shells/dms-shell/wm/hyprland
+    ../../../home/modules/shells/dux-shell
+    ../../../home/modules/shells/dux-shell/wm/hyprland
   ];
 
   programs.hyprlandLua = {

+ 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