Johan Rong 1 tydzień temu
rodzic
commit
248a498bea

+ 3 - 3
flake.lock

@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1792609211,
-        "narHash": "sha256-ZHbhVOg0p2PpxrynYaEFafGgnuR43e4DXEIEusw3b/Q=",
+        "lastModified": 1792524306,
+        "narHash": "sha256-b9S8kVbAWgynkuYcKLAittwfUr26jaE3VDlvkhqva1o=",
         "owner": "AvengeMedia",
         "repo": "dank-greeter",
-        "rev": "d85f83edd799bcf58841bbd2b536e04058918319",
+        "rev": "39d3c17ba4349e6ac3af041805132807cd60a056",
         "type": "github"
       },
       "original": {

+ 1 - 1
flake.nix

@@ -25,7 +25,7 @@
     };
     something-x = {
       url = "github:SoaOaoS/something-x";
-      inputs.nixpkgs.follows = "nixpkgs";   # optional but recommended
+      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 

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

@@ -1,4 +1,4 @@
 hl.on("hyprland.start", function ()
   hl.exec_cmd("dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP")
-  hl.exec_cmd("something-x")
+  hl.exec_cmd("something-x --background")
 end)

+ 267 - 134
home/modules/shells/dms-shell/settings.nix

@@ -12,257 +12,390 @@ in
       registryThemeVariants = {
         deepmono = {
           dark = {
-            flavor = "mono";
             accent = "fog";
+            flavor = "mono";
           };
         };
       };
-      cornerRadius = 12;
+      radiusStrength = 38;
       clockFormat = "24h";
+      greeterEnableFprint = true;
+      greeterEnableU2f = true;
+      weatherEnabled = false;
+      fontFamily = "Adwaita Sans";
+      monoFontFamily = "Adwaita Mono";
+      powerMenuActions = [
+        "reboot"
+        "logout"
+        "poweroff"
+        "lock"
+        "suspend"
+        "restart"
+        "hibernate"
+      ];
+      powerMenuDefaultAction = "poweroff";
+      dockConfigs = [
+        {
+          id = "dock";
+          name = "Dock";
+          enabled = false;
+          screenPreferences = [
+            "all"
+          ];
+          showOnLastDisplay = false;
+          position = 0;
+          mode = "compact";
+          taskbarAlign = "center";
+          widgetExpansion = "popout";
+          iconSize = 40;
+          spacing = 4;
+          itemSpacing = 4;
+          margin = 0;
+          bottomGap = 0;
+          transparency = 1;
+          followInterfaceStyle = true;
+          autoHide = false;
+          smartAutoHide = false;
+          useOverlayLayer = false;
+          editOnRightClick = false;
+          showOnFullscreen = false;
+          openOnOverview = false;
+          groupByApp = false;
+          separatePinnedAndRunningApps = false;
+          restoreSpecialWorkspaceOnClick = false;
+          isolateDisplays = false;
+          indicatorStyle = "circle";
+          borderEnabled = false;
+          borderColor = "surfaceText";
+          borderOpacity = 1;
+          borderThickness = 1;
+          launcherEnabled = false;
+          launcherLogoMode = "apps";
+          launcherLogoCustomPath = "";
+          launcherLogoColorOverride = "";
+          launcherLogoSizeOffset = 0;
+          launcherLogoBrightness = 0.5;
+          launcherLogoContrast = 1;
+          maxVisibleApps = 0;
+          maxVisibleRunningApps = 0;
+          showOverflowBadge = true;
+          showTrash = false;
+          trashFileManager = "default";
+          trashCustomCommand = "";
+          magnification = false;
+          magnificationScale = 130;
+          magnificationProfile = "parabolic";
+          magnificationExpand = false;
+          order = [];
+          widgets = [
+            {
+              id = "dock_launcher";
+              widgetId = "dockLauncher";
+              enabled = true;
+            }
+            {
+              id = "dock_apps";
+              widgetId = "appsDock";
+              enabled = true;
+            }
+            {
+              id = "dock_trash";
+              widgetId = "dockTrash";
+              enabled = true;
+            }
+          ];
+        }
+      ];
+      matugenSpec = "2021";
+      dmsWindowsFloatingSeeded = [
+        "hyprland"
+      ];
       syncComponentAnimationSpeeds = false;
       barElevationEnabled = false;
-      showWeather = false;
-      controlCenterShowMicPercent = true;
       controlCenterWidgets = [
         {
-          id = "volumeSlider";
+          id = "user";
           enabled = true;
-          width = 50;
+          w = 5;
+          h = 1;
+          col = 0;
+          row = 0;
         }
         {
-          id = "brightnessSlider";
+          id = "settings";
           enabled = true;
-          width = 50;
+          w = 1;
+          h = 1;
+          small = true;
+          col = 5;
+          row = 0;
         }
         {
-          id = "wifi";
+          id = "lock";
           enabled = true;
-          width = 50;
+          w = 1;
+          h = 1;
+          small = true;
+          col = 6;
+          row = 0;
         }
         {
-          id = "bluetooth";
+          id = "power";
           enabled = true;
-          width = 50;
+          w = 1;
+          h = 1;
+          small = true;
+          col = 7;
+          row = 0;
         }
         {
-          id = "audioOutput";
           enabled = true;
-          width = 50;
+          id = "volumeSlider";
+          w = 4;
+          h = 1;
+          col = 0;
+          row = 1;
         }
         {
-          id = "audioInput";
           enabled = true;
-          width = 50;
+          id = "brightnessSlider";
+          w = 4;
+          h = 1;
+          col = 4;
+          row = 1;
         }
         {
-          id = "nightMode";
           enabled = true;
-          width = 50;
+          id = "wifi";
+          w = 4;
+          h = 1;
+          col = 0;
+          row = 2;
+        }
+        {
+          enabled = true;
+          id = "bluetooth";
+          w = 4;
+          h = 1;
+          col = 4;
+          row = 2;
         }
         {
+          enabled = true;
+          id = "audioOutput";
+          w = 4;
+          h = 1;
+          col = 0;
+          row = 3;
+        }
+        {
+          enabled = true;
+          id = "audioInput";
+          w = 4;
+          h = 1;
+          col = 4;
+          row = 3;
+        }
+        {
+          enabled = true;
+          id = "nightMode";
+          w = 4;
+          h = 1;
+          col = 0;
+          row = 4;
+        }
+        {
+          enabled = true;
           id = "idleInhibitor";
+          w = 4;
+          h = 1;
+          col = 4;
+          row = 4;
+        }
+        {
+          id = "edit";
+          enabled = true;
+          w = 1;
+          h = 1;
+          small = true;
+          col = 0;
+          row = 5;
+        }
+        {
+          id = "runningApps";
+          enabled = true;
+          w = 3;
+          h = 1;
+          small = true;
+          col = 1;
+          row = 5;
+        }
+        {
+          id = "builtin_vpn";
           enabled = true;
-          width = 50;
+          w = 4;
+          h = 1;
+          col = 4;
+          row = 5;
         }
       ];
-      showWorkspaceIndex = true;
-      showWorkspaceApps = true;
       appIdSubstitutions = [];
       clockDateFormat = "dddd, d. MMM";
-      greeterEnableFprint = true;
-      greeterEnableU2f = true;
-      greeterWallpaperPath = "/home/${users.default}/Pictures/shell-imgs/bg.png";
-      weatherEnabled = false;
       networkPreference = "wifi";
       cursorSettings = {
-        theme = "System Default";
-        size = 24;
-        niri = {
-          hideWhenTyping = false;
-          hideAfterInactiveMs = 0;
+        dwl = {
+          cursorHideTimeout = 0;
         };
         hyprland = {
           hideOnKeyPress = false;
           hideOnTouch = false;
           inactiveTimeout = 0;
         };
-        dwl = {
-          cursorHideTimeout = 0;
+        niri = {
+          hideAfterInactiveMs = 0;
+          hideWhenTyping = false;
         };
+        size = 24;
+        theme = "System Default";
       };
-      fontFamily = "Adwaita Sans";
-      monoFontFamily = "Adwaita Mono";
       acMonitorTimeout = 300;
       acLockTimeout = 300;
       acSuspendTimeout = 600;
       lockBeforeSuspend = true;
-      dockPosition = 0;
       enableFprint = true;
       enableU2f = true;
       notificationHistoryEnabled = false;
       notificationHistoryMaxAgeDays = 1;
       osdPowerProfileEnabled = true;
-      powerMenuActions = [
-        "reboot"
-        "logout"
-        "poweroff"
-        "lock"
-        "suspend"
-        "restart"
-        "hibernate"
-      ];
-      powerMenuDefaultAction = "poweroff";
       updaterUseCustomCommand = true;
       updaterCustomCommand = "nix-update";
       screenPreferences = {
-        dock = [];
+        notepad = [];
         notifications = [
           "all"
         ];
         wallpaper = [
           "all"
         ];
-        notepad = [];
       };
       showOnLastDisplay = {
-        dock = false;
         notifications = true;
       };
       barConfigs = [
         {
-          id = "default";
-          name = "Main Bar";
-          enabled = true;
-          position = 1;
-          screenPreferences = [
-            "all"
+          attachToScreenEdge = false;
+          autoHide = false;
+          autoHideDelay = 250;
+          borderColor = "surfaceText";
+          borderEnabled = false;
+          borderOpacity = 1;
+          borderThickness = 1;
+          bottomGap = 0;
+          centerWidgets = [
+            {
+              clockCompactMode = false;
+              enabled = true;
+              id = "clock";
+            }
           ];
-          showOnLastDisplay = true;
+          clickThrough = false;
+          enabled = true;
+          fontScale = 1;
+          gothCornerRadiusOverride = false;
+          gothCornerRadiusValue = 12;
+          gothCornersEnabled = false;
+          iconScale = 1;
+          id = "default";
+          innerPadding = -4;
           leftWidgets = [
-            "workspaceSwitcher"
             {
-              id = "music";
+              id = "workspaceSwitcher";
               enabled = true;
+              showWorkspaceIndex = true;
+              showWorkspaceApps = true;
             }
-          ];
-          centerWidgets = [
             {
-              id = "clock";
               enabled = true;
-              clockCompactMode = false;
+              id = "music";
             }
           ];
+          maximizeDetection = true;
+          maximizeWidgetIcons = false;
+          maximizeWidgetText = false;
+          name = "Main Bar";
+          noBackground = false;
+          openOnOverview = false;
+          popupGapsAuto = true;
+          popupGapsManual = 0;
+          position = 1;
           rightWidgets = [
             {
-              id = "notificationButton";
               enabled = true;
+              id = "notificationButton";
             }
             {
-              id = "systemTray";
               enabled = true;
+              id = "systemTray";
             }
             {
-              id = "usbManager";
               enabled = true;
+              id = "usbManager";
             }
             {
-              id = "battery";
               enabled = true;
+              id = "battery";
             }
             {
-              id = "controlCenterButton";
               enabled = true;
+              id = "controlCenterButton";
               showAudioPercent = false;
+              showBatteryIcon = false;
               showBrightnessIcon = true;
               showBrightnessPercent = false;
               showMicIcon = true;
               showMicPercent = false;
-              showBatteryIcon = false;
               showPrinterIcon = false;
               showScreenSharingIcon = true;
             }
           ];
+          screenPreferences = [
+            "all"
+          ];
+          scrollEnabled = true;
+          scrollXBehavior = "focusWindow";
+          scrollYBehavior = "workspace";
+          shadowColorMode = "text";
+          shadowCustomColor = "#000000";
+          shadowIntensity = 0;
+          shadowOpacity = 60;
+          showOnLastDisplay = true;
+          showOnWindowsOpen = false;
           spacing = 0;
-          innerPadding = -4;
-          bottomGap = 0;
-          transparency = 1;
-          widgetTransparency = 1;
           squareCorners = true;
-          noBackground = false;
-          maximizeWidgetIcons = false;
-          maximizeWidgetText = false;
-          removeWidgetPadding = false;
-          widgetPadding = 8;
-          gothCornersEnabled = false;
-          gothCornerRadiusOverride = false;
-          gothCornerRadiusValue = 12;
-          borderEnabled = false;
-          borderColor = "surfaceText";
-          borderOpacity = 1;
-          borderThickness = 1;
-          widgetOutlineEnabled = false;
+          transparency = 1;
+          visible = true;
           widgetOutlineColor = "primary";
+          widgetOutlineEnabled = false;
           widgetOutlineOpacity = 1;
           widgetOutlineThickness = 1;
-          fontScale = 1;
-          iconScale = 1;
-          autoHide = false;
-          autoHideDelay = 250;
-          showOnWindowsOpen = false;
-          openOnOverview = false;
-          visible = true;
-          popupGapsAuto = true;
-          popupGapsManual = 0;
-          maximizeDetection = true;
-          scrollEnabled = true;
-          scrollXBehavior = "column";
-          scrollYBehavior = "workspace";
-          shadowIntensity = 0;
-          shadowOpacity = 60;
-          shadowColorMode = "text";
-          shadowCustomColor = "#000000";
-          clickThrough = false;
-          attachToScreenEdge = false;
+          widgetPadding = 8;
+          widgetTransparency = 1;
+          followInterfaceStyle = true;
+          widgetFollowInterfaceStyle = true;
         }
       ];
-      desktopClockCustomColor = {
-        r = 1;
-        g = 1;
-        b = 1;
-        a = 1;
-        hsvHue = -1;
-        hsvSaturation = 0;
-        hsvValue = 1;
-        hslHue = -1;
-        hslSaturation = 0;
-        hslLightness = 1;
-        valid = true;
-      };
-      systemMonitorCustomColor = {
-        r = 1;
-        g = 1;
-        b = 1;
-        a = 1;
-        hsvHue = -1;
-        hsvSaturation = 0;
-        hsvValue = 1;
-        hslHue = -1;
-        hslSaturation = 0;
-        hslLightness = 1;
-        valid = true;
-      };
       builtInPluginSettings = {
-        dms_settings_search = {
-          trigger = "?";
+        dms_clipboard_search = {
+          trigger = "cb";
         };
         dms_notepad = {
           enabled = false;
         };
-        dms_clipboard_search = {
-          trigger = "cb";
+        dms_settings_search = {
+          trigger = "?";
         };
       };
-      configVersion = 17;
+      configVersion = 42;
     };
   };
 }