From 2a4ffdf9a597712472175a4fb58570cca75fbcea Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Sat, 6 Sep 2025 16:01:00 +0200 Subject: [PATCH 1/7] feat(home): add obsidian --- home/pkgs.nix | 1 + nixos/configurations.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/home/pkgs.nix b/home/pkgs.nix index 2bfc240..dd0767c 100644 --- a/home/pkgs.nix +++ b/home/pkgs.nix @@ -92,6 +92,7 @@ with pkgs; nodePackages.prettier map-cmd obs-studio + obsidian offlineimap openscad openssl diff --git a/nixos/configurations.nix b/nixos/configurations.nix index 248c4c4..f583b9f 100644 --- a/nixos/configurations.nix +++ b/nixos/configurations.nix @@ -19,6 +19,7 @@ let builtins.elem (nixpkgs.lib.getName pkg) [ "aspell-dict-en-science" "brgenml1lpr" + "obsidian" "saleae-logic-2" "spotify" "steam" From 0ec34b24a0fcac75918c0549557c492dbd172d46 Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Sun, 7 Sep 2025 15:35:56 +0200 Subject: [PATCH 2/7] feat(stolas): add tool for talking to EC --- nixos/stolas/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/stolas/default.nix b/nixos/stolas/default.nix index 606f4f8..5ff063a 100644 --- a/nixos/stolas/default.nix +++ b/nixos/stolas/default.nix @@ -45,9 +45,11 @@ }; environment.systemPackages = [ + config.dadada.pkgs.repo-rs # For debugging and troubleshooting Secure Boot. pkgs.sbctl - config.dadada.pkgs.repo-rs + # Framework embedded controller interface + pkgs.fw-ectool ]; hardware = { From ca8707f1162dd508e63803e388d8834b493e31ee Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Tue, 7 Oct 2025 20:28:01 +0200 Subject: [PATCH 3/7] chore: update nixpkgs --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 6dd8573..60f3602 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1756115622, - "narHash": "sha256-iv8xVtmLMNLWFcDM/HcAPLRGONyTRpzL9NS09RnryRM=", + "lastModified": 1758287904, + "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", "owner": "nix-community", "repo": "disko", - "rev": "bafad29f89e83b2d861b493aa23034ea16595560", + "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", "type": "github" }, "original": { @@ -204,11 +204,11 @@ ] }, "locked": { - "lastModified": 1756496801, - "narHash": "sha256-IYIsnPy+cJxe8RbDHBrCtfJY0ry2bG2H7WvMcewiGS8=", + "lastModified": 1759853171, + "narHash": "sha256-uqbhyXtqMbYIiMqVqUhNdSuh9AEEkiasoK3mIPIVRhk=", "owner": "nix-community", "repo": "home-manager", - "rev": "77a71380c38fb2a440b4b5881bbc839f6230e1cb", + "rev": "1a09eb84fa9e33748432a5253102d01251f72d6d", "type": "github" }, "original": { @@ -295,11 +295,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1756245047, - "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=", + "lastModified": 1759582739, + "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7", + "rev": "3441b5242af7577230a78ffb03542add264179ab", "type": "github" }, "original": { @@ -311,11 +311,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756386758, - "narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=", + "lastModified": 1759733170, + "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dfb2f12e899db4876308eba6d93455ab7da304cd", + "rev": "8913c168d1c56dc49a7718685968f38752171c3b", "type": "github" }, "original": { @@ -462,11 +462,11 @@ ] }, "locked": { - "lastModified": 1755934250, - "narHash": "sha256-CsDojnMgYsfshQw3t4zjRUkmMmUdZGthl16bXVWgRYU=", + "lastModified": 1758728421, + "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "74e1a52d5bd9430312f8d1b8b0354c92c17453e5", + "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1", "type": "github" }, "original": { From 483552d217e6937c6c05c5138c31fa9c37b770a3 Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Tue, 7 Oct 2025 20:51:17 +0200 Subject: [PATCH 4/7] fix: disable use user nixpkgs --- nixos/modules/profiles/home.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/profiles/home.nix b/nixos/modules/profiles/home.nix index a695e8b..97911df 100644 --- a/nixos/modules/profiles/home.nix +++ b/nixos/modules/profiles/home.nix @@ -1,7 +1,6 @@ { pkgs, inputs, ... }: { home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; home-manager.sharedModules = pkgs.lib.attrValues inputs.self.hmModules; home-manager.users.dadada = inputs.self.hmConfigurations.dadada; } From c69c54d0f9e5f9525c10e3064e8bced9393e4621 Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Tue, 7 Oct 2025 21:13:15 +0200 Subject: [PATCH 5/7] fix: remove home.nix from gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 01c6686..646051f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ private/ -home.nix *.swp result *.zip From 1bf32e017788b9aadf0fc60a3c9907be559cb1af Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Tue, 7 Oct 2025 22:17:00 +0200 Subject: [PATCH 6/7] fix: remove syncthing module and zsh-git-prompt https://github.com/NixOS/nixpkgs/pull/437745 --- home/default.nix | 3 +-- home/modules/syncthing.nix | 21 --------------------- home/modules/zsh.nix | 2 -- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 home/modules/syncthing.nix diff --git a/home/default.nix b/home/default.nix index ef17f7c..242a5fe 100644 --- a/home/default.nix +++ b/home/default.nix @@ -12,7 +12,6 @@ let "gpg" #"gtk" #"keyring" - "syncthing" "tmux" "xdg" "zsh" @@ -433,7 +432,7 @@ in } ''; - #services.poweralertd.enable = true; + services.syncthing.enable = true; # Let Home Manager install and manage itself. programs.home-manager.enable = true; diff --git a/home/modules/syncthing.nix b/home/modules/syncthing.nix deleted file mode 100644 index 8095904..0000000 --- a/home/modules/syncthing.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -with lib; -let - cfg = config.dadada.home.syncthing; -in -{ - options.dadada.home.syncthing = { - enable = mkEnableOption "Enable Syncthing config"; - }; - config = mkIf cfg.enable { - services.syncthing = { - enable = true; - tray = false; - }; - }; -} diff --git a/home/modules/zsh.nix b/home/modules/zsh.nix index b6d307b..1c90be9 100644 --- a/home/modules/zsh.nix +++ b/home/modules/zsh.nix @@ -35,7 +35,6 @@ in plugins = [ ]; initContent = '' - source ${pkgs.zsh-git-prompt}/share/zsh-git-prompt/zshrc.sh source ${pkgs.fzf}/share/fzf/key-bindings.zsh source ${pkgs.fzf}/share/fzf/completion.zsh eval "$(repo setup --root ~/src)" @@ -76,7 +75,6 @@ in home.packages = with pkgs; [ fzf eza - zsh-git-prompt tmux ]; }; From f1ee732c7ce4d03936e7aceab84d3ac1c9afacb8 Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Tue, 7 Oct 2025 22:23:46 +0200 Subject: [PATCH 7/7] fix: temporarily remove broken packages --- home/pkgs.nix | 6 ++++-- nixos/stolas/default.nix | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/home/pkgs.nix b/home/pkgs.nix index dd0767c..5e67ea0 100644 --- a/home/pkgs.nix +++ b/home/pkgs.nix @@ -69,7 +69,8 @@ with pkgs; krita ldns liboping # oping, ping multiple hosts at once - libreoffice + # FIXME: broken in nixpkgs + #libreoffice libvirt lsof lynis @@ -122,7 +123,8 @@ with pkgs; skim # fzf in Rust slurp socat - solvespace + # FIXME: broken in nixpkgs + #solvespace spotify sqlite sshfs-fuse diff --git a/nixos/stolas/default.nix b/nixos/stolas/default.nix index 5ff063a..d86a8ff 100644 --- a/nixos/stolas/default.nix +++ b/nixos/stolas/default.nix @@ -49,7 +49,8 @@ # For debugging and troubleshooting Secure Boot. pkgs.sbctl # Framework embedded controller interface - pkgs.fw-ectool + # FIXME: build broken in nixpkgs + #pkgs.fw-ectool ]; hardware = { @@ -62,7 +63,8 @@ enable = true; extraPackages = with pkgs; [ vaapiVdpau - libvdpau-va-gl + # FIXME: broken in nixpkgs + # libvdpau-va-gl ]; }; };