From fc7a7355ea523283a602ad2990d42296145a7f42 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Thu, 11 Jul 2024 21:25:18 -0500 Subject: [PATCH 1/5] Merge --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 896d0ed..eb3ab40 100644 --- a/flake.nix +++ b/flake.nix @@ -235,6 +235,7 @@ hardware.nixosModules.framework-13-7040-amd common + password-manager graphical-workstation laptop gaming @@ -244,7 +245,6 @@ { home-manager.users.daniel = { imports = with homeManagerModules; [ - pass senpai iex cargo From 3b685c6d40b44beba6f4d8656c4b6c5e412fc489 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Sat, 13 Jul 2024 10:32:19 -0500 Subject: [PATCH 2/5] Thablet with passwords --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index eb3ab40..c70084f 100644 --- a/flake.nix +++ b/flake.nix @@ -263,6 +263,7 @@ hardware.nixosModules.lenovo-thinkpad-x1-yoga common + password-manager graphical-workstation laptop gaming From 8bb731e21c45c8a18c93fd1589d44dedd46ae44e Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Sat, 13 Jul 2024 14:41:30 -0500 Subject: [PATCH 3/5] Router disko config --- flake.nix | 2 +- modules/nixos/default.nix | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index eb3ab40..0a2785f 100644 --- a/flake.nix +++ b/flake.nix @@ -329,7 +329,7 @@ router = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = with nixosModules; [ - # outputs.diskoConfigurations.unencrypted + outputs.diskoConfigurations.unencrypted common ./nixos/router.nix ]; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index bf0a528..6a6ef30 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -161,9 +161,10 @@ }; password-manager = {pkgs, ...}: { - programs.goldwarden = { - enable = true; - }; + # programs.goldwarden = { + # NOTE: This didn't seem to work for me, but would be awesome! + # enable = true; + # }; home-manager.users.daniel = { imports = with homeManagerModules; [ @@ -238,6 +239,7 @@ imports = with nixosModules; [ postgres podman + troubleshooting-tools ]; environment.sessionVariables.NIXOS_OZONE_WL = "1"; @@ -334,6 +336,7 @@ bottom nmap dogdns + inetutils dnsutils ]; }; @@ -342,7 +345,6 @@ imports = with nixosModules; [ plasma6 fonts - troubleshooting-tools development-tools printing ]; From 8fb3ea82b7855fae8da0200096cb5c1c6eb69f3c Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Sun, 14 Jul 2024 22:16:45 -0500 Subject: [PATCH 4/5] Add "reset-wifi-module" as a useful example of writeShellApplication --- flake.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index d883e46..2b5d56a 100644 --- a/flake.nix +++ b/flake.nix @@ -242,7 +242,7 @@ ./nixos/foxtrot.nix - { + ({pkgs, ...}: { home-manager.users.daniel = { imports = with homeManagerModules; [ senpai @@ -252,7 +252,18 @@ linux-desktop-environment-config ]; }; - } + environment.systemPackages = [ + (pkgs.writeShellApplication + { + name = "reset-wifi-module"; + runtimeInputs = with pkgs; [kmod]; + text = '' + modprobe -rv mt7921e + modprobe -v mt7921e + ''; + }) + ]; + }) ]; }; From cc44a2e7931402e01d5634f199760ecee534b1ac Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Sun, 14 Jul 2024 22:29:42 -0500 Subject: [PATCH 5/5] ectool that works --- flake.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 2b5d56a..9c5ea4a 100644 --- a/flake.nix +++ b/flake.nix @@ -252,8 +252,9 @@ linux-desktop-environment-config ]; }; - environment.systemPackages = [ - (pkgs.writeShellApplication + environment.systemPackages = with pkgs; [ + fw-ectool + (writeShellApplication { name = "reset-wifi-module"; runtimeInputs = with pkgs; [kmod];