From 849d2cf4c399286f18793f3d0b775888c95ca31a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Sun, 19 Jan 2025 14:53:57 +0100
Subject: [PATCH 1/5] fix(desktop): improve GTK config
---
home/desktop/gtk.nix | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/home/desktop/gtk.nix b/home/desktop/gtk.nix
index 8feb106..4571168 100644
--- a/home/desktop/gtk.nix
+++ b/home/desktop/gtk.nix
@@ -1,8 +1,17 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
{
- gtk.enable = true;
- gtk.theme.name = "Adwaita";
- gtk.gtk3.extraConfig.gtk-application-prefer-dark-theme = true;
- gtk.gtk4.extraConfig.gtk-application-prefer-dark-theme = true;
+ gtk = {
+ enable = true;
+ theme.name = "Adwaita";
+ theme.package = pkgs.gnome-themes-extra;
+ gtk3.extraConfig.gtk-application-prefer-dark-theme = true;
+ gtk4.extraConfig.gtk-application-prefer-dark-theme = true;
+ };
+
+ qt = {
+ platformTheme.name = "Adwaita-dark";
+ style.name = "Adwaita-dark";
+ style.package = pkgs.adwaita-qt;
+ };
}
From 13cd6b9ae4a8529b694a949519d796c858e301c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Sun, 19 Jan 2025 14:55:14 +0100
Subject: [PATCH 2/5] feat(home): simplify element autostart
---
home/element.nix | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/home/element.nix b/home/element.nix
index 36a0383..6ff1131 100644
--- a/home/element.nix
+++ b/home/element.nix
@@ -1,23 +1,22 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
let
- # wrapper is needed because otherwise desktop file can't be accessed
- element-desktop = pkgs.symlinkJoin {
- inherit (pkgs.element-desktop) name src meta;
- paths = [ pkgs.element-desktop ];
- nativeBuildInputs = with pkgs; [ makeWrapper ];
- postBuild = ''
- rm -rf $out/share/applications
- mkdir $out/share/applications
- cat "${pkgs.element-desktop}/share/applications/element-desktop.desktop" \
- >"$out/share/applications/element-desktop.desktop"
- '';
+ element-desktop_ = pkgs.element-desktop.override {
+ element-web = pkgs.element-web.override {
+ conf = {
+ showLabsSettings = true;
+ };
+ };
};
+
in
{
- home.packages = [ element-desktop ];
-
- xdg.configFile."autostart/element-desktop.desktop".text =
- builtins.replaceStrings [ "Exec=element-desktop" ] [ "Exec=element-desktop --hidden" ]
- (builtins.readFile "${element-desktop}/share/applications/element-desktop.desktop");
+ home.packages = with pkgs; [
+ element-desktop
+ (makeAutostartItem {
+ name = "element-desktop";
+ package = element-desktop_;
+ prependExtraArgs = [ "--hidden" ];
+ })
+ ];
}
From 728dba2b555dcee9632758c56d4c2216cfb0ac38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Sun, 19 Jan 2025 14:55:36 +0100
Subject: [PATCH 3/5] feat(home): simplify Signal autostart
---
home/signal.nix | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/home/signal.nix b/home/signal.nix
index 5daf200..265d6f4 100644
--- a/home/signal.nix
+++ b/home/signal.nix
@@ -1,9 +1,12 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
{
- home.packages = with pkgs; [ signal-desktop ];
-
- xdg.configFile."autostart/signal-desktop.desktop".text =
- builtins.replaceStrings [ "bin/signal-desktop" ] [ "bin/signal-desktop --start-in-tray" ]
- (builtins.readFile "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop");
+ home.packages = with pkgs; [
+ signal-desktop
+ (makeAutostartItem {
+ name = "signal-desktop";
+ package = signal-desktop;
+ prependExtraArgs = [ "--start-in-tray" ];
+ })
+ ];
}
From 412468eecd7284aa16c2d2fd4d0d2b2ec3dfe8f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Sun, 19 Jan 2025 14:56:23 +0100
Subject: [PATCH 4/5] fix(home): update tor-browser package name
---
home/modules/firefox/tor-browser.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/home/modules/firefox/tor-browser.nix b/home/modules/firefox/tor-browser.nix
index 0b19322..9626100 100644
--- a/home/modules/firefox/tor-browser.nix
+++ b/home/modules/firefox/tor-browser.nix
@@ -12,7 +12,7 @@ common.mkModule {
name = "tor-browser";
displayName = "Tor Browser";
dataConfigPath = ".tor project/firefox";
- defaultPackage = pkgs.tor-browser-bundle-bin;
- defaultPackageName = "pkgs.tor-browser-bundle-bin";
+ defaultPackage = pkgs.tor-browser;
+ defaultPackageName = "pkgs.tor-browser";
isSecure = true;
}
From ce5187c2b7d8376a72476fe41ae7be1b5fd6e229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Sun, 19 Jan 2025 14:51:32 +0100
Subject: [PATCH 5/5] style: reformat & improve some files
---
home/felschr.nix | 7 +------
home/services/easyeffects.nix | 13 ++++++-------
home/shell/kitty.nix | 13 +++++--------
services/jellyfin.nix | 2 +-
4 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/home/felschr.nix b/home/felschr.nix
index 848ec21..44825a3 100644
--- a/home/felschr.nix
+++ b/home/felschr.nix
@@ -1,9 +1,4 @@
-{
- config,
- lib,
- pkgs,
- ...
-}:
+{ lib, pkgs, ... }:
{
imports = [
diff --git a/home/services/easyeffects.nix b/home/services/easyeffects.nix
index 1dee33a..6ba9b19 100644
--- a/home/services/easyeffects.nix
+++ b/home/services/easyeffects.nix
@@ -45,11 +45,10 @@
};
xdg.configFile."easyeffects/autoload/input/alsa_input.usb-Blue_Microphones_Yeti_Stereo_Microphone_REV8-00.analog-stereo:analog-input-mic.json".text =
- builtins.toJSON
- {
- device = "alsa_input.usb-Blue_Microphones_Yeti_Stereo_Microphone_REV8-00.analog-stereo";
- device-description = "Yeti Stereo Microphone Analog Stereo";
- device-profile = "analog-input-mic";
- preset-name = "optimised";
- };
+ builtins.toJSON {
+ device = "alsa_input.usb-Blue_Microphones_Yeti_Stereo_Microphone_REV8-00.analog-stereo";
+ device-description = "Yeti Stereo Microphone Analog Stereo";
+ device-profile = "analog-input-mic";
+ preset-name = "optimised";
+ };
}
diff --git a/home/shell/kitty.nix b/home/shell/kitty.nix
index 7ecce77..36ce7fe 100644
--- a/home/shell/kitty.nix
+++ b/home/shell/kitty.nix
@@ -1,9 +1,4 @@
-{
- config,
- pkgs,
- lib,
- ...
-}:
+{ pkgs, lib, ... }:
with pkgs;
with lib;
@@ -29,6 +24,8 @@ with lib;
};
};
- xdg.configFile."kitty/pass_keys.py".source = "${vimPlugins.nvim-kitty-navigator}/kitty/pass_keys.py";
- xdg.configFile."kitty/neighboring_window.py".source = "${vimPlugins.nvim-kitty-navigator}/kitty/neighboring_window.py";
+ xdg.configFile."kitty/pass_keys.py".source =
+ "${vimPlugins.nvim-kitty-navigator}/kitty/pass_keys.py";
+ xdg.configFile."kitty/neighboring_window.py".source =
+ "${vimPlugins.nvim-kitty-navigator}/kitty/neighboring_window.py";
}
diff --git a/services/jellyfin.nix b/services/jellyfin.nix
index 198f36c..3585b3f 100644
--- a/services/jellyfin.nix
+++ b/services/jellyfin.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
{
services.jellyfin.enable = true;