From 30612759d9127ef8c48780d84f1bd847521a67b3 Mon Sep 17 00:00:00 2001 From: takeokunn Date: Tue, 3 Sep 2024 11:12:37 +0900 Subject: [PATCH] update --- home-manager/packages/advanced.nix | 3 -- home-manager/packages/basic.nix | 1 - home-manager/programs/emacs/elisp/init.org | 2 +- home-manager/programs/emacs/yasnippet.org | 59 ++++++++++++++-------- nixos/default.nix | 2 + nixos/modules/networking.nix | 6 --- nixos/modules/sops.nix | 7 +++ 7 files changed, 49 insertions(+), 31 deletions(-) create mode 100644 nixos/modules/sops.nix diff --git a/home-manager/packages/advanced.nix b/home-manager/packages/advanced.nix index b35b58e..fb55416 100644 --- a/home-manager/packages/advanced.nix +++ b/home-manager/packages/advanced.nix @@ -5,9 +5,6 @@ let ecspresso = pkgs.callPackage ./nixpkgs/ecspresso { }; isucrud = pkgs.callPackage ./nixpkgs/isucrud { }; in with pkgs; [ - # for cli - tokei - # for infra/isucon # mitamae ecspresso diff --git a/home-manager/packages/basic.nix b/home-manager/packages/basic.nix index ce69662..cb47c6a 100644 --- a/home-manager/packages/basic.nix +++ b/home-manager/packages/basic.nix @@ -4,7 +4,6 @@ with pkgs; [ devbox devenv du-dust - git lnav nkf offlineimap diff --git a/home-manager/programs/emacs/elisp/init.org b/home-manager/programs/emacs/elisp/init.org index 2398968..817ae2e 100644 --- a/home-manager/programs/emacs/elisp/init.org +++ b/home-manager/programs/emacs/elisp/init.org @@ -2717,7 +2717,7 @@ (with-eval-after-load 'gcmh ;; config - (setq gcmh-verbose t) + (setq gcmh-verbose nil) ;; hooks (defvar my/gcmh-status nil) diff --git a/home-manager/programs/emacs/yasnippet.org b/home-manager/programs/emacs/yasnippet.org index 3bf2fc3..53985a5 100644 --- a/home-manager/programs/emacs/yasnippet.org +++ b/home-manager/programs/emacs/yasnippet.org @@ -953,41 +953,46 @@ $0 # name: diary-mtg-template-monday # key: diary-mtg-template-monday # -- - ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 0)))` 朝会[0/1] + ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 0)))` 朝会[0/2] SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 0)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 0)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 0)))` 10:15]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 0)))` 10:30] => 0:15 :END: ,*** TODO 日報準備 - ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 1)))` 朝会[0/1] + ,*** TODO 工数入力 + ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 1)))` 朝会[0/2] SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 1)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 1)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 1)))` 10:15]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 1)))` 10:30] => 0:15 :END: ,*** TODO 日報準備 + ,*** TODO 工数入力 ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 1)))` モブプロ会 SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 1)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 1)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 1)))` 10:30]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 1)))` 11:15] => 0:45 :END: - ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 2)))` 朝会[0/1] + ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 2)))` 朝会[0/2] SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 2)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 2)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 2)))` 10:15]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 2)))` 10:30] => 0:15 :END: ,*** TODO 日報準備 - ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))` 朝会[0/1] + ,*** TODO 工数入力 + ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))` 朝会[0/2] SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))` 10:15]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))` 10:30] => 0:15 :END: ,*** TODO 日報準備 - ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 4)))` 朝会[0/1] + ,*** TODO 工数入力 + ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 4)))` 朝会[0/2] SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 4)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 4)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 4)))` 10:15]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 4)))` 10:30] => 0:15 :END: ,*** TODO 日報準備 + ,*** TODO 工数入力 ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 4)))` TGIF SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 4)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 4)))`> :LOGBOOK: @@ -1000,35 +1005,39 @@ $0 # name: diary-mtg-template-tuesday # key: diary-mtg-template-tuesday # -- - ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 0)))` 朝会[0/1] + ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 0)))` 朝会[0/2] SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 0)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 0)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 0)))` 10:15]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 0)))` 10:30] => 0:15 :END: ,*** TODO 日報準備 + ,*** TODO 工数入力 ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 0)))` モブプロ会 SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 0)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 0)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 0)))` 10:30]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 0)))` 11:15] => 0:45 :END: - ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 1)))` 朝会[0/1] + ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 1)))` 朝会[0/2] SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 1)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 1)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 1)))` 10:15]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 1)))` 10:30] => 0:15 :END: ,*** TODO 日報準備 - ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 2)))` 朝会[0/1] + ,*** TODO 工数入力 + ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 2)))` 朝会[0/2] SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 2)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 2)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 2)))` 10:15]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 2)))` 10:30] => 0:15 :END: ,*** TODO 日報準備 - ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))` 朝会[0/1] + ,*** TODO 工数入力 + ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))` 朝会[0/2] SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))` 10:15]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))` 10:30] => 0:15 :END: ,*** TODO 日報準備 + ,*** TODO 工数入力 ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))` TGIF SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))`> :LOGBOOK: @@ -1041,41 +1050,46 @@ $0 # name: diary-mtg-template-friday # key: diary-mtg-template-friday # -- - ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))` 朝会[0/1] + ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))` 朝会[0/2] SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))` 10:15]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))` 10:30] => 0:15 :END: ,*** TODO 日報準備 + ,*** TODO 工数入力 ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))` モブプロ会 SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))` 10:30]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))` 11:15] => 0:45 :END: - ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 4)))` 朝会[0/1] + ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 4)))` 朝会[0/2] SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 4)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 4)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 4)))` 10:15]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 4)))` 10:30] => 0:15 :END: ,*** TODO 日報準備 - ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 5)))` 朝会[0/1] + ,*** TODO 工数入力 + ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 5)))` 朝会[0/2] SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 5)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 5)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 5)))` 10:15]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 5)))` 10:30] => 0:15 :END: ,*** TODO 日報準備 - ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 6)))` 朝会[0/1] + ,*** TODO 工数入力 + ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 6)))` 朝会[0/2] SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 6)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 6)))`> - :LOGBOOK: + :LOGBOOK:n CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 6)))` 10:15]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 6)))` 10:30] => 0:15 :END: ,*** TODO 日報準備 - ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 7)))` 朝会[0/1] + ,*** TODO 工数入力 + ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 7)))` 朝会[0/2] SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 7)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 7)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 7)))` 10:15]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 7)))` 10:30] => 0:15 :END: ,*** TODO 日報準備 + ,*** TODO 工数入力 ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 7)))` TGIF SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 7)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 7)))`> :LOGBOOK: @@ -1088,41 +1102,46 @@ $0 # name: diary-mtg-template-saturday # key: diary-mtg-template-saturday # -- - ,** TODO `(format-time-string "%m-%d %a" (time-add (current-time) (days-to-time 2)))` 朝会[0/1] + ,** TODO `(format-time-string "%m-%d %a" (time-add (current-time) (days-to-time 2)))` 朝会[0/2] SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 2)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 2)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 2)))` 10:15]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 2)))` 10:30] => 0:15 :END: ,*** TODO 日報準備 - ,** TODO `(format-time-string "%m-%d %a" (time-add (current-time) (days-to-time 3)))` 朝会[0/1] + ,*** TODO 工数入力 + ,** TODO `(format-time-string "%m-%d %a" (time-add (current-time) (days-to-time 3)))` 朝会[0/2] SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))` 10:15]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))` 10:30] => 0:15 :END: ,*** TODO 日報準備 + ,*** TODO 工数入力 ,** TODO `(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))` モブプロ会 SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))` 10:30]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 3)))` 11:15] => 0:45 :END: - ,** TODO `(format-time-string "%m-%d %a" (time-add (current-time) (days-to-time 4)))` 朝会[0/1] + ,** TODO `(format-time-string "%m-%d %a" (time-add (current-time) (days-to-time 4)))` 朝会[0/2] SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 4)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 4)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 4)))` 10:15]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 4)))` 10:30] => 0:15 :END: ,*** TODO 日報準備 - ,** TODO `(format-time-string "%m-%d %a" (time-add (current-time) (days-to-time 5)))` 朝会[0/1] + ,*** TODO 工数入力 + ,** TODO `(format-time-string "%m-%d %a" (time-add (current-time) (days-to-time 5)))` 朝会[0/2] SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 5)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 5)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 5)))` 10:15]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 5)))` 10:30] => 0:15 :END: ,*** TODO 日報準備 - ,** TODO `(format-time-string "%m-%d %a" (time-add (current-time) (days-to-time 6)))` 朝会[0/1] + ,*** TODO 工数入力 + ,** TODO `(format-time-string "%m-%d %a" (time-add (current-time) (days-to-time 6)))` 朝会[0/2] SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 6)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 6)))`> :LOGBOOK: CLOCK: [`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 6)))` 10:15]--[`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 6)))` 10:30] => 0:15 :END: ,*** TODO 日報準備 + ,*** TODO 工数入力 ,** TODO `(format-time-string "%m-%d %a" (time-add (current-time) (days-to-time 6)))` TGIF SCHEDULED: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 6)))`> DEADLINE: <`(format-time-string "%Y-%m-%d %a" (time-add (current-time) (days-to-time 6)))`> :LOGBOOK: diff --git a/nixos/default.nix b/nixos/default.nix index 0be2d81..1967a05 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -9,6 +9,7 @@ let programs = import ./modules/programs.nix; security = import ./modules/security.nix { inherit username; }; services = import ./modules/services.nix { inherit username; }; + sops = import ./modules/sops.nix; systemd = import ./modules/systemd.nix; time = import ./modules/time.nix; users = import ./modules/users.nix { inherit pkgs username; }; @@ -26,6 +27,7 @@ in { programs security services + sops systemd time users diff --git a/nixos/modules/networking.nix b/nixos/modules/networking.nix index 905bf2b..6dd9606 100644 --- a/nixos/modules/networking.nix +++ b/nixos/modules/networking.nix @@ -1,10 +1,4 @@ { config }: { - sops = { - defaultSopsFile = ../../secrets/network.yaml; - age.sshKeyPaths = [ "/home/take/.ssh/id_ed25519" ]; - secrets."home-wifi" = { }; - }; - networking = { hostName = "nixos"; networkmanager = { diff --git a/nixos/modules/sops.nix b/nixos/modules/sops.nix new file mode 100644 index 0000000..0eec48f --- /dev/null +++ b/nixos/modules/sops.nix @@ -0,0 +1,7 @@ +{ + sops = { + defaultSopsFile = ../../secrets/network.yaml; + age.sshKeyPaths = [ "/home/take/.ssh/id_ed25519" ]; + secrets."home-wifi" = { }; + }; +}