fixing the broken update

This commit is contained in:
Chris Cochrun 2024-07-10 16:31:22 -05:00
parent d016fabf0b
commit 797d90f040
4 changed files with 129 additions and 65 deletions

View file

@ -177,7 +177,7 @@ function Bar(monitor = 0) {
App.config({ App.config({
style: css, style: css,
windows: [ windows: [
Bar(laptop ? 0 : 2), // can be instantiated for each monitor Bar(laptop ? 0 : 0), // can be instantiated for each monitor
NotificationPopups(), NotificationPopups(),
(laptop ? BatteryPopup() : null) (laptop ? BatteryPopup() : null)
], ],

View file

@ -3,18 +3,32 @@
configuration { configuration {
show-icons: true;
icon-theme: "Papirus"; icon-theme: "Papirus";
terminal: "konsole"; terminal: "konsole";
sidebar-mode: true; sidebar-mode: true;
run-command: "bash -c {cmd}"; run-command: "bash -c {cmd}";
run-list-command: "fish -c functions"; run-list-command: "fish -c functions";
display-drun: " "; display-drun: " ";
drun-display-format: "{name} [<span weight='light' size='small'><i>({generic})</i></span>] - {exec}"; display-run: " ";
display-window: " ";
display-combi: " ";
drun-display-format: "{name} [<span weight='light' size='small'><i>({generic})</i></span>]";/* - {exec}*/
threads: 0; threads: 0;
scroll-method: 0; scroll-method: 0;
disable-history: false; 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-color: #00222b33;
background-entry: #000000; background-entry: #000000;
foreground-selected: #ffffff; foreground-selected: #ffffff;
urgent: @base08; urgent: #E91E63;
urgent-selected: @base08; urgent-selected: #E91E63;
transparent: #00000000; transparent: #00000000;
base00: #282a36; base00: #282a36;
base01: #34353e; base01: #34353e;
@ -46,10 +60,10 @@ configuration {
} }
window { window {
background-color: @base00t; background-color: @base00;
text-color: @base05; text-color: @base05;
transparency: "real"; /* transparency: "real"; */
border-radius: 16px; border-radius: 20px;
border: 0px; border: 0px;
width: 60%; width: 60%;
location: center; location: center;
@ -62,39 +76,46 @@ window {
mainbox { mainbox {
border-radius: 16; border-radius: 16;
background-color: @transparent; /* background-color: @transparent; */
background-color: @base00;
text-color: @base05; text-color: @base05;
transparency: "real"; transparency: "real";
} }
inputbar { inputbar {
background-color: @transparent; /* background-color: @transparent; */
background-color: @base00;
text-color: @base05; text-color: @base05;
expand: false; expand: false;
border-radius: 36px; border-radius: 36px;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
padding: 6px 6px 6px 6px; padding: 20px 6px 20px 6px;
position: north; position: north;
} }
prompt { prompt {
enabled: true; enabled: true;
padding: 0px 6px 0px 5px; padding: 0px 6px 0px 5px;
background-color: @transparent; /* background-color: @transparent; */
background-color: @base00;
text-color: @base05; text-color: @base05;
border: 0px; border: 0px;
font: "VictorMono Nerd Font 22.0";
} }
entry { entry {
background-color: @transparent; /* background-color: @transparent; */
background-color: @base00;
color: @base00;
placeholder-color: @base05; placeholder-color: @base05;
text-color: @base05; text-color: @base05;
expand: true; expand: true;
horizontal-align: 0; horizontal-align: 0;
placeholder: "Search"; placeholder: "";
blink: true; blink: true;
border: 0px; border: 0px;
padding: 0px 0px 0px 6px; padding: 0px 0px 0px 6px;
font: "VictorMono Nerd Font 22.0";
} }
case-indicator { case-indicator {
@ -109,7 +130,8 @@ sidebar {
} }
mainbox { mainbox {
background-color: @base00t; /* background-color: @base00t; */
background-color: @base00;
text-color: @transparent; text-color: @transparent;
children: [ inputbar, listview, message ]; children: [ inputbar, listview, message ];
spacing: 5px; spacing: 5px;
@ -130,8 +152,9 @@ textbox {
} }
listview { listview {
background-color: @transparent; /* background-color: @transparent; */
columns: 2; background-color: @base00;
columns: 1;
spacing: 4px; spacing: 4px;
cycle: false; cycle: false;
dynamic: true; dynamic: true;
@ -151,6 +174,7 @@ element {
} }
element-icon { element-icon {
background-color: @transparent;
size: 30px; size: 30px;
border: 0px; border: 0px;
padding: 0px 0px 0px; padding: 0px 0px 0px;
@ -190,3 +214,7 @@ element selected.active {
background-color: @background-alt; background-color: @background-alt;
color: @base0A; color: @base0A;
} }
window {
background-color: @base00;
}

View file

@ -196,11 +196,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1720631485, "lastModified": 1713171039,
"narHash": "sha256-l/xKm4WtVw8zbVHTqeedFjNk52O943XxzVEGS+1Libs=", "narHash": "sha256-9QrWi1VqMafXPAWw126uWRn56MtwzokNxDevSTjeQ/U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "9cb438ce0f2ac37fe8a9935a250e9b85581cd69d", "rev": "612646835968f663fd0e8f1a21ef52b5d0b88c57",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -218,11 +218,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1720177068, "lastModified": 1713106678,
"narHash": "sha256-LTSFlW/46hl1u9SzqnvbtNxswCW05bhwOY6CzVEJC5o=", "narHash": "sha256-dm4bufwlVDUE4ndsR6cAPur75hvlVRzIxbMKJCizutg=",
"owner": "elkowar", "owner": "elkowar",
"repo": "eww", "repo": "eww",
"rev": "4d55e9ad63d1fae887726dffcd25a32def23d34f", "rev": "1e37f53e99016aa2cd725d7050788bb5d4fcc76a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -243,11 +243,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719830626, "lastModified": 1699821751,
"narHash": "sha256-7Wb2KiImYxrrIehtodNG9IvumFtZ2f5DkhrjnUBe7zk=", "narHash": "sha256-UlId5jvJFmkVcKpn0oZ2VTvWAc/mZy6butRZGk73xXM=",
"owner": "erikarvstedt", "owner": "erikarvstedt",
"repo": "extra-container", "repo": "extra-container",
"rev": "37b479006a80a936ac17e82fb2e8c07b822e17f2", "rev": "842912907bf189ef17a80ca09ba37b6bdfc76c49",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -378,6 +378,24 @@
"type": "github" "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": { "fromYaml": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -418,11 +436,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720470846, "lastModified": 1713166971,
"narHash": "sha256-7ftA4Bv5KfH4QdTRxqe8/Hz2YTKo+7IQ9n7vbNWgv28=", "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2fb5c1e0a17bc6059fa09dc411a43d75f35bb192", "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -460,11 +478,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1719416660, "lastModified": 1713109956,
"narHash": "sha256-TTj6dGMOqZqjbzAo1wWvtpcV1RpwKPTR2ItLGE7kuo4=", "narHash": "sha256-JMJBqWnuM3JWkoYnou/OW46FSt9UX/LpXARJTYAG6jA=",
"owner": "chriscochrun", "owner": "chriscochrun",
"repo": "lumina", "repo": "lumina",
"rev": "49893808658126078b117b36b21f10565de63934", "rev": "a00f1b081a3907c664074f4164bde9c604c48c92",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -499,11 +517,11 @@
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"
}, },
"locked": { "locked": {
"lastModified": 1720159196, "lastModified": 1712227415,
"narHash": "sha256-FrO4fgh+NRhUg/B80pzyz45vco4/OskHe1u8+IREPmc=", "narHash": "sha256-4EvWs6rHxCIj9FFXI4Vxh32XJaZJfIqKtAal6vJfqAs=",
"owner": "fort-nix", "owner": "fort-nix",
"repo": "nix-bitcoin", "repo": "nix-bitcoin",
"rev": "32f72e8f0e7ef780f3d753f56c4b94f1f5106a00", "rev": "1a3748a368e96e3f3a38735bd9417f634beeeace",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -515,11 +533,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1720515935, "lastModified": 1712909959,
"narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=", "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a111ce6b537df12a39874aa9672caa87f8677eda", "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -558,27 +576,27 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1720386169, "lastModified": 1713013257,
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "rev": "90055d5e616bd943795d38808c94dbf0dd35abe8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.05", "ref": "nixos-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1719957072, "lastModified": 1713013257,
"narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", "narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", "rev": "90055d5e616bd943795d38808c94dbf0dd35abe8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -590,11 +608,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1720027103, "lastModified": 1712026416,
"narHash": "sha256-Q92DHQjIvaMLpawMdXnbKQjCkzAWqjhjWJYS5RcKujY=", "narHash": "sha256-N/3VR/9e1NlN49p7kCiATiEY6Tzdo+CbrAG8kqCQKcI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "61684d356e41c97f80087e89659283d00fe032ab", "rev": "080a4a27f206d07724b88da096e27ef63401a504",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -622,11 +640,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1719957072, "lastModified": 1711668574,
"narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -638,11 +656,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1720418205, "lastModified": 1712963716,
"narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "655a58a72a6601292512670343087c2d75d859c1", "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -717,11 +735,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708999822, "lastModified": 1708395022,
"narHash": "sha256-X55GxqI3oDEfqy38Pt7xyypYNly4bkd/RajFE+FGn+A=", "narHash": "sha256-pxHZbfDsLAAcyWz+snbudxhQPlAnK2nWGAqRx11veac=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "1a618c62479a6896ac497aaa0d969c6bd8e24911", "rev": "b4ae18c03af976549a0b6e396b2b5be56d275f8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -757,16 +775,17 @@
}, },
"rust-overlay_3": { "rust-overlay_3": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_6",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1720577957, "lastModified": 1713150335,
"narHash": "sha256-RZuzLdB/8FaXaSzEoWLg3au/mtbuH7MGn2LmXUKT62g=", "narHash": "sha256-Ic7zCPfiSYc9nFFp+E44WFk3TBJ99J/uPZ4QXX+uPPw=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "a434177dfcc53bf8f1f348a3c39bfb336d760286", "rev": "b186d85e747e2b7bee220ec95839fb66c868dc47",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -814,11 +833,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719525570, "lastModified": 1719152448,
"narHash": "sha256-xSO/H67GAHEW0siD2PHoO/e97MbROL3r3s5SpF6A6Dc=", "narHash": "sha256-Acbi1Crd+UEbpPW8IR0ZGRKV+JCnMXDS2cglFQJvRPM=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116", "rev": "0fc4e9f1449a9dce4be7a1ecedd97949da591181",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -902,6 +921,21 @@
"type": "github" "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": { "utils": {
"locked": { "locked": {
"lastModified": 1605370193, "lastModified": 1605370193,

View file

@ -252,6 +252,8 @@ in
"SUPER,j,layoutmsg,cyclenext" "SUPER,j,layoutmsg,cyclenext"
"SUPERSHIFT,h,movewindow,l" "SUPERSHIFT,h,movewindow,l"
"SUPERSHIFT,l,movewindow,r" "SUPERSHIFT,l,movewindow,r"
"SUPERSHIFTALT,h,layoutmsg,addmaster"
"SUPERSHIFTALT,l,layoutmsg,addmaster"
"SUPERSHIFT,k,layoutmsg,swapprev" "SUPERSHIFT,k,layoutmsg,swapprev"
"SUPERSHIFT,j,layoutmsg,swapnext" "SUPERSHIFT,j,layoutmsg,swapnext"
"SUPERCTRL,l,splitratio,+0.05" "SUPERCTRL,l,splitratio,+0.05"