diff --git a/flake.lock b/flake.lock index 0df7acb..309b708 100644 --- a/flake.lock +++ b/flake.lock @@ -198,11 +198,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1757332942, - "narHash": "sha256-tew9nur/P2qC08OgvaMMLdIq+rD539C+GloCQYwi26o=", + "lastModified": 1757505806, + "narHash": "sha256-n9/XRT0g6ucBpq2r1NUGDVwI6CTqg45sdljjAJdvWwc=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "dc4ba8b14671326b3cad2652d8028d3379b675bb", + "rev": "0e34b767650b5b71a9c2b2caf4270f50a66a9305", "type": "github" }, "original": { @@ -324,11 +324,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1757348015, - "narHash": "sha256-RWbRrMPViSfq0kZRHf0YYOGlQn5s9glQHnV237kXZvk=", + "lastModified": 1757518818, + "narHash": "sha256-SVUEEN1DgdFX2DwFD0ghnqKzFWXRLxGeHSltWCczNl8=", "owner": "KyleKrein", "repo": "DesktopShell", - "rev": "079faa0d4058845f45933359a9a99f9e6c032f91", + "rev": "4ae157af354c3be77213cdca17be87b121dc9002", "type": "github" }, "original": { @@ -399,11 +399,11 @@ ] }, "locked": { - "lastModified": 1757252286, - "narHash": "sha256-QwWQzlxAGvIi6VAc8DQ6ONCKKwtPyaHQW1cQyGbP7Og=", + "lastModified": 1757362540, + "narHash": "sha256-SrQO2Ir3E0+NcFLhlHm++9nmTVgzTkhQrgUFFEU12D4=", "owner": "AvengeMedia", "repo": "dgop", - "rev": "a65a02ddf8bade9c109d055e644e4bd851183bd5", + "rev": "bc5ca7c43d0bec18e771a761e3cc8f53bdd12202", "type": "github" }, "original": { @@ -419,11 +419,11 @@ ] }, "locked": { - "lastModified": 1757255839, - "narHash": "sha256-XH33B1X888Xc/xEXhF1RPq/kzKElM0D5C9N6YdvOvIc=", + "lastModified": 1757508292, + "narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=", "owner": "nix-community", "repo": "disko", - "rev": "c8a0e78d86b12ea67be6ed0f7cae7f9bfabae75a", + "rev": "146f45bee02b8bd88812cfce6ffc0f933788875a", "type": "github" }, "original": { @@ -440,11 +440,11 @@ ] }, "locked": { - "lastModified": 1757112511, - "narHash": "sha256-WE1cUTr53VJG06YAkpYG+HvdXp4fFyqZwXqsABOXYFY=", + "lastModified": 1757296630, + "narHash": "sha256-3H236F5oIKkqpfnwrvZQs4Y5imKb6JCMFGDkHs8VDjQ=", "owner": "AvengeMedia", "repo": "danklinux", - "rev": "563c7fdcba0e8c6ac0f4b3292308e8bcbb553da6", + "rev": "dac591711ab30d6b071a5cec674a3d2e04665ee1", "type": "github" }, "original": { @@ -1150,11 +1150,11 @@ ] }, "locked": { - "lastModified": 1757075491, - "narHash": "sha256-a+NMGl5tcvm+hyfSG2DlVPa8nZLpsumuRj1FfcKb2mQ=", + "lastModified": 1757503661, + "narHash": "sha256-bBh9sAJn0x/EdCVA6NYj/hXpcW1YBLCRMgn8A2T1l2E=", "owner": "nix-community", "repo": "home-manager", - "rev": "f56bf065f9abedc7bc15e1f2454aa5c8edabaacf", + "rev": "3c97248d6f896232355735e34bb518ae9f130c5d", "type": "github" }, "original": { @@ -1208,11 +1208,11 @@ ] }, "locked": { - "lastModified": 1757052778, - "narHash": "sha256-rYszJwY0EArAqK6q0i5bB1zxNCNRk6gVmD9SIvnoXW8=", + "lastModified": 1757230583, + "narHash": "sha256-4uqu7sFPOaVTCogsxaGMgbzZ2vK40GVGMfUmrvK3/LY=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "ceaa413a68f28bbf6731464594fdb2c3513e9110", + "rev": "fc3960e6c32c9d4f95fff2ef84444284d24d3bea", "type": "github" }, "original": { @@ -1262,11 +1262,11 @@ }, "master": { "locked": { - "lastModified": 1757349789, - "narHash": "sha256-h9BR3rqFGerZe9uXrpWW3NyUbZrrdQ+4SMlMfigLsxQ=", + "lastModified": 1757522364, + "narHash": "sha256-Ga85VHURR8KgEJy7LoTASbNgO4wiHWuRi/9Z7iZ1/8s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3a9b6e9f7715204e60c9a223a081c0706c529d64", + "rev": "a171749d4d6d4b27a9e192ae6bb791b7843d1b4c", "type": "github" }, "original": { @@ -1350,11 +1350,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1757324011, - "narHash": "sha256-iGAWGz2uG8GsGw9114FZnTcaAn0uiLXDPmYzzuM69w8=", + "lastModified": 1757437545, + "narHash": "sha256-7ssbrFnmSrqtCtOySiu5ncyOBxPrR6p2nhNHrg6D+fo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a0ec3abc11e90afa47150dd2d3607920a63c056c", + "rev": "ef694b996daeeb8684c0adfaa9b7067a6e709054", "type": "github" }, "original": { @@ -1383,11 +1383,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1757242823, - "narHash": "sha256-EqZPBr+fPs7uoFCDLxRa8kRcrUgn0kZTVTky/7I81aI=", + "lastModified": 1757358784, + "narHash": "sha256-UNeUJW3c10z0aMJ87QKS85C/JgK9ng6pdRS0EwY6OLg=", "owner": "YaLTeR", "repo": "niri", - "rev": "22f629c24b9f81a2fcaaf3a79d75128484c6ed78", + "rev": "bdee1a657699a77bc4cdb050f7355f37f64c45a6", "type": "github" }, "original": { @@ -1444,11 +1444,11 @@ ] }, "locked": { - "lastModified": 1757130842, - "narHash": "sha256-4i7KKuXesSZGUv0cLPLfxbmF1S72Gf/3aSypgvVkwuA=", + "lastModified": 1757430124, + "narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "15f067638e2887c58c4b6ba1bdb65a0b61dc58c5", + "rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196", "type": "github" }, "original": { @@ -1521,11 +1521,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1757296410, - "narHash": "sha256-vXYNuMUggreF8lrupnQRzEQg+NXxE6++/KMp2iLom+8=", + "lastModified": 1757382624, + "narHash": "sha256-4oYKTUl4B53W8EJ8EOc6F205TCFKCfzAXkS2f8pfZkc=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "615148794c092768c39017bffae1eec410515870", + "rev": "cae14b9ee74180bda2c1f312958fe710b4267fce", "type": "github" }, "original": { @@ -1658,11 +1658,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1757331535, - "narHash": "sha256-YYw87rHNMkp6NxT0hThxY5E6zXsQpDtCyWqUNViAmVQ=", + "lastModified": 1757427959, + "narHash": "sha256-p0i07rLfAMzJWYfsjFOXEtIWeS1EGVxJaCi9gfyCwRE=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "dedb70d7fa9f06d9bac5e75481af4685415de49c", + "rev": "785f1b67b6c53de088f640f2a7da50ca4b2d7161", "type": "github" }, "original": { @@ -1765,11 +1765,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1757244434, - "narHash": "sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM=", + "lastModified": 1757408970, + "narHash": "sha256-aSgK4BLNFFGvDTNKPeB28lVXYqVn8RdyXDNAvgGq+k0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "092c565d333be1e17b4779ac22104338941d913f", + "rev": "d179d77c139e0a3f5c416477f7747e9d6b7ec315", "type": "github" }, "original": { @@ -1797,11 +1797,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1757347588, + "narHash": "sha256-tLdkkC6XnsY9EOZW9TlpesTclELy8W7lL2ClL+nma8o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "b599843bad24621dcaa5ab60dac98f9b0eb1cabe", "type": "github" }, "original": { @@ -1845,11 +1845,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1757244434, - "narHash": "sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM=", + "lastModified": 1757408970, + "narHash": "sha256-aSgK4BLNFFGvDTNKPeB28lVXYqVn8RdyXDNAvgGq+k0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "092c565d333be1e17b4779ac22104338941d913f", + "rev": "d179d77c139e0a3f5c416477f7747e9d6b7ec315", "type": "github" }, "original": { @@ -1861,11 +1861,11 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 1744868846, - "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", + "lastModified": 1757034884, + "narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "rev": "ca77296380960cd497a765102eeb1356eb80fed0", "type": "github" }, "original": { @@ -1893,11 +1893,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1757238739, - "narHash": "sha256-ovEq9v+Xc+oQH1zvQo28rT/YVqMQK2TRgUcNanvo2Zk=", + "lastModified": 1757420003, + "narHash": "sha256-SPaZFFDt7CzE+BdNyh3HGfUKmttle/yN+ELIl6ZhEeE=", "owner": "PedroHLC", "repo": "nixpkgs", - "rev": "6d8fca2c92488ff860524dd3400aa90a3310123e", + "rev": "b4fc8b5dcc7c1a4dab87d6dc35048cb188e49289", "type": "github" }, "original": { @@ -1973,16 +1973,16 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", + "lastModified": 1757034884, + "narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "rev": "ca77296380960cd497a765102eeb1356eb80fed0", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -4272,11 +4272,11 @@ ] }, "locked": { - "lastModified": 1753595452, - "narHash": "sha256-vqkSDvh7hWhPvNjMjEDV4KbSCv2jyl2Arh73ZXe274k=", + "lastModified": 1756981260, + "narHash": "sha256-GhuD9QVimjynHI0OOyZsqJsnlXr2orowh9H+HYz4YMs=", "ref": "refs/heads/master", - "rev": "a5431dd02dc23d9ef1680e67777fed00fe5f7cda", - "revCount": 665, + "rev": "6eb12551baf924f8fdecdd04113863a754259c34", + "revCount": 672, "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell" }, @@ -4381,11 +4381,11 @@ ] }, "locked": { - "lastModified": 1757125853, - "narHash": "sha256-noKkYHKpT5lpvNSYrlH56d8cedthZfs010Uv6vTqLT4=", + "lastModified": 1757471515, + "narHash": "sha256-0+rSzNsYindDWjO9VVULKGjXlPsQV6IDjRU5G3SwI9U=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8b70793a6be183536a5d562056dac10b7b36820d", + "rev": "aecf31120156fe47a7d1992aa814052910178fca", "type": "github" }, "original": { @@ -4550,11 +4550,11 @@ "nixpkgs": "nixpkgs_15" }, "locked": { - "lastModified": 1754988908, - "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", + "lastModified": 1757503115, + "narHash": "sha256-S9F6bHUBh+CFEUalv/qxNImRapCxvSnOzWBUZgK1zDU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", + "rev": "0bf793823386187dff101ee2a9d4ed26de8bbf8c", "type": "github" }, "original": { @@ -4582,11 +4582,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1757174190, - "narHash": "sha256-eEU7Ku2Dtf6EXXbV1lAGFV8dd3Vlr4h2Mm3HQ+vtAow=", + "lastModified": 1757361712, + "narHash": "sha256-GwObJtrAqVim66e4Jb5VzAKT6zGFJ3KOi63rfcrfMV4=", "owner": "danth", "repo": "stylix", - "rev": "e50ae02496b48e3687ad50a38dc0b6e833a075d2", + "rev": "3bf1430ed85a4484e4e1facee2344d2bb20288e6", "type": "github" }, "original": { @@ -4827,11 +4827,11 @@ }, "unstable": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1757347588, + "narHash": "sha256-tLdkkC6XnsY9EOZW9TlpesTclELy8W7lL2ClL+nma8o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "b599843bad24621dcaa5ab60dac98f9b0eb1cabe", "type": "github" }, "original": { diff --git a/homes/x86_64-linux/andrej/hyprland.nix b/homes/x86_64-linux/andrej/hyprland.nix index 8b5a789..67e0294 100644 --- a/homes/x86_64-linux/andrej/hyprland.nix +++ b/homes/x86_64-linux/andrej/hyprland.nix @@ -27,6 +27,7 @@ hyprshot jq kdePackages.gwenview + kdePackages.ark ]; home.sessionVariables = { GTK_THEME = "Colloid"; diff --git a/homes/x86_64-linux/kylekrein/niri/desktopShell.nix b/homes/x86_64-linux/kylekrein/niri/desktopShell.nix index 23da81c..a4b5fa7 100644 --- a/homes/x86_64-linux/kylekrein/niri/desktopShell.nix +++ b/homes/x86_64-linux/kylekrein/niri/desktopShell.nix @@ -29,11 +29,6 @@ in gammastep # night mode colloid-gtk-theme ]; - programs.niri.settings.environment = { - GTK_THEME = "Colloid"; - }; - qt.enable = true; - qt.style.name = "gtk3"; programs.kitty = { themeFile = lib.mkForce null; extraConfig = '' @@ -59,10 +54,23 @@ in }; }; + systemd.user.services.desktop-shell = { + Unit = { + Description = "Launches (and relaunches) Desktop Shell"; + }; + Install = { + WantedBy = ["graphical-session.target"]; + }; + Service = { + ExecStart = ''${lib.getExe pkgs.bash} -c "qs -c DankMaterialShell"''; + Restart = "always"; + RestartSec = 5; + }; + }; + programs.niri = { settings = { spawn-at-startup = [ - {command = ["qs" "-c" "DankMaterialShell"];} {command = ["wl-paste" "--watch" "cliphist" "store"];} ]; }; diff --git a/homes/x86_64-linux/kylekrein/niri/niri.nix b/homes/x86_64-linux/kylekrein/niri/niri.nix index 6382aaf..98a0436 100644 --- a/homes/x86_64-linux/kylekrein/niri/niri.nix +++ b/homes/x86_64-linux/kylekrein/niri/niri.nix @@ -67,7 +67,6 @@ in "Mod+Shift+C".action = sh "nautilus"; "Mod+C".action = emacs ''(dirvish \"${home}\")''; "Mod+T".action = spawn "kitty"; - "Mod+D".action = spawn "fuzzel"; "Mod+B".action = spawn "librewolf"; "Mod+H".action = show-hotkey-overlay; "Mod+F".action = fullscreen-window; @@ -109,53 +108,77 @@ in "Mod+Shift+Ctrl+Left".action = move-column-to-monitor-left; "Mod+Shift+Ctrl+Right".action = move-column-to-monitor-right; - "Mod+Space".action.spawn = [ - "qs" - "-c" - "DankMaterialShell" - "ipc" - "call" - "spotlight" - "toggle" - ]; - "Mod+V".action.spawn = [ - "qs" - "-c" - "DankMaterialShell" - "ipc" - "call" - "clipboard" - "toggle" - ]; - "Mod+M".action.spawn = [ - "qs" - "-c" - "DankMaterialShell" - "ipc" - "call" - "processlist" - "toggle" - ]; - "Mod+Comma".action.spawn = [ - "qs" - "-c" - "DankMaterialShell" - "ipc" - "call" - "settings" - "toggle" - ]; - "Super+L".action.spawn = [ - "qs" - "-c" - "DankMaterialShell" - "ipc" - "call" - "lock" - "lock" - ]; + "Ctrl+Alt+Delete" = { + hotkey-overlay.title = "Restart Desktop Shell"; + action.spawn = [ + "pkill" + "quickshell" + ]; + }; + + "Mod+Space" = { + hotkey-overlay.title = "App Launcher"; + action.spawn = [ + "qs" + "-c" + "DankMaterialShell" + "ipc" + "call" + "spotlight" + "toggle" + ]; + }; + "Mod+V" = { + hotkey-overlay.title = "Clipboard Manager"; + action.spawn = [ + "qs" + "-c" + "DankMaterialShell" + "ipc" + "call" + "clipboard" + "toggle" + ]; + }; + "Mod+M" = { + hotkey-overlay.title = "System Monitor"; + action.spawn = [ + "qs" + "-c" + "DankMaterialShell" + "ipc" + "call" + "processlist" + "toggle" + ]; + }; + "Mod+Comma" = { + hotkey-overlay.title = "Open Settings"; + action.spawn = [ + "qs" + "-c" + "DankMaterialShell" + "ipc" + "call" + "settings" + "toggle" + ]; + }; + "Super+L" = { + hotkey-overlay.title = "Lock"; + action.spawn = [ + "qs" + "-c" + "DankMaterialShell" + "ipc" + "call" + "lock" + "lock" + ]; + }; "XF86AudioRaiseVolume" = { allow-when-locked = true; + hotkey-overlay.hidden = true; action.spawn = [ "qs" "-c" @@ -169,6 +192,7 @@ in }; "XF86AudioLowerVolume" = { allow-when-locked = true; + hotkey-overlay.hidden = true; action.spawn = [ "qs" "-c" @@ -182,6 +206,7 @@ in }; "XF86AudioMute" = { allow-when-locked = true; + hotkey-overlay.hidden = true; action.spawn = [ "qs" "-c" @@ -194,6 +219,7 @@ in }; "XF86AudioMicMute" = { allow-when-locked = true; + hotkey-overlay.hidden = true; action.spawn = [ "qs" "-c" @@ -207,6 +233,7 @@ in "XF86MonBrightnessUp" = { allow-when-locked = true; + hotkey-overlay.hidden = true; action.spawn = [ "qs" "-c" @@ -221,6 +248,7 @@ in }; "XF86MonBrightnessDown" = { allow-when-locked = true; + hotkey-overlay.hidden = true; action.spawn = [ "qs" "-c" @@ -236,18 +264,22 @@ in "XF86AudioNext" = { allow-when-locked = true; + hotkey-overlay.hidden = true; action = sh "playerctl next"; }; "XF86AudioPause" = { allow-when-locked = true; + hotkey-overlay.hidden = true; action = sh "playerctl play-pause"; }; "XF86AudioPlay" = { allow-when-locked = true; + hotkey-overlay.hidden = true; action = sh "playerctl play-pause"; }; "XF86AudioPrev" = { allow-when-locked = true; + hotkey-overlay.hidden = true; action = sh "playerctl previous"; }; #"Mod+Tab".action = focus-window-down-or-column-right; diff --git a/packages/lisgd-kylekrein/lisgd-config.h b/packages/lisgd-kylekrein/lisgd-config.h index 40b1a47..de68225 100644 --- a/packages/lisgd-kylekrein/lisgd-config.h +++ b/packages/lisgd-kylekrein/lisgd-config.h @@ -20,7 +20,7 @@ double edgesizeleft = 50.0; double edgesizetop = 50.0; double edgesizeright = 50.0; double edgesizebottom = 50.0; -double edgessizecaling = 1.0; +double edgessizecaling = 2.0; char *device = "/dev/touchscreen"; // Gestures can also be specified interactively from the command line using -g @@ -49,6 +49,8 @@ Gesture gestures[] = { "niri msg action close-window"}, {2, SwipeDU, EdgeBottom, DistanceAny, ActModeReleased, "pkill -34 -f wvkbd"}, + {3, SwipeUD, EdgeTop, DistanceLong, ActModeReleased, + "pkill quickshell"}, //{2, SwipeUD, EdgeBottom, DistanceAny, ActModeReleased, //"pkill -9 -f wvkbd-mobintl"}, {3, SwipeDU, EdgeAny, DistanceAny, ActModeReleased,