From 01667e2346147bb6f1f6bd9a1e94e0b04a90fb21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20Schr=C3=B6ter?= Date: Fri, 20 Mar 2026 09:27:23 +0100 Subject: [PATCH] cleanup themes fix small errors in themes and reset folder changed to preserve initial Nextcloud sync --- configuration.nix | 7 ++- flake.lock | 48 +++++++++---------- home/default.nix | 7 +-- home/programs/eww/src/bar.yuck | 4 +- home/programs/nixvim/plugins/mkdnflow.nix | 9 ++-- home/programs/taskwarrior/default.nix | 2 +- home/programs/zk.nix | 2 +- home/services/emanote.nix | 2 +- home/themes/catppuccin/default.nix | 4 +- home/themes/catppuccin/taskwarrior.nix | 2 +- ...in-taskwarrior.theme => taskwarrior.theme} | 0 11 files changed, 45 insertions(+), 42 deletions(-) rename home/themes/catppuccin/{catppuccin-taskwarrior.theme => taskwarrior.theme} (100%) diff --git a/configuration.nix b/configuration.nix index c862f08..688a643 100644 --- a/configuration.nix +++ b/configuration.nix @@ -69,6 +69,10 @@ river-classic.enable = true; ssh.startAgent = true; zsh.enable = true; + fuse = { + enable = true; + userAllowOther = true; + }; }; # Define a user account. @@ -97,7 +101,7 @@ accent = "pink"; font = "Fira Code"; fontSize = "9"; - background = "${inputs.images}/lockpaper.jpg"; + background = "${inputs.images}/lockpaper.png"; loginBackground = true; userIcon = true; }) @@ -117,6 +121,7 @@ networkmanager-vpnc rcon-cli imv + sshfs acpilight # For setting Backlight. dbus diff --git a/flake.lock b/flake.lock index ed57f9e..f98a557 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1773367248, - "narHash": "sha256-FFMc1uAwy2GYasd0rdNDVxKyAgzuoJH2M+GglBQbqf0=", + "lastModified": 1773810247, + "narHash": "sha256-6Vz1Thy/1s7z+Rq5OfkWOBAdV4eD+OrvDs10yH6xJzQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "be0c641a6a5564caa33982faa1fe2c60d92131c7", + "rev": "d47357a4c806d18a3e853ad2699eaec3c01622e7", "type": "github" }, "original": { @@ -120,11 +120,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1773360308, - "narHash": "sha256-Asr6gDwzxvcglRaXEZSTL4lEA6braemURJc6wKBhKrs=", + "lastModified": 1773792437, + "narHash": "sha256-xjL22RjFqfN3D4dglBt0PTEFLl1rvN60f6LtHX8kQJs=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "b550599eedc54514f5b71cee8e480e337d104d84", + "rev": "7f54fc34e0ff994dff6494f074979ad6e4a0eba4", "type": "github" }, "original": { @@ -136,11 +136,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1773359104, - "narHash": "sha256-vWu0zLThxpsx6vbPK5eAgvkMKu1LV8tbybS/sjWn8S8=", + "lastModified": 1773789001, + "narHash": "sha256-V4hVxVeHk+ZdlaRpssBu6q9G3++WwxBco5MZVTL9E/I=", "owner": "neovim", "repo": "neovim", - "rev": "957eb1fde04496b4a2c07fd8427a8d78844d1bf7", + "rev": "1d776d909f54dd6298710d50f72e25972b6755bf", "type": "github" }, "original": { @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1773369788, - "narHash": "sha256-32y9nyVU2rmXp/zMTNsVbIWNKMPUuBSj4bIAnaPiCVU=", + "lastModified": 1773802261, + "narHash": "sha256-yA91ySZRw9x7aLSy79LCWXt3l05lwNIfuNnGqz7Jy5A=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "70e188702ad3b4dcf5de12ff64f0d31c906d6d7a", + "rev": "af36c53062b124e097e2a545c68eacfde3fc715b", "type": "github" }, "original": { @@ -187,11 +187,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1773201692, - "narHash": "sha256-NXrKzNMniu4Oam2kAFvqJ3GB2kAvlAFIriTAheaY8hw=", + "lastModified": 1773628058, + "narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b6067cc0127d4db9c26c79e4de0513e58d0c40c9", + "rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df", "type": "github" }, "original": { @@ -203,11 +203,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1773282481, - "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=", + "lastModified": 1773734432, + "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127", + "rev": "cda48547b432e8d3b18b4180ba07473762ec8558", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1773282481, - "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=", + "lastModified": 1773734432, + "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127", + "rev": "cda48547b432e8d3b18b4180ba07473762ec8558", "type": "github" }, "original": { @@ -261,11 +261,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1773383285, - "narHash": "sha256-0WbZSixyNQ6tUwScDKLg77+ClaetrvO3zBkn9p66iYs=", + "lastModified": 1773866737, + "narHash": "sha256-gWrYAWSEUzFD1aig3z+zeFCqHrfjkm0Tj66eZmCIcVA=", "owner": "nix-community", "repo": "NUR", - "rev": "9dbc79857dc2d1cb5acdc8a71df0902f966f9a2b", + "rev": "1a83b2d5d9a23041f9ddb170a21cefb8f02e0e45", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index dba8bca..a8ac30e 100644 --- a/home/default.nix +++ b/home/default.nix @@ -33,7 +33,6 @@ # archives unzip zip - fuse # misc tree @@ -42,7 +41,6 @@ # system tools lm_sensors pavucontrol - sshfs cups firefox @@ -57,6 +55,9 @@ # ── whatsie insecure ────────────────────────────────────────────────── nixpkgs.config = { allowUnfree = true; - permittedInsecurePackages = [ "electron-32.3.3" "qtwebengine-5.15.19" ]; + permittedInsecurePackages = [ + "electron-32.3.3" + "qtwebengine-5.15.19" + ]; }; } diff --git a/home/programs/eww/src/bar.yuck b/home/programs/eww/src/bar.yuck index 57480a8..bf0dfda 100644 --- a/home/programs/eww/src/bar.yuck +++ b/home/programs/eww/src/bar.yuck @@ -57,10 +57,10 @@ (box :space-evenly false (button - :class "${idle_inhibitor == 'start' ? 'idleOn' : 'idleOff' }" + :class "${idle_inhibitor == 'stop' ? 'idleOff' : 'idleOn' }" :onclick "systemctl --user is-active hypridle.service && systemctl --user stop hypridle.service || systemctl --user start hypridle.service" (label - :text "${idle_inhibitor == 'start' ? '󰈈' : '󰛐' }")))) + :text "${idle_inhibitor == 'stop' ? '󰛐' : '󰈈' }")))) ;; ── Audio ─────────────────────────────────────────────────────────── diff --git a/home/programs/nixvim/plugins/mkdnflow.nix b/home/programs/nixvim/plugins/mkdnflow.nix index 2e01277..dd4ea42 100644 --- a/home/programs/nixvim/plugins/mkdnflow.nix +++ b/home/programs/nixvim/plugins/mkdnflow.nix @@ -52,7 +52,7 @@ "-" "X" ]; - update_parents = true; + status_propagation.up = true; }; foldtext = { title_transformer.__raw = '' @@ -169,11 +169,8 @@ new_file_template = { use_template = true; placeholders = { - before = { - title = "link_title"; - date = "os_date"; - }; - after = { }; + title = "link_title"; + date = "os_date"; }; template = '' --- diff --git a/home/programs/taskwarrior/default.nix b/home/programs/taskwarrior/default.nix index 44b70de..250b475 100644 --- a/home/programs/taskwarrior/default.nix +++ b/home/programs/taskwarrior/default.nix @@ -12,7 +12,7 @@ programs.taskwarrior = { enable = true; package = pkgs.taskwarrior3; - dataLocation = "~/Nextcloud/tasks"; + dataLocation = "~/Nextcloud/.tasks"; config = { uda.parentName = { type = "string"; diff --git a/home/programs/zk.nix b/home/programs/zk.nix index 2752d60..bc07c42 100644 --- a/home/programs/zk.nix +++ b/home/programs/zk.nix @@ -12,7 +12,7 @@ }; tool.fzf-preview = "bat -p --color always {-1}"; notebook = { - dir = "~/zettelkasten"; # TODO: change location to Nextcloud + dir = "~/Nextcloud/zettelkasten"; }; alias = { n = "zk new inbox/$@"; diff --git a/home/services/emanote.nix b/home/services/emanote.nix index 96cb722..43e01af 100644 --- a/home/services/emanote.nix +++ b/home/services/emanote.nix @@ -15,7 +15,7 @@ in # host = "127.0.0.1"; # default listen address is 127.0.0.1 # port = 7000; # default http port is 7000 notes = [ - "/home/elias/zettelkasten" + "/home/elias/Nextcloud/zettelkasten" ]; # TODO: currentSystem package = emanote.packages."x86_64-linux".default; diff --git a/home/themes/catppuccin/default.nix b/home/themes/catppuccin/default.nix index bef3a47..90e0d3c 100644 --- a/home/themes/catppuccin/default.nix +++ b/home/themes/catppuccin/default.nix @@ -7,11 +7,11 @@ imports = [ ./cursor.nix ./fnott.nix - ./gtk.nix + # ./gtk.nix TODO: check why so weird ./hyprlock.nix ./nvim.nix ./taskwarrior.nix - ./qt.nix + # ./qt.nix TODO: check why so weird ]; catppuccin = { diff --git a/home/themes/catppuccin/taskwarrior.nix b/home/themes/catppuccin/taskwarrior.nix index 28357c8..4dfe398 100644 --- a/home/themes/catppuccin/taskwarrior.nix +++ b/home/themes/catppuccin/taskwarrior.nix @@ -1,5 +1,5 @@ { ... }: { - programs.taskwarrior.colorTheme = ./catppuccin-taskwarrior.theme; + programs.taskwarrior.colorTheme = ./taskwarrior.theme; } diff --git a/home/themes/catppuccin/catppuccin-taskwarrior.theme b/home/themes/catppuccin/taskwarrior.theme similarity index 100% rename from home/themes/catppuccin/catppuccin-taskwarrior.theme rename to home/themes/catppuccin/taskwarrior.theme