From b53e8a30a7dd5d30729729cdaeeb9bb64d3cc6ba Mon Sep 17 00:00:00 2001 From: chaos Date: Sun, 21 Jul 2024 21:04:31 +0100 Subject: [PATCH] remove quassel, strawberry --- flake.lock | 27 -- home/apps/quassel-style.qss | 594 ------------------------ home/apps/quassel.nix | 4 - home/apps/strawberry.nix | 1 - home/gui/environments/gnome/default.nix | 17 +- presets/nixos/desktopBase.nix | 2 - 6 files changed, 4 insertions(+), 641 deletions(-) delete mode 100644 home/apps/quassel-style.qss delete mode 100644 home/apps/quassel.nix delete mode 100644 home/apps/strawberry.nix diff --git a/flake.lock b/flake.lock index c5060d1..af1abbf 100644 --- a/flake.lock +++ b/flake.lock @@ -102,32 +102,6 @@ "url": "https://forgejo.owo.monster/chaos/musicutil" } }, - "nixos-wsl": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1721226275, - "narHash": "sha256-fwTSeMR1senkBPaKQyOkbkmFu3+8jj3UHoLZ3TcrOfw=", - "owner": "nix-community", - "repo": "NixOS-WSL", - "rev": "8ebede998342477736e0d0acdcc13ddb166a335f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NixOS-WSL", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1714635257, @@ -214,7 +188,6 @@ "food-site": "food-site", "home-manager-unstable": "home-manager-unstable", "musicutil": "musicutil", - "nixos-wsl": "nixos-wsl", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "tree-input": "tree-input", diff --git a/home/apps/quassel-style.qss b/home/apps/quassel-style.qss deleted file mode 100644 index 99baee1..0000000 --- a/home/apps/quassel-style.qss +++ /dev/null @@ -1,594 +0,0 @@ -/** -** ______ _ _____ _ _ _ -** | _ \ | | / ___| | | (_) | | -** | | | |__ _ _ __| | __ \ `--. ___ | | __ _ _ __ _ _______ __| | -** | | | / _` | '__| |/ / `--. \/ _ \| |/ _` | '__| |_ / _ \/ _` | -** | |/ / (_| | | | < /\__/ / (_) | | (_| | | | |/ / __/ (_| | -** |___/ \__,_|_| |_|\_\ \____/ \___/|_|\__,_|_| |_/___\___|\__,_| -** -** Quassel Theme -** -** Author: Chris Holland (Zren on Freenode/GitHub) -*/ - -/** -** Theme Notes: -** - This theme is designed to work on top of the Fusion or the Plastique client style. -** It will look weird on almost all the others (including the system default). -** (Settings > Configure Quassel (F7) > Interface > Client Style) -*/ - -/** -** Helpful Links: -** - QT: -** http://qt-project.org/doc/qt-4.8/stylesheet-syntax.html -** http://doc.qt.nokia.com/4.7-snapshot/stylesheet-reference.html -** http://doc.qt.nokia.com/4.7-snapshot/stylesheet-examples.html -** - Plastique Client Style: -** https://qt.gitorious.org/qt/qt/source/src/gui/styles/qplastiquestyle.cpp -** https://github.com/mirror/qt/blob/4.8/src/gui/styles/qplastiquestyle.cpp -** - Quassel Stylesheet Gallery: -** http://bugs.quassel-irc.org/projects/1/wiki/Stylesheet_Gallery -** http://bugs.quassel-irc.org/projects/1/wiki/Stylesheet_Gallery#DarkMonokaiqss -*/ - -/** -** - QSS Notes: -** Quassel stylesheets also support Palette { role: color; } for setting the system -** palette. See the QPalette docs for available roles, and convert them into qss-style -** attributes, so ButtonText would become button-text or see qssparser.cpp In fact, -** qssparser.cpp is the authorative source for Quassel's qss syntax that contains all -** the extensions over standard Qt qss syntax. -** See: -** http://qt-project.org/doc/qt-4.8/qpalette.html#ColorRole-enum -** https://github.com/quassel/quassel/blob/master/src/uisupport/qssparser.cpp -** -*/ - -Palette { - /* Window colors */ - window: #2b2b2b; - background: #212121; - foreground: #dddddd; - - base: #131313; - alternate-base: #42403B; - - /* Just setting palette(tooltip-base) doesn't work as intended so we set it in - ** a QTooltip{} rule as well. - */ - tooltip-base: #131313; // palette(base) - tooltip-text: white; // palette(text) - - /* The following attributes should be done in a scale */ - light: #444444; // Tab Borders, Scrollbar handle grips, Titled Panel border (Settings) - midlight: #333333; // ? - button: #292929; // Menu BG, Scrollbar and Button base. - mid: #252525; // Titled Panel border (Settings) - dark: #202020; // TreeView [-] and ... color (Also various borders in Windows Client Style) - shadow: #1d1d1d; // ? - - - /* Text colors */ - text: white; - button-text: #B6B3AB; - - highlight: #268bd2; - //highlight-text: #000000; - - /* Link colors */ - link: #539FA3; - link-visited: #845B90; - - /* Color of the marker line in the chat view. BG Node that is overlayed on the first new ChatLine. */ - // 0 -> 0.1 (sharp line) - marker-line: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #586e75, stop: 0.1 #586e75, stop: 0.1 transparent); -} - -/* -** Base Object Colors -*/ - -/* Tables */ -// QTreeView#settingsTree -> Tree in the Settings popup. - -QTreeView, QTableView { - alternate-background-color: rgba(0,0,0, 64); - // background-color: palette(shadow); - border: 0px; -} - -QTreeView { - selection-background-color: transparent; -} - -QTreeView::item { - border-left: 2px solid palette(base); -} - -QTreeView::item:focus { - border-width: 0 0 0 2px; - outline: none; -} - -QTreeView::item:selected { - border-width: 0 0 0 2px; - color: palette(button-text); -} - -QTreeView::item:hover { - background: palette(dark); -} - - -QTreeView::item:selected:active{ - color: palette(button-text); - background: palette(dark); - border-color: palette(highlight); -} - -QTreeView::item:selected:!active { - color: palette(button-text); - background: palette(dark); - border-color: palette(highlight); -} - -// QTreeView::item { color: #debc85; } -// QTreeView::item:selected { color: #00004b; } -// QTreeView#settingsTree { background: #131313; } - - -/* Scrollbar */ -/* From Quassel Wiki: http://sprunge.us/iZGB */ -QScrollBar { - //background: transparent; - background: palette(base); - margin: 0; -} -QScrollBar:hover { - /* Optional: Subtle accent of scrolling area on hover */ - background: #161616; /* base +2 */ -} -QScrollBar:vertical { - width: 8px; -} -QScrollBar:horizontal { - height: 8px; -} - -QScrollBar::handle { - padding: 0; - margin: 2px; - border-radius: 2px; - border: 2px solid palette(midlight); - background: palette(midlight); -} - -QScrollBar::handle:vertical { - min-height: 20px; - min-width: 0px; -} - -QScrollBar::handle:horizontal { - min-width: 20px; - min-height: 0px; -} -QScrollBar::handle:hover { - border-color: palette(light); - background: palette(light); -} -QScrollBar::handle:pressed { - background: palette(highlight); - border-color: palette(highlight); -} - -QScrollBar::add-line , QScrollBar::sub-line { - height: 0px; - border: 0px; -} -QScrollBar::up-arrow, QScrollBar::down-arrow { - border: 0px; - width: 0px; - height: 0px; -} - -QScrollBar::add-page, QScrollBar::sub-page { - background: none; -} - -/* Input Box */ -MultiLineEdit { - //background: palette(base); - //color: palette(foreground); -} - -/* Widgets */ -/* http://doc.qt.nokia.com/4.7-snapshot/qdockwidget.html */ -//QMainWindow, -QMainWindow QAbstractScrollArea { - //border: 0; // Remove borders. - border: 1px solid palette(shadow); -} - -QMainWindow { - //background: palette(mid); // Main window trim -} - -/* Splitter */ -/* The splits between QDockWidgets and QMainWindow is a different element. */ -QSplitter::handle, -QMainWindow::separator { - background: palette(dark); -} -QSplitter::handle:horizontal:hover, -QMainWindow::separator:vertical:hover { - background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 palette(window), stop: 0.5 palette(light), stop: 1 palette(window)); -} - -QSplitter::handle:vertical:hover, -QMainWindow::separator:horizontal:hover { - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 palette(window), stop: 0.5 palette(light), stop: 1 palette(window)); -} - -/* Menu Bar / Context Menues */ -QMenu { - margin: 5px; // A bit of nice padding around menu items. -} - -/* ToolTip */ -/* Note: You cannot create transparent sections in the popup box without a mask set. Thus the black edges outside the rounded borders. */ -QToolTip { - border: 2px solid #202020; // palette(dark) - border-radius: 2px; - background: #131313; // palette(base) - color: white; // palette(text) -} - -/* Tabs */ -/* - The palette is designed for the selected one to be darker. So we need to change it. Decided to do a simple line. - tab:bottom and tab:top reverse y1 and y2 on the linear gradients. - - Tab Shadow: #444444 (light) - Tab Hover: #666 - Tab Selected: palette(highlight) -*/ - -//QTabWidget{} -//QTabWidget::pane {} - -QTabWidget::tab-bar { - alignment: center; -} - -QTabBar::tab { - min-width: 30px; - height: 20px; -} - -QTabBar::tab:bottom:selected { - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 palette(highlight), stop: 0.2 palette(highlight), stop: 0.2 transparent); -} - -QTabBar::tab:top:selected { - background: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0, stop: 0 palette(highlight), stop: 0.2 palette(highlight), stop: 0.2 transparent); -} - -QTabBar::tab:!selected { - color: #888; -} - -QTabBar::tab:bottom:!selected { - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 palette(light), stop: 0.2 palette(light), stop: 0.2 transparent); -} - -QTabBar::tab:top:!selected { - background: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0, stop: 0 palette(light), stop: 0.2 palette(light), stop: 0.2 transparent); -} - -QTabBar::tab:!selected:hover { - color: #aaa; -} - -QTabBar::tab:bottom:!selected:hover { - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #666, stop: 0.2 #666, stop: 0.2 transparent); -} - -QTabBar::tab:top:!selected:hover { - background: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0, stop: 0 #666, stop: 0.2 #666, stop: 0.2 transparent); -} - -/* -** Quassel CSS -*/ - -/* Main Chat Background Override */ -ChatView { - background: #00212A; -} -ChatView QScrollBar { - background: #00212A; -} -ChatView QScrollBar:hover { - background: #00212A; -} - -ChatView QScrollBar::handle { - border-color: #073642; - background: #073642; -} - -ChatView QScrollBar::handle:hover { - border-color: #073642; - background: #073642; -} - -/**/ -QStatusBar {} -QStatusBar::item { - border: none; -} -QStatusBar QLabel { - color: #888; -} - -/* https://github.com/quassel/quassel/blob/master/src/qtui/ui/msgprocessorstatuswidget.ui */ -QStatusBar MsgProcessorStatusWidget {} -QStatusBar MsgProcessorStatusWidget QLabel#label {} -QStatusBar MsgProcessorStatusWidget QProgressBar#progressBar {} - -/* https://github.com/quassel/quassel/blob/master/src/qtui/ui/coreconnectionstatuswidget.ui */ -QStatusBar CoreConnectionStatusWidget {} -QStatusBar CoreConnectionStatusWidget QLabel#messageLabel {} -QStatusBar CoreConnectionStatusWidget QProgressBar#progressBar {} -QStatusBar CoreConnectionStatusWidget QLabel#lagLabel {} -QStatusBar CoreConnectionStatusWidget QLabel#sslLabel { - qproperty-pixmap: none; /* Hide the SSL status icon */ -} - - -/* Font */ -// Will not override if selectors are doubled up eg: "ChatLine, MultiLineEdit {}" -// These will override anything set in Quassel's Settings. -/** - * Don't bold or style MultiLineEdit text in any way otherwise you will be - * prone to get weird behaviour in submitting from the Input box. - * It will randomly bold your input if you do. - */ -ChatLine { - //font-family: "MingLiU_HKSCS-ExtB", "Courier New", Courier, Monotype; - - //font-size: 13pt; - //font-weight: bold; - } -MultiLineEdit { - //font-family: "MingLiU_HKSCS-ExtB", "Courier New", Courier, Monotype; - - //font-size: 20px; - //font-weight: normal; - } -ChatLine#plain { - //font-weight: bold; - } - -/* Font: UI Global Font */ -QWidget { - //font-family: consolas; - } -ChatListItem { - font-family: consolas; - } -NickListItem { - font-family: consolas; - } -StyledLabel#topicLabel { - font-family: consolas; - font-size: 14px; - } - - -/* Topic Box */ -StyledLabel#topicLabel { background: palette(base); font-family: consolas; } - -/* Buffer / Channel List */ -/** - state: inactive, channel-event, unread-message, highlighted - type: query, channel, network -**/ -ChatListItem { foreground: #888888; } -ChatListItem[state="inactive"] { foreground: #555555; } -ChatListItem[state="channel-event"] { foreground: #888888; } /* palette(button-text) */ -ChatListItem[state="unread-message"] { foreground: #268bd2; } -ChatListItem[state="highlighted"] { foreground: #FFAA00; } - -ChatListItem[type="network", state="unread-message"] { foreground: #999999; } -ChatListItem[type="network", state="highlighted"] { foreground: #999999; } -ChatListItem[type="query", state="unread-message"] { foreground: #FFAA00; } - - -/* Nick List */ -/** - state: away - type: user, category -**/ -NickListItem[type="category"] { foreground: #debc85; } -NickListItem[type="user"] { foreground: #cccccc; } -NickListItem[type="user", state="away"] { foreground: #666666; } - - - -/* Chatbox Line Formatting */ -ChatLine[label="highlight"] { - foreground: #93a1a1; - background: #073642; -} - -/* -** Option: Bold highlighted text, but not the timestamp. -*/ -/* -ChatLine[label="highlight"] { font-weight: bold; } -ChatLine::timestamp[label="highlight"]{ font-weight: normal; } -*/ - -/* Slight accent on the first two columns */ -/*ChatLine::sender { background: #101010; }*/ -/*ChatLine::timestamp { background: #101010; }*/ -/*ChatLine::contents { background: #101010; }*/ - -/*ChatLine::sender[label="highlight"] { foreground: #839496; background: #00212A; }*/ -/*ChatLine::timestamp[label="highlight"] { foreground: #586e75; }*/ -ChatLine::timestamp[label="highlight"] { foreground: #93a1a1; } - -ChatLine::timestamp { } - -/* ::contents == Message */ -ChatLine::contents { - /* Can only set background */ -} - -ChatLine#plain { foreground: #839496; } -ChatLine#notice { foreground: #93a1a1; } -ChatLine#action { foreground: #93a1a1; font-style: italic; font-weight: bold; } -ChatLine#nick { foreground: #586e75; } -ChatLine#mode { foreground: #586e75; } -ChatLine#join { foreground: #586e75; } -ChatLine#part { foreground: #586e75; } -ChatLine#quit { foreground: #586e75; } -ChatLine#kick { foreground: #586e75; } -ChatLine#kill { foreground: #586e75; } -ChatLine#server { foreground: #93a1a1; } -ChatLine#info { foreground: #93a1a1; } -ChatLine#error { foreground: #dc322f; } -ChatLine#daychange { foreground: #93a1a1; } -ChatLine#topic { foreground: #b58900; } -//ChatLine#netsplit { foreground: #586e75; } // Old -ChatLine#netsplit-join { foreground: #586e75; } -ChatLine#netsplit-quit { foreground: #586e75; } - -ChatLine::timestamp { - foreground: #586e75; - // Resets the timestemp font during #action and other possible formatting. - font-style: normal; - font-weight: normal; -} - -ChatLine::url { - foreground: palette(link); - //font-style: underline; // Uncomment if you always want an underline on links. -} - -/* Sender Colors */ -ChatLine::sender#plain[sender="self"] { foreground: #586e75; } - - -/* Uncomment this is you want all senders the same color: */ -// ChatLine::sender#plain { foreground: #2828B9; } - -/** - * The following are the sixteen colours used for the senders. - * The names are calculated by taking the hash of the nickname. - * Then take the modulo (the remainder) when divided by 16. - * Preview: http://i.imgur.com/xeRKI4H.png - */ -ChatLine::sender#plain[sender="0"] { foreground: #B58900; } -ChatLine::sender#plain[sender="1"] { foreground: #CB4B16; } -ChatLine::sender#plain[sender="2"] { foreground: #DC322f; } -ChatLine::sender#plain[sender="3"] { foreground: #D33682; } -ChatLine::sender#plain[sender="4"] { foreground: #6C71C4; } -ChatLine::sender#plain[sender="5"] { foreground: #268BD2; } -ChatLine::sender#plain[sender="6"] { foreground: #2AA198; } -ChatLine::sender#plain[sender="7"] { foreground: #859900; } - -/* -32 */ -/*ChatLine::sender#plain[sender="8"] { foreground: #956900; }*/ -/*ChatLine::sender#plain[sender="9"] { foreground: #AB2B06; }*/ -/*ChatLine::sender#plain[sender="a"] { foreground: #BC120f; }*/ -/*ChatLine::sender#plain[sender="b"] { foreground: #B31662; }*/ -/*ChatLine::sender#plain[sender="c"] { foreground: #4C51A4; }*/ -/*ChatLine::sender#plain[sender="d"] { foreground: #066BB2; }*/ -/*ChatLine::sender#plain[sender="e"] { foreground: #0A8178; }*/ -/*ChatLine::sender#plain[sender="f"] { foreground: #657900; }*/ - -/* +32 */ -ChatLine::sender#plain[sender="8"] { foreground: #D5A920; } -ChatLine::sender#plain[sender="9"] { foreground: #EB6B36; } -ChatLine::sender#plain[sender="a"] { foreground: #FC524f; } -ChatLine::sender#plain[sender="b"] { foreground: #F356A2; } -ChatLine::sender#plain[sender="c"] { foreground: #8C91E4; } -ChatLine::sender#plain[sender="d"] { foreground: #46ABF2; } -ChatLine::sender#plain[sender="e"] { foreground: #4AC1B8; } -ChatLine::sender#plain[sender="f"] { foreground: #A5B920; } - - - - - -/* -** mIRC formats -*/ -ChatLine[format="bold"] { font-weight: bold;} -ChatLine[format="italic"] { font-style: italic; } -ChatLine[format="underline"] { font-style: underline; } - -/* Blues are hard to read. */ -ChatLine[fg-color="2"] { foreground: #15a; } -ChatLine[bg-color="2"] { background: #15a; } -ChatLine[fg-color="c"] { foreground: #15f; } -ChatLine[bg-color="c"] { background: #15f; } - -/* A list of all the colors for easy convienience */ -/* -ChatLine[fg-color="0"] { foreground: white; } -ChatLine[bg-color="0"] { background: white; } -ChatLine[fg-color="1"] { foreground: black; } -ChatLine[bg-color="1"] { background: black; } -ChatLine[fg-color="2"] { foreground: navy; } -ChatLine[bg-color="2"] { background: navy; } -ChatLine[fg-color="3"] { foreground: green; } -ChatLine[bg-color="3"] { background: green; } -ChatLine[fg-color="4"] { foreground: red; } -ChatLine[bg-color="4"] { background: red; } -ChatLine[fg-color="5"] { foreground: darkred; } -ChatLine[bg-color="5"] { background: darkred; } -ChatLine[fg-color="6"] { foreground: purple; } -ChatLine[bg-color="6"] { background: purple; } -ChatLine[fg-color="7"] { foreground: orange; } -ChatLine[bg-color="7"] { background: orange; } -ChatLine[fg-color="8"] { foreground: yellow; } -ChatLine[bg-color="8"] { background: yellow; } -ChatLine[fg-color="9"] { foreground: lightgreen; } -ChatLine[bg-color="9"] { background: lightgreen; } -ChatLine[fg-color="a"] { foreground: teal; } -ChatLine[bg-color="a"] { background: teal; } -ChatLine[fg-color="b"] { foreground: lightcyan; } -ChatLine[bg-color="b"] { background: lightcyan; } -ChatLine[fg-color="c"] { foreground: blue; } -ChatLine[bg-color="c"] { background: blue; } -ChatLine[fg-color="d"] { foreground: pink; } -ChatLine[bg-color="d"] { background: pink; } -ChatLine[fg-color="e"] { foreground: gray; } -ChatLine[bg-color="e"] { background: gray; } -ChatLine[fg-color="f"] { foreground: lightgray; } -ChatLine[bg-color="f"] { background: lightgray; } -*/ - - -/* -** Experimental -*/ -BufferViewDock[active=true] { - /* The circle is hardcoded into the title. */ - /* Color only changes on a refresh (F5) (so it's pointless). */ - /* Also colors the border in Breeze. */ - //color: palette(highlight); -} - -/* -** OS X: Workaround Pallete {} bug -** - https://stackoverflow.com/questions/19748752/qt-style-qpalettewindowtext-color-reverts-after-application-starts -*/ - -QWidget { - color: #dddddd; -} \ No newline at end of file diff --git a/home/apps/quassel.nix b/home/apps/quassel.nix deleted file mode 100644 index 43ad468..0000000 --- a/home/apps/quassel.nix +++ /dev/null @@ -1,4 +0,0 @@ -{pkgs, ...}: { - home.packages = with pkgs; [quasselClient]; - xdg.configFile."quassel-irc.org/style.qss".source = ./quassel-style.qss; -} diff --git a/home/apps/strawberry.nix b/home/apps/strawberry.nix deleted file mode 100644 index d5786a4..0000000 --- a/home/apps/strawberry.nix +++ /dev/null @@ -1 +0,0 @@ -{pkgs, ...}: {home.packages = with pkgs; [strawberry];} diff --git a/home/gui/environments/gnome/default.nix b/home/gui/environments/gnome/default.nix index 9760c0a..267cce4 100644 --- a/home/gui/environments/gnome/default.nix +++ b/home/gui/environments/gnome/default.nix @@ -11,19 +11,10 @@ homeManagerLib = inputs.home-manager.lib.hm; - fontSizesAll = { - default = { - small = "10"; - medium = "12"; - }; + fontSizes = { + small = "10"; + medium = "12"; }; - - fontSizes = - if fontSizesAll ? nixosConfig.networking.hostName - then fontSizesAll.${nixosConfig.networking.hostName} - else fontSizesAll.default; - - isWayland = nixosConfig.services.xserver.displayManager.gdm.wayland; in { imports = with tree; [home.gui.base home.apps.kitty]; @@ -137,7 +128,7 @@ in { area-screenshot-clip = ["Print"]; screenshot = []; screenshot-clip = ["Print"]; - search = mkIf isWayland ["d"]; + search = ["d"]; custom-keybindings = [ # Kitty "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/kitty/" diff --git a/presets/nixos/desktopBase.nix b/presets/nixos/desktopBase.nix index f6a7e53..78229b2 100644 --- a/presets/nixos/desktopBase.nix +++ b/presets/nixos/desktopBase.nix @@ -23,14 +23,12 @@ home.apps.firefox home.apps.telegram home.apps.thunderbird - home.apps.quassel #home.apps.session home.apps.toot-cli home.apps.obsidian home.apps.libreoffice - home.apps.strawberry home.apps.nicotine-plus home.apps.musicutil