diff --git a/.config/ags/config.js b/.config/ags/config.js index ba06b1c..a66d105 100644 --- a/.config/ags/config.js +++ b/.config/ags/config.js @@ -177,7 +177,7 @@ function Bar(monitor = 0) { App.config({ style: css, windows: [ - Bar(laptop ? 0 : 2), // can be instantiated for each monitor + Bar(laptop ? 0 : 0), // can be instantiated for each monitor NotificationPopups(), (laptop ? BatteryPopup() : null) ], diff --git a/.config/rofi/rofi.rasi b/.config/rofi/rofi.rasi index 74dbaac..5ee821a 100644 --- a/.config/rofi/rofi.rasi +++ b/.config/rofi/rofi.rasi @@ -3,18 +3,32 @@ configuration { - show-icons: true; icon-theme: "Papirus"; terminal: "konsole"; sidebar-mode: true; run-command: "bash -c {cmd}"; run-list-command: "fish -c functions"; - display-drun: " "; - drun-display-format: "{name} [({generic})] - {exec}"; + display-drun: " "; + display-run: " "; + display-window: " "; + display-combi: " "; + drun-display-format: "{name} [({generic})]";/* - {exec}*/ threads: 0; scroll-method: 0; disable-history: false; - font: "VictorMono Nerd Font 14.0"; + kb-accept-entry: "Return"; + kb-remove-to-eol: "Control-D"; + kb-remove-char-back: "BackSpace"; + kb-mode-complete: "Control-M"; + kb-row-down: "Control-j"; + kb-row-up: "Control-k"; + kb-row-left: "Control-h"; + kb-row-right: "Control-l"; + font: "VictorMono Nerd Font 12.0"; + timeout { + delay: 15; + action: "kb-cancel"; + } } * { @@ -22,8 +36,8 @@ configuration { background-color: #00222b33; background-entry: #000000; foreground-selected: #ffffff; - urgent: @base08; - urgent-selected: @base08; + urgent: #E91E63; + urgent-selected: #E91E63; transparent: #00000000; base00: #282a36; base01: #34353e; @@ -46,10 +60,10 @@ configuration { } window { - background-color: @base00t; + background-color: @base00; text-color: @base05; - transparency: "real"; - border-radius: 16px; + /* transparency: "real"; */ + border-radius: 20px; border: 0px; width: 60%; location: center; @@ -62,39 +76,46 @@ window { mainbox { border-radius: 16; - background-color: @transparent; + /* background-color: @transparent; */ + background-color: @base00; text-color: @base05; transparency: "real"; } inputbar { - background-color: @transparent; + /* background-color: @transparent; */ + background-color: @base00; text-color: @base05; expand: false; border-radius: 36px; margin: 0px 0px 0px 0px; - padding: 6px 6px 6px 6px; + padding: 20px 6px 20px 6px; position: north; } prompt { enabled: true; padding: 0px 6px 0px 5px; - background-color: @transparent; + /* background-color: @transparent; */ + background-color: @base00; text-color: @base05; border: 0px; + font: "VictorMono Nerd Font 22.0"; } entry { - background-color: @transparent; + /* background-color: @transparent; */ + background-color: @base00; + color: @base00; placeholder-color: @base05; text-color: @base05; expand: true; horizontal-align: 0; - placeholder: "Search"; + placeholder: ""; blink: true; border: 0px; padding: 0px 0px 0px 6px; + font: "VictorMono Nerd Font 22.0"; } case-indicator { @@ -109,7 +130,8 @@ sidebar { } mainbox { - background-color: @base00t; + /* background-color: @base00t; */ + background-color: @base00; text-color: @transparent; children: [ inputbar, listview, message ]; spacing: 5px; @@ -130,8 +152,9 @@ textbox { } listview { - background-color: @transparent; - columns: 2; + /* background-color: @transparent; */ + background-color: @base00; + columns: 1; spacing: 4px; cycle: false; dynamic: true; @@ -151,6 +174,7 @@ element { } element-icon { + background-color: @transparent; size: 30px; border: 0px; padding: 0px 0px 0px; @@ -190,3 +214,7 @@ element selected.active { background-color: @background-alt; color: @base0A; } + +window { + background-color: @base00; +} diff --git a/flake.lock b/flake.lock index 1480e8a..2d07f90 100644 --- a/flake.lock +++ b/flake.lock @@ -196,11 +196,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1720631485, - "narHash": "sha256-l/xKm4WtVw8zbVHTqeedFjNk52O943XxzVEGS+1Libs=", + "lastModified": 1713171039, + "narHash": "sha256-9QrWi1VqMafXPAWw126uWRn56MtwzokNxDevSTjeQ/U=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9cb438ce0f2ac37fe8a9935a250e9b85581cd69d", + "rev": "612646835968f663fd0e8f1a21ef52b5d0b88c57", "type": "github" }, "original": { @@ -218,11 +218,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1720177068, - "narHash": "sha256-LTSFlW/46hl1u9SzqnvbtNxswCW05bhwOY6CzVEJC5o=", + "lastModified": 1713106678, + "narHash": "sha256-dm4bufwlVDUE4ndsR6cAPur75hvlVRzIxbMKJCizutg=", "owner": "elkowar", "repo": "eww", - "rev": "4d55e9ad63d1fae887726dffcd25a32def23d34f", + "rev": "1e37f53e99016aa2cd725d7050788bb5d4fcc76a", "type": "github" }, "original": { @@ -243,11 +243,11 @@ ] }, "locked": { - "lastModified": 1719830626, - "narHash": "sha256-7Wb2KiImYxrrIehtodNG9IvumFtZ2f5DkhrjnUBe7zk=", + "lastModified": 1699821751, + "narHash": "sha256-UlId5jvJFmkVcKpn0oZ2VTvWAc/mZy6butRZGk73xXM=", "owner": "erikarvstedt", "repo": "extra-container", - "rev": "37b479006a80a936ac17e82fb2e8c07b822e17f2", + "rev": "842912907bf189ef17a80ca09ba37b6bdfc76c49", "type": "github" }, "original": { @@ -378,6 +378,24 @@ "type": "github" } }, + "flake-utils_6": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -418,11 +436,11 @@ ] }, "locked": { - "lastModified": 1720470846, - "narHash": "sha256-7ftA4Bv5KfH4QdTRxqe8/Hz2YTKo+7IQ9n7vbNWgv28=", + "lastModified": 1713166971, + "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2fb5c1e0a17bc6059fa09dc411a43d75f35bb192", + "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", "type": "github" }, "original": { @@ -460,11 +478,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1719416660, - "narHash": "sha256-TTj6dGMOqZqjbzAo1wWvtpcV1RpwKPTR2ItLGE7kuo4=", + "lastModified": 1713109956, + "narHash": "sha256-JMJBqWnuM3JWkoYnou/OW46FSt9UX/LpXARJTYAG6jA=", "owner": "chriscochrun", "repo": "lumina", - "rev": "49893808658126078b117b36b21f10565de63934", + "rev": "a00f1b081a3907c664074f4164bde9c604c48c92", "type": "gitlab" }, "original": { @@ -499,11 +517,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1720159196, - "narHash": "sha256-FrO4fgh+NRhUg/B80pzyz45vco4/OskHe1u8+IREPmc=", + "lastModified": 1712227415, + "narHash": "sha256-4EvWs6rHxCIj9FFXI4Vxh32XJaZJfIqKtAal6vJfqAs=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "32f72e8f0e7ef780f3d753f56c4b94f1f5106a00", + "rev": "1a3748a368e96e3f3a38735bd9417f634beeeace", "type": "github" }, "original": { @@ -515,11 +533,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1720515935, - "narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=", + "lastModified": 1712909959, + "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a111ce6b537df12a39874aa9672caa87f8677eda", + "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", "type": "github" }, "original": { @@ -558,27 +576,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1713013257, + "narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "rev": "90055d5e616bd943795d38808c94dbf0dd35abe8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1719957072, - "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", + "lastModified": 1713013257, + "narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", + "rev": "90055d5e616bd943795d38808c94dbf0dd35abe8", "type": "github" }, "original": { @@ -590,11 +608,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1720027103, - "narHash": "sha256-Q92DHQjIvaMLpawMdXnbKQjCkzAWqjhjWJYS5RcKujY=", + "lastModified": 1712026416, + "narHash": "sha256-N/3VR/9e1NlN49p7kCiATiEY6Tzdo+CbrAG8kqCQKcI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "61684d356e41c97f80087e89659283d00fe032ab", + "rev": "080a4a27f206d07724b88da096e27ef63401a504", "type": "github" }, "original": { @@ -622,11 +640,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1719957072, - "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", + "lastModified": 1711668574, + "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", + "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659", "type": "github" }, "original": { @@ -638,11 +656,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1720418205, - "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "655a58a72a6601292512670343087c2d75d859c1", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { @@ -717,11 +735,11 @@ ] }, "locked": { - "lastModified": 1708999822, - "narHash": "sha256-X55GxqI3oDEfqy38Pt7xyypYNly4bkd/RajFE+FGn+A=", + "lastModified": 1708395022, + "narHash": "sha256-pxHZbfDsLAAcyWz+snbudxhQPlAnK2nWGAqRx11veac=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1a618c62479a6896ac497aaa0d969c6bd8e24911", + "rev": "b4ae18c03af976549a0b6e396b2b5be56d275f8b", "type": "github" }, "original": { @@ -757,16 +775,17 @@ }, "rust-overlay_3": { "inputs": { + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1720577957, - "narHash": "sha256-RZuzLdB/8FaXaSzEoWLg3au/mtbuH7MGn2LmXUKT62g=", + "lastModified": 1713150335, + "narHash": "sha256-Ic7zCPfiSYc9nFFp+E44WFk3TBJ99J/uPZ4QXX+uPPw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a434177dfcc53bf8f1f348a3c39bfb336d760286", + "rev": "b186d85e747e2b7bee220ec95839fb66c868dc47", "type": "github" }, "original": { @@ -814,11 +833,11 @@ ] }, "locked": { - "lastModified": 1719525570, - "narHash": "sha256-xSO/H67GAHEW0siD2PHoO/e97MbROL3r3s5SpF6A6Dc=", + "lastModified": 1719152448, + "narHash": "sha256-Acbi1Crd+UEbpPW8IR0ZGRKV+JCnMXDS2cglFQJvRPM=", "owner": "danth", "repo": "stylix", - "rev": "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116", + "rev": "0fc4e9f1449a9dce4be7a1ecedd97949da591181", "type": "github" }, "original": { @@ -902,6 +921,21 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1605370193, diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index fd0a92d..59fc9f0 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -252,6 +252,8 @@ in "SUPER,j,layoutmsg,cyclenext" "SUPERSHIFT,h,movewindow,l" "SUPERSHIFT,l,movewindow,r" + "SUPERSHIFTALT,h,layoutmsg,addmaster" + "SUPERSHIFTALT,l,layoutmsg,addmaster" "SUPERSHIFT,k,layoutmsg,swapprev" "SUPERSHIFT,j,layoutmsg,swapnext" "SUPERCTRL,l,splitratio,+0.05"