diff --git a/common/nix/tools.nix b/common/nix/tools.nix index 89e520d..902b1bc 100644 --- a/common/nix/tools.nix +++ b/common/nix/tools.nix @@ -15,6 +15,4 @@ inputs.nix-index-database.nixosModules.nix-index ]; programs.nix-index-database.comma.enable = true; - # programs.nix-index.enableZshIntegration = false; - # programs.nix-index.enableBashIntegration = false; } diff --git a/common/terminal.nix b/common/terminal.nix index 2e58348..72ecf45 100644 --- a/common/terminal.nix +++ b/common/terminal.nix @@ -1,4 +1,5 @@ { + lib, pkgs, inputs, ... @@ -27,6 +28,7 @@ in "gcam" = "git commit -am"; "gcl" = "git clone"; "gcd" = "git clone --depth 1"; + ":q" = "exit"; }; shellAliases = { "l" = "eza -lg --icons=always --colour=always $argv | culr"; @@ -39,9 +41,15 @@ in set -q argv[1]; or set argv fish echo (fish_prompt_pwd_dir_length=100 prompt_pwd): $argv; end + function fish_command_not_found + ${ + lib.getExe inputs.nix-index-database.packages.${pkgs.system}.comma-with-db + } "$argv[1]" "$argv[2..]" + end ${./rice/header.sh} ''; }; + programs.command-not-found.enable = false; programs.zoxide = { enable = true; enableFishIntegration = true; diff --git a/flake.lock b/flake.lock index 1d16dcc..f0320ef 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1754669970, - "narHash": "sha256-8IxFp8E/SgWs+Fl7LxiiWClr8OnGw9S1jGtHuRamKmA=", + "lastModified": 1755274779, + "narHash": "sha256-HmWJrp84DyjdWptzL8wxpbGc1X6DrDfbguLWZJ3U3kI=", "owner": "linyinfeng", "repo": "angrr", - "rev": "21c4235fd8d1d890d7d4b9624390371603905c11", + "rev": "6438d0436c8ad95f9d5ef4a4bfcb39939b602da3", "type": "github" }, "original": { @@ -357,11 +357,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1755025942, - "narHash": "sha256-eKVn1PYxBsVVd6gs1IIuBQhTZmb5UNBgbC9+qBNT9cw=", + "lastModified": 1755523503, + "narHash": "sha256-BWjVjMSb+cVUf5o5R83+WMoeNfrHN8w+UKMhqic5/Ys=", "owner": "helix-editor", "repo": "helix", - "rev": "001efa801e28cd19147d9369890133c2d631842a", + "rev": "9f34f8b5ff63af86f0fb9eac2c9b092cd479e1c3", "type": "github" }, "original": { @@ -444,11 +444,11 @@ ] }, "locked": { - "lastModified": 1754974548, - "narHash": "sha256-XMjUjKD/QRPcqUnmSDczSYdw46SilnG0+wkho654DFM=", + "lastModified": 1755538029, + "narHash": "sha256-XVsragfuN8A/tMiPToejH7RofH15toeIGhlXraX+yBo=", "owner": "nix-community", "repo": "home-manager", - "rev": "27a26be51ff0162a8f67660239f9407dba68d7c5", + "rev": "bf450a0844e80e6aa22652d3f3728f20cd974527", "type": "github" }, "original": { @@ -465,11 +465,11 @@ ] }, "locked": { - "lastModified": 1754886238, - "narHash": "sha256-LTQomWOwG70lZR+78ZYSZ9sYELWNq3HJ7/tdHzfif/s=", + "lastModified": 1755491080, + "narHash": "sha256-ib1Xi13NEalrFqQAHceRsb+6aIPANFuQq80SS/bY10M=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d492b89d1993579e63b9dbdaed17fd7824834da", + "rev": "f8af2cbe386f9b96dd9efa57ab15a09377f38f4d", "type": "github" }, "original": { @@ -506,11 +506,11 @@ ] }, "locked": { - "lastModified": 1754639028, - "narHash": "sha256-w1+XzPBAZPbeGLMAgAlOjIquswo6Q42PMep9KSrRzOA=", + "lastModified": 1755151620, + "narHash": "sha256-fVMalQZ+tRXR8oue2SdWu4CdlsS2NII+++rI40XQ8rU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "d49809278138d17be77ab0ef5506b26dc477fa62", + "rev": "16e12d22754d97064867006acae6e16da7a142a6", "type": "github" }, "original": { @@ -538,11 +538,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1755000875, - "narHash": "sha256-bCyz75cXV4ZBGgGCouppIt9P3ZxA752eTMpewwijVdg=", - "rev": "4a119e6e46f275c3bb7868c6c688ebb75af62b3b", + "lastModified": 1755522522, + "narHash": "sha256-OiIIM+cvFWCyAn7sFqZQJK1/94EQ522ktlnzakZqM+M=", + "rev": "1f47ecef4ef5f67b34653b9c61d6d99b2720eb44", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/4a119e6e46f275c3bb7868c6c688ebb75af62b3b.tar.gz?rev=4a119e6e46f275c3bb7868c6c688ebb75af62b3b" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1f47ecef4ef5f67b34653b9c61d6d99b2720eb44.tar.gz?rev=1f47ecef4ef5f67b34653b9c61d6d99b2720eb44" }, "original": { "type": "tarball", @@ -682,11 +682,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1755008894, - "narHash": "sha256-QDlUT5Bvq9YXZI3YLtOGIbEJo/bEbtRJmyPsoC6UXFg=", + "lastModified": 1755424351, + "narHash": "sha256-xcorYLNdtLpb0wH5CPlUcpmYQUxeK95j1X855xQw+DY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "5196ae4f1ffece7433e0c441f396ccc045919aa3", + "rev": "9aa137af01f05386e5bb5050e983750017007a66", "type": "github" }, "original": { @@ -776,11 +776,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1754894368, - "narHash": "sha256-I7uSAOosX79BLVTWRHWHvT9z3Lv8rDYY3RogV/0Gne0=", + "lastModified": 1755419373, + "narHash": "sha256-EFH3zbpyLYjEboNV2Lmkxf9joEuFCmeYX+MMLRPStpg=", "owner": "YaLTeR", "repo": "niri", - "rev": "0044578681cee50fd7ad49fcb8d1e2ea53d85fe4", + "rev": "a6febb86aa5af0df7bf2792ca027ef95a503d599", "type": "github" }, "original": { @@ -833,11 +833,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1754800038, - "narHash": "sha256-UbLO8/0pVBXLJuyRizYOJigtzQAj8Z2bTnbKSec/wN0=", + "lastModified": 1755404379, + "narHash": "sha256-Q6ZxZDBmD/B988Jjbx7/NchxOKIpOKBBrx9Yb0zMzpQ=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "b65f8d80656f9fcbd1fecc4b7f0730f468333142", + "rev": "ebbc1c05f786ae39bb5e04e57bf2c10c44a649e3", "type": "github" }, "original": { @@ -901,11 +901,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754498491, - "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -977,11 +977,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1754937576, - "narHash": "sha256-3sWA5WJybUE16kIMZ3+uxcxKZY/JRR4DFBqLdSLBo7w=", + "lastModified": 1755274400, + "narHash": "sha256-rTInmnp/xYrfcMZyFMH3kc8oko5zYfxsowaLv1LVobY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ddae11e58c0c345bf66efbddbf2192ed0e58f896", + "rev": "ad7196ae55c295f53a7d1ec39e4a06d922f3b899", "type": "github" }, "original": { @@ -1073,11 +1073,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -1120,11 +1120,11 @@ }, "nixpkgs_16": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -1136,11 +1136,11 @@ }, "nixpkgs_17": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -1280,11 +1280,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -1303,11 +1303,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1754907869, - "narHash": "sha256-tzshAAjt0xDjCc/aOgii6PSqePIc2rWYSXF8VnqEhIg=", + "lastModified": 1755545956, + "narHash": "sha256-/dqfdlsu8jonCbwWTlYXC4vVU4/71Yvz/NZMu1NMwos=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "b5f83e0d7bce67af178f6aaef95853fedf4c00a0", + "rev": "f14fadaa130cc0e222271acde3dddc3596b97c69", "type": "github" }, "original": { @@ -1454,11 +1454,11 @@ ] }, "locked": { - "lastModified": 1754880555, - "narHash": "sha256-tG6l0wiX8V8IvG4HFYY8IYN5vpNAxQ+UWunjjpE6SqU=", + "lastModified": 1755485198, + "narHash": "sha256-C3042ST2lUg0nh734gmuP4lRRIBitA6Maegg2/jYRM4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "17c591a44e4eb77f05f27cd37e1cfc3f219c7fc4", + "rev": "aa45e63d431b28802ca4490cfc796b9e31731df7", "type": "github" }, "original": { @@ -1612,11 +1612,11 @@ ] }, "locked": { - "lastModified": 1754492133, - "narHash": "sha256-B+3g9+76KlGe34Yk9za8AF3RL+lnbHXkLiVHLjYVOAc=", + "lastModified": 1754847726, + "narHash": "sha256-2vX8QjO5lRsDbNYvN9hVHXLU6oMl+V/PsmIiJREG4rE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1298185c05a56bff66383a20be0b41a307f52228", + "rev": "7d81f6fb2e19bf84f1c65135d1060d829fae2408", "type": "github" }, "original": { @@ -1702,11 +1702,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1754533920, - "narHash": "sha256-fCZ68Yud1sUCq6UNXj0SDyiBgVA8gJUE+14ZFGsFJG8=", + "lastModified": 1755219541, + "narHash": "sha256-yKV6xHaPbEbh5RPxAJnb9yTs1wypr7do86hFFGQm1w8=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "e0d1dad25a158551ab58547b2ece4b7d5a19929c", + "rev": "5a184d435927c3423f0ad189ea2b490578450fb7", "type": "github" }, "original": { diff --git a/graphical/browser.nix b/graphical/browser.nix index 0a7b520..8bb6da4 100644 --- a/graphical/browser.nix +++ b/graphical/browser.nix @@ -30,6 +30,7 @@ "hfjbmagddngcpeloejdejnfgbamkjaeg" # vimium c "bkmmlbllpjdpgcgdohbaghfaecnddhni" # webrtc protect "nngceckbapebfimnlniiiahkandclblb" # bitwarden + "dhdgffkkebhmkfjojejmpbldmpobfkfo" ]; }; } diff --git a/graphical/desktop/niri-config.kdl b/graphical/desktop/niri-config.kdl index 8b830ca..80d8d16 100755 --- a/graphical/desktop/niri-config.kdl +++ b/graphical/desktop/niri-config.kdl @@ -66,18 +66,18 @@ binds { Mod+Ctrl+4 { spawn "tagctl" "exclusive-tag" "4"; } Mod+Ctrl+5 { spawn "tagctl" "exclusive-tag" "5"; } Mod+Ctrl+6 { spawn "tagctl" "exclusive-tag" "6"; } - Mod+Ctrl+H { consume-or-expel-window-left; } + Mod+Ctrl+H { move-column-left-or-to-monitor-left; } Mod+Ctrl+J { move-window-down; } Mod+Ctrl+K { move-window-up; } - Mod+Ctrl+L { consume-or-expel-window-right; } + Mod+Ctrl+L { move-column-right-or-to-monitor-right; } Mod+D { spawn "qs" "ipc" "call" "launch" "toggle"; } Mod+E { spawn "nautilus"; } Mod+Equal { spawn "bitwarden"; } Mod+F { spawn "chromium"; } - Mod+H { focus-column-or-monitor-left; } + Mod+H { focus-column-left; } Mod+J { focus-window-down; } Mod+K { focus-window-up; } - Mod+L { focus-column-or-monitor-right; } + Mod+L { focus-column-right; } Mod+R { switch-preset-column-width; } Mod+Return { spawn "foot"; } Mod+Shift+1 { spawn "tagctl" "toggle" "1"; } @@ -87,8 +87,8 @@ binds { Mod+Shift+5 { spawn "tagctl" "toggle" "5"; } Mod+Shift+6 { spawn "tagctl" "toggle" "6"; } Mod+Shift+E { spawn "qs" "ipc" "call" "logout" "toggle"; } - Mod+Shift+H { move-column-left-or-to-monitor-left; } - Mod+Shift+L { move-column-right-or-to-monitor-right; } + Mod+Shift+H { consume-or-expel-window-left; } + Mod+Shift+L { consume-or-expel-window-right; } Mod+Shift+Q { close-window; } Mod+Shift+R { maximize-column; } Mod+Shift+S { screenshot; } diff --git a/graphical/desktop/quickshell/assets/pathway-m-rework.png b/graphical/desktop/quickshell/assets/pathway-m-rework.png new file mode 100644 index 0000000..a72e587 Binary files /dev/null and b/graphical/desktop/quickshell/assets/pathway-m-rework.png differ diff --git a/graphical/desktop/quickshell/launcher/Launcher.qml b/graphical/desktop/quickshell/launcher/Launcher.qml index 8a90179..aa4b047 100644 --- a/graphical/desktop/quickshell/launcher/Launcher.qml +++ b/graphical/desktop/quickshell/launcher/Launcher.qml @@ -14,7 +14,7 @@ Singleton { Timer { id: closeTimer - interval: 400 + interval: 600 running: false repeat: false onTriggered: launcherData.active = false @@ -36,8 +36,8 @@ Singleton { } Behavior on curWidth { NumberAnimation { - duration: 400 - easing.type: Easing.InOutQuad + duration: 600 + easing.type: Easing.InOutExpo } } } diff --git a/graphical/desktop/quickshell/logout/Logout.qml b/graphical/desktop/quickshell/logout/Logout.qml index c2d8283..3de1223 100644 --- a/graphical/desktop/quickshell/logout/Logout.qml +++ b/graphical/desktop/quickshell/logout/Logout.qml @@ -64,7 +64,7 @@ Singleton { Behavior on openness { NumberAnimation { duration: topLevel.openTime - easing.type: Easing.InOutQuad + easing.type: Easing.InOutExpo } } } @@ -103,6 +103,11 @@ Singleton { keyboardFocus: WlrKeyboardFocus.Exclusive focusable: true exclusionMode: ExclusionMode.Ignore + Item { + Keys.onPressed: event => { + console.log(event); + } + } Rectangle { id: gridParent @@ -117,13 +122,23 @@ Singleton { } property var dims: { "h": (parent.width - margins.h) / 8, - "v": (parent.height - margins.v) / 8 + "v": (parent.height - margins.v) / 12 } anchors { fill: parent - leftMargin: 128 - topLevel.width * (1.0 - logoutData.openness) - rightMargin: 128 + topLevel.width * (1.0 - logoutData.openness) - margins: 128 + margins: parent.width / 2.5 + topMargin: (parent.height / 8) + topLevel.height * (1.0 - logoutData.openness) + bottomMargin: (parent.height / 8) - topLevel.height * (1.0 - logoutData.openness) + } + topLeftRadius: 0 + bottomRightRadius: 0 + topRightRadius: 10 + bottomLeftRadius: 10 + Keys.onPressed: event => { + console.log(event); + if (event.key == Qt.Key_Escape) { + logoutData.open = false; + } } Column { spacing: gridParent.margins.v @@ -134,6 +149,7 @@ Singleton { anchors { fill: parent alignWhenCentered: true + verticalCenter: parent.verticalCenter // topMargin: gridParent.margins.v // bottomMargin: gridParent.margins.v } @@ -143,6 +159,7 @@ Singleton { id: button required property int index + anchors.horizontalCenter: parent.horizontalCenter Process { id: thisProcess running: false diff --git a/graphical/desktop/quickshell/shell.qml b/graphical/desktop/quickshell/shell.qml index aac9f74..ef7f7b9 100644 --- a/graphical/desktop/quickshell/shell.qml +++ b/graphical/desktop/quickshell/shell.qml @@ -31,7 +31,7 @@ ShellRoot { asynchronous: true width: 2560 height: 1440 - source: "assets/pathway-m.png" + source: "assets/pathway-m-rework.png" } } }