Compare commits
No commits in common. "e89cc99a11a655a1f14eebb17b8b029590c96119" and "5584dd3a9135cfd46f09dea4d69e5110962a68d3" have entirely different histories.
e89cc99a11
...
5584dd3a91
82
flake.lock
82
flake.lock
|
|
@ -12,7 +12,7 @@
|
|||
"locked": {
|
||||
"lastModified": 1627835028,
|
||||
"narHash": "sha256-LHTdNog+0EmRn+4DIz451vvQ2EeC8KwyV3/8JpX9yiw=",
|
||||
"ref": "refs/heads/master",
|
||||
"ref": "master",
|
||||
"rev": "7fc3d5019c907566abbad8f84ba9555a5786bd01",
|
||||
"revCount": 52,
|
||||
"type": "git",
|
||||
|
|
@ -171,11 +171,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1671452357,
|
||||
"narHash": "sha256-HqzXiQEegpRQ4VEl9pEPgHSIxhJrNJ27HfN1wOc7w2E=",
|
||||
"lastModified": 1669829516,
|
||||
"narHash": "sha256-laWMD/TZzyrulu8xLNoSPertXOxjRD7BrcAVwKl+NyQ=",
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"rev": "200790e9c77064c53eaf95805b013d96615ecc27",
|
||||
"rev": "471c7f1ecace25e39099206431300322632d25c4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -187,11 +187,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1671467847,
|
||||
"narHash": "sha256-eIeZIQbbW0QYDW0nhDaieokw6VakPO3TyJ3RmxqGHOs=",
|
||||
"lastModified": 1669650994,
|
||||
"narHash": "sha256-uwASLUfedIQ5q01TtMwZDEV2HCZr5nVPZjzVgCG+D5I=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "25010a042c23695ae457a97aad60e9b1d49f2ecc",
|
||||
"rev": "7883883d135ce5b7eae5dce4bfa12262b85c1c46",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -203,11 +203,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1671313200,
|
||||
"narHash": "sha256-itZTrtHeDJjV696+ur0/TzkTqb5y3Eb57WRLRPK3rwA=",
|
||||
"lastModified": 1670543317,
|
||||
"narHash": "sha256-4mMR56rtxKr+Gwz399jFr4i76SQZxsLWxxyfQlPXRm0=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0938d73bb143f4ae037143572f11f4338c7b2d1c",
|
||||
"rev": "7a6a010c3a1d00f8470a5ca888f2f927f1860a19",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -219,11 +219,11 @@
|
|||
},
|
||||
"nixpkgs-2205": {
|
||||
"locked": {
|
||||
"lastModified": 1671447788,
|
||||
"narHash": "sha256-Nitle27Q2gXkuk66VZUT+iyisT4pGQwQwU9eyExOVEk=",
|
||||
"lastModified": 1670538458,
|
||||
"narHash": "sha256-mvKmBkdlhzsMBtnzYXjYn08EGw9rFBEE9hp4Uqgol1Q=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "bfb04388d42ff49e5e81da9f0bfcb48a6367273d",
|
||||
"rev": "99ec06122f481588abafd91f2710d80a5320efe6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -233,6 +233,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-22_05": {
|
||||
"locked": {
|
||||
"lastModified": 1669513802,
|
||||
"narHash": "sha256-AmTRNi8bHgJlmaNe3r5k+IMFbbXERM/KarqveMAZmsY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6649e08812f579581bfb4cada3ba01e30485c891",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "release-22.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-overlay": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
|
|
@ -248,7 +264,7 @@
|
|||
"locked": {
|
||||
"lastModified": 1667592878,
|
||||
"narHash": "sha256-zB0kNNeUBPGw+LWzWmSqTHRfvfy3ckOUMtyE3F90Dns=",
|
||||
"ref": "refs/heads/master",
|
||||
"ref": "master",
|
||||
"rev": "ff4ce742bffb71fc983cb13a3634ec0d243d869c",
|
||||
"revCount": 47,
|
||||
"type": "git",
|
||||
|
|
@ -261,11 +277,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1671271954,
|
||||
"narHash": "sha256-cSvu+bnvN08sOlTBWbBrKaBHQZq8mvk8bgpt0ZJ2Snc=",
|
||||
"lastModified": 1668984258,
|
||||
"narHash": "sha256-0gDMJ2T3qf58xgcSbYoXiRGUkPWmKyr5C3vcathWhKs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d513b448cc2a6da2c8803e3c197c9fc7e67b19e3",
|
||||
"rev": "cf63ade6f74bbc9d2a017290f1b2e33e8fbfa70a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -275,29 +291,13 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1671459584,
|
||||
"narHash": "sha256-6wRK7xmeHfClJ0ICOkax1avLZVGTDqBodQlkl/opccY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "87b58217c9a05edcf7630b9be32570f889217aef",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "release-22.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1671359686,
|
||||
"narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=",
|
||||
"lastModified": 1669791787,
|
||||
"narHash": "sha256-KBfoA2fOI5+wCrm7PR+j7jHqXeTkVRPQ0m5fcKchyuU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4",
|
||||
"rev": "e76c78d20685a043d23f5f9e0ccd2203997f1fb1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -335,7 +335,7 @@
|
|||
"locked": {
|
||||
"lastModified": 1657992602,
|
||||
"narHash": "sha256-bFAR4Rvi/MWlvdtYZhCtRY6zDFjThA0QCthUqbaHjsE=",
|
||||
"ref": "refs/heads/master",
|
||||
"ref": "master",
|
||||
"rev": "1b3435ec8615300fd81e96045ca7596e0f5a23f0",
|
||||
"revCount": 14,
|
||||
"type": "git",
|
||||
|
|
@ -393,14 +393,14 @@
|
|||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
"nixpkgs-22_05": "nixpkgs-22_05"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1671472949,
|
||||
"narHash": "sha256-9iHSGpljCX+RypahQssBXPwkru9onfKfceCTeVrMpH4=",
|
||||
"lastModified": 1669714206,
|
||||
"narHash": "sha256-9aiMbzRL8REsyi9U0eZ+lT4s7HaILA1gh9n2apKzLxU=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "32840f16ffa0856cdf9503a8658f2dd42bf70342",
|
||||
"rev": "8295b8139ef7baadeb90c5cad7a40c4c9297ebf7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -3,7 +3,7 @@ let
|
|||
iosevka-sbruder = pkgs.iosevka.override {
|
||||
privateBuildPlan = {
|
||||
family = "Iosevka sbruder";
|
||||
spacing = "term";
|
||||
spacing = "normal";
|
||||
serifs = "sans";
|
||||
no-cv-ss = false;
|
||||
export-glyph-names = true;
|
||||
|
|
@ -15,10 +15,9 @@ let
|
|||
capital-g = "toothless-rounded-serifless-hooked";
|
||||
four = "closed";
|
||||
six = "closed-contour";
|
||||
eight = "two-circles";
|
||||
nine = "closed-contour";
|
||||
number-sign = "upright-tall";
|
||||
at = "short";
|
||||
cent = "open";
|
||||
percent = "dots";
|
||||
lig-ltgteq = "slanted";
|
||||
};
|
||||
|
|
@ -51,15 +50,6 @@ let
|
|||
css = "italic";
|
||||
};
|
||||
};
|
||||
|
||||
widths = {
|
||||
# ensures that extended won’t get built
|
||||
normal = {
|
||||
shape = 500;
|
||||
menu = 5;
|
||||
css = "normal";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
set = "sbruder";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, nixosConfig, pkgs, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
inherit ((import ../common.nix).colorschemes) solarized;
|
||||
|
||||
|
|
@ -32,11 +32,9 @@ let
|
|||
cookieExceptions = [
|
||||
];
|
||||
in
|
||||
lib.mkIf nixosConfig.sbruder.gui.enable
|
||||
{
|
||||
programs.qutebrowser = {
|
||||
enable = true;
|
||||
package = pkgs.qutebrowser-qt6;
|
||||
aliases = {
|
||||
q = "tab-close"; # one tab
|
||||
qa = "close"; # one window
|
||||
|
|
@ -196,7 +194,7 @@ lib.mkIf nixosConfig.sbruder.gui.enable
|
|||
|
||||
# Privacy
|
||||
content.cookies.accept = "no-3rdparty";
|
||||
content.headers.user_agent = "Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0";
|
||||
content.headers.user_agent = "Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Firefox/91.0";
|
||||
content.headers.accept_language = "en-US,en;q=0.5";
|
||||
|
||||
# Filtering (many don’t get used yet due to lack of cosmetic filtering)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
[data-qb-domain="torrent.sbruder.de"],
|
||||
[data-qb-url^="http://localhost:8888/torrent/"] {
|
||||
body {
|
||||
user-select: unset !important;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,133 +0,0 @@
|
|||
window {
|
||||
font-family: "monospace";
|
||||
background: @base03;
|
||||
color: @base0;
|
||||
}
|
||||
|
||||
button {
|
||||
padding: 4px;
|
||||
border: 2px solid @base02;
|
||||
}
|
||||
|
||||
scrollbar {
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.notification-row {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.notification-row:focus,
|
||||
.notification-row:hover {
|
||||
background: @noti-bg-focus;
|
||||
}
|
||||
|
||||
.notification {
|
||||
background-color: @base03;
|
||||
margin: 0px 8px;
|
||||
padding: 0;
|
||||
}
|
||||
.notification:first-child {
|
||||
margin-top: 12px;
|
||||
}
|
||||
|
||||
.notification-content {
|
||||
padding: 6px;
|
||||
}
|
||||
|
||||
.close-button {
|
||||
color: @base0;
|
||||
padding: 0px;
|
||||
border-radius: 100%;
|
||||
margin-top: 16px;
|
||||
margin-right: 16px;
|
||||
border: none;
|
||||
min-width: 24px;
|
||||
min-height: 24px;
|
||||
}
|
||||
.close-button:hover {
|
||||
background: @base02;
|
||||
}
|
||||
|
||||
.notification-default-action,
|
||||
.notification-action {
|
||||
margin: 0;
|
||||
border: 2px solid @base02;
|
||||
}
|
||||
|
||||
.notification-default-action:hover,
|
||||
.notification-action:hover {
|
||||
-gtk-icon-effect: none;
|
||||
}
|
||||
|
||||
.notification-action {
|
||||
border-top: none;
|
||||
border-right: none;
|
||||
}
|
||||
|
||||
.notification-action:last-child {
|
||||
border-right: 2px solid @base02;
|
||||
}
|
||||
|
||||
.notification-default-action > button,
|
||||
.notification-action > button {
|
||||
margin: 4px;
|
||||
}
|
||||
|
||||
.image {
|
||||
}
|
||||
|
||||
.body-image {
|
||||
margin-top: 6px;
|
||||
background-color: white;
|
||||
}
|
||||
|
||||
.summary {
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.time {
|
||||
font-weight: bold;
|
||||
margin-right: 18px;
|
||||
}
|
||||
|
||||
.control-center {
|
||||
background: @base03;
|
||||
color: @base0;
|
||||
}
|
||||
|
||||
.control-center-list {
|
||||
}
|
||||
|
||||
.floating-notifications {
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
.blank-window {
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
.widget-title {
|
||||
margin: 8px;
|
||||
font-size: 1.5rem;
|
||||
}
|
||||
.widget-title > button {
|
||||
font-size: initial;
|
||||
}
|
||||
|
||||
.widget-dnd {
|
||||
margin: 8px;
|
||||
font-size: 1.1rem;
|
||||
}
|
||||
.widget-dnd > switch {
|
||||
font-size: initial;
|
||||
border: 2px solid @base02;
|
||||
color: transparent; /* hide default on and off state text */
|
||||
}
|
||||
.widget-dnd > switch:checked slider {
|
||||
background-color: @green;
|
||||
}
|
||||
.widget-dnd > switch slider {
|
||||
background: @base0;
|
||||
}
|
||||
|
|
@ -8,10 +8,9 @@ in
|
|||
Install.WantedBy = [ "sway-session.target" ];
|
||||
|
||||
Service = {
|
||||
ExecStart = "${pkgs.swaynotificationcenter}/bin/swaync";
|
||||
# FIXME: use new version (currently system style discovery fails)
|
||||
ExecStart = "${pkgs._2205.swaynotificationcenter}/bin/swaync";
|
||||
Restart = "on-failure";
|
||||
# override default stylesheet and GTK theme
|
||||
Environment = "XDG_CONFIG_DIRS=${pkgs.writeTextDir "swaync/style.css" ""} GTK_THEME=none";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -23,16 +22,125 @@ in
|
|||
timeout-low = 5;
|
||||
timeout-critical = 0;
|
||||
notification-window-width = 480;
|
||||
fit-to-screen = true;
|
||||
fit-to-screen = false;
|
||||
keyboard-shortcuts = true;
|
||||
image-visibility = "when-available";
|
||||
transition-time = 0;
|
||||
hide-on-clear = true;
|
||||
hide-on-action = true;
|
||||
};
|
||||
"swaync/style.css".text = lib.concatStrings (lib.attrsets.mapAttrsToList (k: v: "@define-color ${k} ${v};\n") solarized) + builtins.readFile ./swaync.css;
|
||||
};
|
||||
"swaync/style.css".text = lib.concatStrings (lib.attrsets.mapAttrsToList (k: v: "@define-color ${k} ${v};\n") solarized) + /* less */ ''
|
||||
.control-center {
|
||||
background-color: @base03;
|
||||
color: #839496;
|
||||
}
|
||||
/* if the font is only set for .control-center, notifications do not use it */
|
||||
window {
|
||||
font-family: "monospace";
|
||||
}
|
||||
|
||||
# dummy file to create empty theme
|
||||
xdg.dataFile."themes/none/gtk-3.0/gtk.css".text = "";
|
||||
.control-center-list {
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
.control-center-clear-all {
|
||||
color: @base0;
|
||||
text-shadow: none;
|
||||
background: @base03;
|
||||
box-shadow: none;
|
||||
border-radius: 0px;
|
||||
border: 2px solid @base02;
|
||||
}
|
||||
|
||||
.control-center-dnd {
|
||||
border-radius: 0px;
|
||||
border: none;
|
||||
box-shadow: none;
|
||||
background-color: @base02;
|
||||
}
|
||||
.control-center-dnd:checked {
|
||||
background: @green;
|
||||
}
|
||||
.control-center-dnd slider {
|
||||
background: @base0;
|
||||
border-radius: 0px;
|
||||
border: 2px solid @base02;
|
||||
box-shadow: none;
|
||||
}
|
||||
.control-center-dnd slider:checked {
|
||||
background: @green;
|
||||
}
|
||||
|
||||
.floating-notifications {
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
.notification-row {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.notification {
|
||||
border-radius: 0px;
|
||||
box-shadow: none;
|
||||
margin: 3px 6px;
|
||||
padding: 0;
|
||||
}
|
||||
.notification:first-child {
|
||||
margin-top: 6px;
|
||||
}
|
||||
|
||||
.low .summary {
|
||||
color: @base00;
|
||||
}
|
||||
|
||||
.critical .summary {
|
||||
color: @red;
|
||||
}
|
||||
|
||||
.notification-content {
|
||||
padding: 6px;
|
||||
border-radius: 0px;
|
||||
}
|
||||
|
||||
/* hide close button (clicking on the notification does the same) */
|
||||
.close-button {
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.notification-default-action,
|
||||
.notification-action {
|
||||
padding: 4px;
|
||||
margin: 0;
|
||||
box-shadow: none;
|
||||
background: @base03;
|
||||
border: 2px solid @base02;
|
||||
border-radius: 0px;
|
||||
}
|
||||
|
||||
.notification-action {
|
||||
color: @base0;
|
||||
box-shadow: none;
|
||||
text-shadow: none;
|
||||
border-right: none;
|
||||
border-top: none;
|
||||
}
|
||||
/* re-add right border to last action */
|
||||
.notification-action:last-child {
|
||||
border-right: 2px solid @base02;
|
||||
}
|
||||
|
||||
.body-image {
|
||||
margin-top: 6px;
|
||||
background-color: @base0;
|
||||
}
|
||||
|
||||
.summary,
|
||||
.time,
|
||||
.body,
|
||||
.top-action-title {
|
||||
color: @base0;
|
||||
text-shadow: none;
|
||||
}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
border-radius: 0;
|
||||
border: none;
|
||||
font-family: "monospace";
|
||||
font-size: 12.5px;
|
||||
font-size: 12px;
|
||||
min-height: 0;
|
||||
transition-property: none;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -128,9 +128,6 @@ in
|
|||
interval = 2;
|
||||
tooltip-format = "MPD (connected)";
|
||||
tooltip-format-disconnected = "MPD (disconnected)";
|
||||
# FIXME remove this once waybar fixes the regression (https://github.com/Alexays/Waybar/issues/1778)
|
||||
on-click = "${pkgs.mpc_cli}/bin/mpc -q -h ${config.services.mpd.network.listenAddress} toggle";
|
||||
on-click-right = "${pkgs.mpc_cli}/bin/mpc -q -h ${config.services.mpd.network.listenAddress} stop";
|
||||
on-scroll-up = "${pkgs.mpc_cli}/bin/mpc -q -h ${config.services.mpd.network.listenAddress} volume +2";
|
||||
on-scroll-down = "${pkgs.mpc_cli}/bin/mpc -q -h ${config.services.mpd.network.listenAddress} volume -2";
|
||||
title-len = 48;
|
||||
|
|
@ -288,9 +285,9 @@ in
|
|||
dnd-none = "${thinsp}";
|
||||
};
|
||||
return-type = "json";
|
||||
exec = "${pkgs.swaynotificationcenter}/bin/swaync-client -swb";
|
||||
on-click = "${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw";
|
||||
on-click-right = "${pkgs.swaynotificationcenter}/bin/swaync-client -d -sw";
|
||||
exec = "${pkgs._2205.swaynotificationcenter}/bin/swaync-client -swb";
|
||||
on-click = "${pkgs._2205.swaynotificationcenter}/bin/swaync-client -t -sw";
|
||||
on-click-right = "${pkgs._2205.swaynotificationcenter}/bin/swaync-client -d -sw";
|
||||
escape = true;
|
||||
};
|
||||
};
|
||||
|
|
@ -310,7 +307,8 @@ in
|
|||
Service = {
|
||||
# ensure sway is already started, otherwise workspaces will not work
|
||||
ExecStartPre = "${config.wayland.windowManager.sway.package}/bin/swaymsg";
|
||||
ExecStart = "${pkgs.waybar}/bin/waybar";
|
||||
# FIXME: use new version (currently mpd widget does not toggle playback)
|
||||
ExecStart = "${pkgs._2205.waybar}/bin/waybar";
|
||||
ExecReload = "${pkgs.utillinux}/bin/kill -SIGUSR2 $MAINPID";
|
||||
Restart = "on-failure";
|
||||
RestartSec = "1s";
|
||||
|
|
|
|||
Loading…
Reference in New Issue