Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
takeokunn committed Sep 3, 2024
1 parent 947a663 commit 3061275
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 31 deletions.
3 changes: 0 additions & 3 deletions home-manager/packages/advanced.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion home-manager/packages/basic.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ with pkgs; [
devbox
devenv
du-dust
git
lnav
nkf
offlineimap
Expand Down
2 changes: 1 addition & 1 deletion home-manager/programs/emacs/elisp/init.org
Original file line number Diff line number Diff line change
Expand Up @@ -2717,7 +2717,7 @@

(with-eval-after-load 'gcmh
;; config
(setq gcmh-verbose t)
(setq gcmh-verbose nil)

;; hooks
(defvar my/gcmh-status nil)
Expand Down
59 changes: 39 additions & 20 deletions home-manager/programs/emacs/yasnippet.org
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions nixos/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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; };
Expand All @@ -26,6 +27,7 @@ in {
programs
security
services
sops
systemd
time
users
Expand Down
6 changes: 0 additions & 6 deletions nixos/modules/networking.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
{ config }: {
sops = {
defaultSopsFile = ../../secrets/network.yaml;
age.sshKeyPaths = [ "/home/take/.ssh/id_ed25519" ];
secrets."home-wifi" = { };
};

networking = {
hostName = "nixos";
networkmanager = {
Expand Down
7 changes: 7 additions & 0 deletions nixos/modules/sops.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
sops = {
defaultSopsFile = ../../secrets/network.yaml;
age.sshKeyPaths = [ "/home/take/.ssh/id_ed25519" ];
secrets."home-wifi" = { };
};
}

0 comments on commit 3061275

Please sign in to comment.