aboutsummaryrefslogtreecommitdiffstats
path: root/modules/home
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--modules/home.legacy/conf/beets/default.nix11
-rw-r--r--modules/home.legacy/conf/beets/plugins/mbsubmit/default.nix0
-rw-r--r--modules/home.legacy/conf/default.nix1
-rw-r--r--modules/home.legacy/conf/gtk/default.nix2
-rw-r--r--modules/home.legacy/conf/starship/default.nix2
-rw-r--r--modules/home.legacy/conf/swayidle/config5
-rw-r--r--modules/home.legacy/conf/swayidle/config.license9
-rw-r--r--modules/home.legacy/conf/swayidle/default.nix35
-rw-r--r--modules/home.legacy/default.nix35
-rw-r--r--modules/home.legacy/pkgs/default.nix33
10 files changed, 12 insertions, 121 deletions
diff --git a/modules/home.legacy/conf/beets/default.nix b/modules/home.legacy/conf/beets/default.nix
index 0879b1a5..43d6bff9 100644
--- a/modules/home.legacy/conf/beets/default.nix
+++ b/modules/home.legacy/conf/beets/default.nix
@@ -14,7 +14,6 @@
...
}: let
plugins = import ./plugins.nix {};
-
# TODO: Enable xtractor again <2025-03-29>
# package = pkgs.beets.override {
# pluginOverrides = {
@@ -23,7 +22,6 @@
# propagatedBuildInputs = [pkgs.beetsExtraPlugins.xtractor];
# };
# };
- package = pkgs.beets;
in {
imports = [
./plugins
@@ -31,7 +29,14 @@ in {
programs.beets = {
enable = true;
- inherit package;
+ package = pkgs.python3.pkgs.toPythonApplication (pkgs.python3.pkgs.beets.override
+ {
+ ffmpeg = pkgs.ffmpeg-headless;
+ keyfinder-cli = pkgs.keyfinder-cli.override {
+ ffmpeg =
+ pkgs.ffmpeg-headless;
+ };
+ });
settings = {
library = "${config.xdg.dataHome}/beets/library.db";
diff --git a/modules/home.legacy/conf/beets/plugins/mbsubmit/default.nix b/modules/home.legacy/conf/beets/plugins/mbsubmit/default.nix
deleted file mode 100644
index e69de29b..00000000
--- a/modules/home.legacy/conf/beets/plugins/mbsubmit/default.nix
+++ /dev/null
diff --git a/modules/home.legacy/conf/default.nix b/modules/home.legacy/conf/default.nix
index 89502a64..b50068ea 100644
--- a/modules/home.legacy/conf/default.nix
+++ b/modules/home.legacy/conf/default.nix
@@ -24,6 +24,5 @@
./prusa_slicer
./python
./starship
- ./swayidle
];
}
diff --git a/modules/home.legacy/conf/gtk/default.nix b/modules/home.legacy/conf/gtk/default.nix
index 68bef531..e624765b 100644
--- a/modules/home.legacy/conf/gtk/default.nix
+++ b/modules/home.legacy/conf/gtk/default.nix
@@ -15,6 +15,7 @@
gtk = {
enable = true;
theme = {
+ # NOTE: The `nordic` package pulls the whole plasma shell, to copy some stuff from a plasma theme :/ <2026-05-29>
package = pkgs.nordic;
name = "Nordic";
};
@@ -54,6 +55,7 @@
extraCss = "";
};
gtk4 = {
+ theme = config.gtk.theme;
# extraConfig = ''
# gtk-application-prefer-dark-theme=true
# gtk-decoration-layout=icon:minimize,maximize,close
diff --git a/modules/home.legacy/conf/starship/default.nix b/modules/home.legacy/conf/starship/default.nix
index 6a6938f7..c34beb05 100644
--- a/modules/home.legacy/conf/starship/default.nix
+++ b/modules/home.legacy/conf/starship/default.nix
@@ -80,7 +80,7 @@
ignore_submodules = true;
};
git_state = {
- format = "[\($state( $progress_current of $progress_total)\)]($style) ";
+ format = "[($state( $progress_current of $progress_total))]($style) ";
rebase = "[rebasing](bold magenta)";
merge = "[merging](bold yellow)";
revert = "[reverting](bold blue)";
diff --git a/modules/home.legacy/conf/swayidle/config b/modules/home.legacy/conf/swayidle/config
deleted file mode 100644
index a48f670b..00000000
--- a/modules/home.legacy/conf/swayidle/config
+++ /dev/null
@@ -1,5 +0,0 @@
-timeout 180 'swaylock -fF'
-
-timeout 360 'systemctl suspend-then-hibernate'
-
-before-sleep 'swaylock -f'
diff --git a/modules/home.legacy/conf/swayidle/config.license b/modules/home.legacy/conf/swayidle/config.license
deleted file mode 100644
index eae6a84c..00000000
--- a/modules/home.legacy/conf/swayidle/config.license
+++ /dev/null
@@ -1,9 +0,0 @@
-nixos-config - My current NixOS configuration
-
-Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de>
-SPDX-License-Identifier: GPL-3.0-or-later
-
-This file is part of my nixos-config.
-
-You should have received a copy of the License along with this program.
-If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
diff --git a/modules/home.legacy/conf/swayidle/default.nix b/modules/home.legacy/conf/swayidle/default.nix
deleted file mode 100644
index 4483c8b9..00000000
--- a/modules/home.legacy/conf/swayidle/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-# nixos-config - My current NixOS configuration
-#
-# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de>
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# This file is part of my nixos-config.
-#
-# You should have received a copy of the License along with this program.
-# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
-{...}: {
- # TODO: This fails to hibernate when the hardware swap was not previously activated. <2025-04-04>
- xdg.configFile."swayidle/config".source = ./config;
-
- # services.swayidle = {
- # enable = true;
- # events = [
- # {
- # event = "before-sleep";
- # command = "${pkgs.swaylock}/bin/swaylock -f ";
- # }
- # ];
- # timeouts = [
- # {
- # timeout = 180;
- # command = "${pkgs.swaylock}/bin/swaylock -fFu ";
- # }
- # {
- # timeout = 360;
- # # TODO: systemctl is installed?
- # command = "systemctl suspend-then-hibernate";
- # }
- # ];
- # # systemdTarget = ""; # TODO: this might be usefull
- # };
-}
diff --git a/modules/home.legacy/default.nix b/modules/home.legacy/default.nix
index 8fb209f3..7cc9bb45 100644
--- a/modules/home.legacy/default.nix
+++ b/modules/home.legacy/default.nix
@@ -7,17 +7,7 @@
#
# You should have received a copy of the License along with this program.
# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
-{config, ...}: let
- inherit (config.home) homeDirectory;
-
- # xdg
- configHome = "${homeDirectory}/.config";
- dataHome = "${homeDirectory}/.local/share";
- stateHome = "${homeDirectory}/.local/state";
- cacheHome = "${homeDirectory}/.cache";
- binHome = "${homeDirectory}/.local/bin";
- # TODO: add XDG_RUNTIME_DIR
-in {
+{...}: {
imports = [
./conf
./files
@@ -26,27 +16,4 @@ in {
# I don't know what this does, but I've seen it a lot online, so it should be good, right?
programs.home-manager.enable = true;
-
- xdg = {
- enable = true;
- inherit configHome dataHome stateHome cacheHome; #binHome; # TODO: add binHome, when the standard is extended
-
- /*
- TODO: add this
- desktopEntries = {};
- */
-
- userDirs = {
- enable = true;
- createDirectories = true;
- desktop = null;
- documents = "${homeDirectory}/documents/general";
- download = "/tmp/download";
- music = "${homeDirectory}/media/music";
- pictures = "${homeDirectory}/media/pictures";
- videos = "${homeDirectory}/media/videos";
- templates = "${homeDirectory}/media/templates";
- publicShare = "${homeDirectory}/media/public";
- };
- };
}
diff --git a/modules/home.legacy/pkgs/default.nix b/modules/home.legacy/pkgs/default.nix
index 5ab1e73b..840ffb19 100644
--- a/modules/home.legacy/pkgs/default.nix
+++ b/modules/home.legacy/pkgs/default.nix
@@ -16,26 +16,13 @@
# TODO: Remove this whole file, and move each package to a separate module. <2024-11-16>
with pkgs; let
Gui = {
- Terminals = [
- alacritty # default terminal
- ];
-
Misc = [
keepassxc # password manager
];
};
TuiCli = {
- Social = [
- iamb # best tui matrix client (as of today)
- ];
-
- Pdfs = [
- con2pdf # Scanner implementation
- ];
-
Misc = [
- killall # kill a application by name
bc # Smart calculator
aumo # Automatic mount
jq # Json parser
@@ -60,16 +47,6 @@ with pkgs; let
];
};
- Media = {
- View = [
- zathura # PDF viewer
- ];
-
- YouTube = [
- yt # A command line YouTube client
- ];
- };
-
Hardware = {
Storage = [
# TODO: smartmontools # Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives
@@ -103,16 +80,6 @@ with pkgs; let
ripgrep # A search tool that combines the usability of ag with the raw speed of grep
file # Show information about a file
];
-
- Programming = {
- GeneralTools = [
- stamp # Add a license header to a file
- git # the fast distributed version control system
- git-edit-index # Allows you to edit the indexed version of a file
- git-cm # A wrapper that re-adds the last commit's subject
- glow # Command-line markdown renderer
- ];
- };
};
mapFun = x:
if builtins.isAttrs x
generated by cgit v1.3.1 (git 2.54.0) at 2026-07-28 16:00:18 +0000