From b40d9c7ca52eed3e2eed31ef73567db86d562935 Mon Sep 17 00:00:00 2001 From: Stefan Weigl-Bosker Date: Sun, 27 Jul 2025 15:10:18 -0400 Subject: sync --- fw/configuration.nix | 1 - modules/default.nix | 3 ++- modules/git/default.nix | 1 + modules/rmpc.nix | 18 ------------------ nixos/default.nix | 4 ++-- nixos/yubikey.nix | 1 + 6 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 modules/rmpc.nix diff --git a/fw/configuration.nix b/fw/configuration.nix index 0b9ebe3..3fd8ba2 100644 --- a/fw/configuration.nix +++ b/fw/configuration.nix @@ -30,7 +30,6 @@ defaultSession = "sway"; gdm.enable = true; }; - # desktopManager.gnome.enable = true; }; services.kmonad = { diff --git a/modules/default.nix b/modules/default.nix index f3ac693..f336d39 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -28,6 +28,7 @@ ./zoxide.nix ./firefox.nix ./mpd.nix - ./rmpc.nix + ./rmpc + ./py3status ]; } diff --git a/modules/git/default.nix b/modules/git/default.nix index 459ae1c..73a19e3 100644 --- a/modules/git/default.nix +++ b/modules/git/default.nix @@ -60,6 +60,7 @@ in ]; signing = { signByDefault = true; + # key = "7783298ECC2A778EAC7EF1C8C430A3B6C37610D1"; }; extraConfig = { init.defaultBranch = "main"; diff --git a/modules/rmpc.nix b/modules/rmpc.nix deleted file mode 100644 index c3e9303..0000000 --- a/modules/rmpc.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - cfg = config.modules.rmpc; -in -{ - options.modules.rmpc.enable = lib.mkEnableOption "rmpc"; - - config = lib.mkIf cfg.enable { - programs.rmpc = { - enable = true; - }; - }; -} diff --git a/nixos/default.nix b/nixos/default.nix index 7fe9e5a..b2fdf38 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -70,11 +70,9 @@ in kernelPackages = pkgs.linuxPackages_latest; kernelParams = [ "quiet" - "splash" "rd.systemd.show_status=false" "rd.udev.log_level=3" "udev.log_priority=3" - "boot.shell_on_fail" ]; loader = { timeout = 0; @@ -95,6 +93,8 @@ in networkmanager.enable = cfg.wifi; }; + # qt.enable = true; + documentation.dev.enable = true; users.users."${cfg.username}" = { diff --git a/nixos/yubikey.nix b/nixos/yubikey.nix index ce3d5d3..2e3066e 100644 --- a/nixos/yubikey.nix +++ b/nixos/yubikey.nix @@ -1,3 +1,4 @@ +# ykman openpgp set-touch {sig,enc,aut} { config, lib, -- cgit v1.2.3