From b283eb634ff68cd9b79e9e5c62118f7607795b41 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Sun, 9 Jul 2023 22:49:16 +0200 Subject: [PATCH] wlsunset, dwarf fortress, mail fixes --- flake.lock | 48 ++++++++++---------- flake.nix | 1 - hosts/falkenstein-1/modules/mail/default.nix | 2 +- users/rouven/fixes.nix | 2 + users/rouven/modules/accounts/default.nix | 7 ++- users/rouven/modules/packages.nix | 4 +- users/rouven/modules/ssh/default.nix | 4 ++ users/rouven/modules/wayland/default.nix | 9 ++++ 8 files changed, 48 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index 6fbe8aa..bea77b1 100644 --- a/flake.lock +++ b/flake.lock @@ -171,11 +171,11 @@ ] }, "locked": { - "lastModified": 1688552611, - "narHash": "sha256-pV/1/AU1l5CNFeKmdJ1jofcaKHhtKAbxY4gazeCyoSo=", + "lastModified": 1688892808, + "narHash": "sha256-AeWzyG37EqyHH2C1GmrV9y0ZQ4e7rAs9AUOnw8I4YUI=", "owner": "nix-community", "repo": "home-manager", - "rev": "b23c7501f7e0a001486c9a5555a6c53ac7b08e85", + "rev": "b70db52ff06f30e3de7f21b6ea47e75baa0c46f6", "type": "github" }, "original": { @@ -272,11 +272,11 @@ ] }, "locked": { - "lastModified": 1687097842, - "narHash": "sha256-NPAaRZx5foWLgIPfEaiEZMr9JIlEQhLEVEXpx09341Q=", + "lastModified": 1688874465, + "narHash": "sha256-BUwl+tq40EjkufTZkqf3lWFzxOA/mYBTHz+p5uJtjaY=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "c8210cb3fcde6860255b54ddba74dc177e6232cd", + "rev": "757114749d4613cf71f3748e780a1be8a67a5d3c", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1686838567, - "narHash": "sha256-aqKCUD126dRlVSKV6vWuDCitfjFrZlkwNuvj5LtjRRU=", + "lastModified": 1688798314, + "narHash": "sha256-MFG5rx7L756rtrPHsL662m64AZ4sKqUcApaiYgSKfNM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "429f232fe1dc398c5afea19a51aad6931ee0fb89", + "rev": "47dca15d86fdd2eabcf434d7cc0b5baa8d1a463c", "type": "github" }, "original": { @@ -301,11 +301,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1688500189, - "narHash": "sha256-djYYiY4lzJOlXOnTHytH6BUugrxHDZjuGxTSrU4gt4M=", + "lastModified": 1688679045, + "narHash": "sha256-t3xGEfYIwhaLTPU8FLtN/pLPytNeDwbLI6a7XFFBlGo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "78419edadf0fabbe5618643bd850b2f2198ed060", + "rev": "3c7487575d9445185249a159046cc02ff364bff8", "type": "github" }, "original": { @@ -347,11 +347,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1688256355, - "narHash": "sha256-/E+OSabu4ii5+ccWff2k4vxDsXYhpc4hwnm0s6JOz7Y=", + "lastModified": 1688868408, + "narHash": "sha256-RR9N5XTAxSBhK8MCvLq9uxfdkd7etC//seVXldy0k48=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f553c016a31277246f8d3724d3b1eee5e8c0842c", + "rev": "510d721ce097150ae3b80f84b04b13b039186571", "type": "github" }, "original": { @@ -399,11 +399,11 @@ ] }, "locked": { - "lastModified": 1688283850, - "narHash": "sha256-MYqRBDJL1DJHbwexYxDb/9R1qvuhYakh1E+SfzDadc8=", + "lastModified": 1688900520, + "narHash": "sha256-D4E+IrHziNftnoGb+lhgNx4Z/AniwPqR8JMD24yc8UI=", "owner": "therealr5", "repo": "purge", - "rev": "0a5ca0cc596afd360639bfd8ac6187245b3734ec", + "rev": "53ae6908ef0887fa9f704ea2ba30bf13df4551ed", "type": "github" }, "original": { @@ -460,11 +460,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1688268466, - "narHash": "sha256-fArazqgYyEFiNcqa136zVYXihuqzRHNOOeVICayU2Yg=", + "lastModified": 1688873469, + "narHash": "sha256-9TMSXvXmrr7bDYi+WeskWe/yho9UP01dGbV9vW5bRVc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5ed3c22c1fa0515e037e36956a67fe7e32c92957", + "rev": "b2047c8fc963407916ad3834165309007dc5a1f7", "type": "github" }, "original": { @@ -495,11 +495,11 @@ ] }, "locked": { - "lastModified": 1688282790, - "narHash": "sha256-7+/witOmi7o6oPp8ILjcY/2BBjQnTaeOkeJ+NND3ZjI=", + "lastModified": 1688900567, + "narHash": "sha256-5VM0E4zliCizOL3lx5oZQkmENP+/Ps1RETPhK0kU5GY=", "owner": "therealr5", "repo": "TruckSimulatorBot", - "rev": "f2b10439be8238ed2123851dd80f280b8ca2eddc", + "rev": "493ec06bf8460541c76b9e2e208f5d156b4e82d1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f3a84cc..150b685 100644 --- a/flake.nix +++ b/flake.nix @@ -39,7 +39,6 @@ }; lanzaboote = { - # url = "github:therealr5/lanzaboote/stub-platform-fix"; url = "github:nix-community/lanzaboote/v0.3.0"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/hosts/falkenstein-1/modules/mail/default.nix b/hosts/falkenstein-1/modules/mail/default.nix index 9fbc150..d1bc016 100644 --- a/hosts/falkenstein-1/modules/mail/default.nix +++ b/hosts/falkenstein-1/modules/mail/default.nix @@ -72,7 +72,7 @@ in smtpd_sasl_auth_enable = true; smtpd_sasl_path = "/var/lib/postfix/auth"; smtpd_sasl_type = "dovecot"; - local_transport = "lmtp:unix:/run/dovecot2/dovecot-lmtp"; + mailbox_transport = "lmtp:unix:/run/dovecot2/dovecot-lmtp"; }; }; diff --git a/users/rouven/fixes.nix b/users/rouven/fixes.nix index 396f429..0ed260f 100644 --- a/users/rouven/fixes.nix +++ b/users/rouven/fixes.nix @@ -11,6 +11,8 @@ allowedTCPPortRanges = [{ from = 1714; to = 1764; }]; allowedUDPPortRanges = allowedTCPPortRanges; }; + # wayland keylogger needs setuid + programs.wshowkeys.enable = true; # fixes pam entries for swaylock security.pam.services.swaylock.text = '' # Account management. diff --git a/users/rouven/modules/accounts/default.nix b/users/rouven/modules/accounts/default.nix index 9b59027..8ae0ef9 100644 --- a/users/rouven/modules/accounts/default.nix +++ b/users/rouven/modules/accounts/default.nix @@ -225,6 +225,11 @@ in farPattern = "Drafts"; extraConfig.Create = "near"; }; + channels.spamtrain = { + nearPattern = "Spamtrain"; + farPattern = "Spamtrain"; + extraConfig.Create = "near"; + }; }; extraConfig = { account = { @@ -237,7 +242,7 @@ in { enable = true; mailboxName = "  iFSR"; - extraMailboxes = lib.lists.forEach [ c.admin c.sent c.trash c.junk c.drafts ] (x: x.nearPattern); + extraMailboxes = lib.lists.forEach [ c.admin c.sent c.spamtrain c.trash c.junk c.drafts ] (x: x.nearPattern); }; }; "gmail" = rec { diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix index 523541e..162f63b 100644 --- a/users/rouven/modules/packages.nix +++ b/users/rouven/modules/packages.nix @@ -14,8 +14,6 @@ ffmpeg drawio - thunderbird - # sound pavucontrol x32edit @@ -33,6 +31,7 @@ gomuks # alternative matrix client # games + dwarf-fortress-packages.dwarf-fortress-full prismlauncher # minecraft, but it actually works # not anymore lol superTuxKart @@ -44,6 +43,7 @@ pass # misc + btop asciinema neofetch # obligatory virt-manager diff --git a/users/rouven/modules/ssh/default.nix b/users/rouven/modules/ssh/default.nix index f3d55cc..02f24da 100644 --- a/users/rouven/modules/ssh/default.nix +++ b/users/rouven/modules/ssh/default.nix @@ -38,6 +38,10 @@ in hostname = "quitte.ifsr.de"; user = "root"; }; + "tomate" = { + hostname = "tomate.ifsr.de"; + user = "root"; + }; "nuc" = { hostname = "192.168.10.2"; user = "root"; diff --git a/users/rouven/modules/wayland/default.nix b/users/rouven/modules/wayland/default.nix index 067f1f6..10247ab 100644 --- a/users/rouven/modules/wayland/default.nix +++ b/users/rouven/modules/wayland/default.nix @@ -42,6 +42,15 @@ }; }; + services.wlsunset = { + enable = true; + longitude = "13"; + latitude = "51"; + temperature = { + night = 4300; + }; + }; + xdg.configFile = { "swaync".source = ./swaync; "fuzzel/fuzzel.ini".text = ''