From df1f9025ea7d2f16d07d28cce2d8ffb77ff4e18b Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Wed, 25 May 2022 18:32:53 +0200 Subject: [PATCH] update --- nixos/configs/pepe/mail-fetcher.nix | 86 +++++++++++++------------- nixos/configs/sterni/configuration.nix | 3 +- nixos/flake.lock | 18 +++--- nixos/modules/programs/video.nix | 2 +- nixos/system/desktop/packages.nix | 2 + 5 files changed, 57 insertions(+), 54 deletions(-) diff --git a/nixos/configs/pepe/mail-fetcher.nix b/nixos/configs/pepe/mail-fetcher.nix index 468ff5d..e5f30f8 100644 --- a/nixos/configs/pepe/mail-fetcher.nix +++ b/nixos/configs/pepe/mail-fetcher.nix @@ -556,51 +556,51 @@ in notmuch.enable = true; }; - terranix_org = { - primary = false; - address = "palo@terranix.org"; - aliases = [ ]; - realName = "Ingolf Wagner"; - userName = "palo@terranix.org"; - passwordCommand = "cat ${toString config.sops.secrets.mail_terranix.path }"; - imap = { - host = "mail.privateemail.com"; - tls.enable = true; - port = 993; - }; - # make sure the upstream mail is deleted - getmail = { - enable = true; - delete = true; - readAll = false; - mailboxes = [ "ALL" ]; - }; - notmuch.enable = true; - }; + #terranix_org = { + # primary = false; + # address = "palo@terranix.org"; + # aliases = [ ]; + # realName = "Ingolf Wagner"; + # userName = "palo@terranix.org"; + # passwordCommand = "cat ${toString config.sops.secrets.mail_terranix.path }"; + # imap = { + # host = "mail.privateemail.com"; + # tls.enable = true; + # port = 993; + # }; + # # make sure the upstream mail is deleted + # getmail = { + # enable = true; + # delete = true; + # readAll = false; + # mailboxes = [ "ALL" ]; + # }; + # notmuch.enable = true; + #}; # new - ingolf-wagner-de-new = { - primary = false; - address = "contact@ingolf-wagner.de"; - aliases = [ ]; - realName = "Ingolf Wagner"; - userName = "contact@ingolf-wagner.de"; - passwordCommand = - "cat ${toString config.sops.secrets.mail_ingolf_wagner_de.path}"; - imap = { - host = "mail.privateemail.com"; - tls.enable = true; - port = 993; - }; - # make sure the upstream mail is deleted - getmail = { - enable = true; - delete = true; - readAll = false; - mailboxes = [ "ALL" ]; - }; - notmuch.enable = true; - }; + #ingolf-wagner-de-new = { + # primary = false; + # address = "contact@ingolf-wagner.de"; + # aliases = [ ]; + # realName = "Ingolf Wagner"; + # userName = "contact@ingolf-wagner.de"; + # passwordCommand = + # "cat ${toString config.sops.secrets.mail_ingolf_wagner_de.path}"; + # imap = { + # host = "mail.privateemail.com"; + # tls.enable = true; + # port = 993; + # }; + # # make sure the upstream mail is deleted + # getmail = { + # enable = true; + # delete = true; + # readAll = false; + # mailboxes = [ "ALL" ]; + # }; + # notmuch.enable = true; + #}; # deprecated ingolf-wagner-de = { diff --git a/nixos/configs/sterni/configuration.nix b/nixos/configs/sterni/configuration.nix index 72a02fb..03fba91 100644 --- a/nixos/configs/sterni/configuration.nix +++ b/nixos/configs/sterni/configuration.nix @@ -68,10 +68,11 @@ services.xserver.desktopManager.gnome.enable = true; custom.samba-share = { - enable = false; + enable = true; folders = { #public = "/home/palo/movies"; share = "/home/share"; + video = "/home/video-material"; #syncthing = "/mnt/syncthing"; #movies = "/mnt/syncthing/movies"; #series = "/mnt/syncthing/series"; diff --git a/nixos/flake.lock b/nixos/flake.lock index 632726f..0d03544 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -110,11 +110,11 @@ "emacs-overlay": { "flake": false, "locked": { - "lastModified": 1650278072, - "narHash": "sha256-uKnIAWPODL1Bj6No0wEzR9yNNAlfy0S0ptyxKtxTE48=", + "lastModified": 1650801016, + "narHash": "sha256-3fsEcEs14E/ZFXB4KLy5xicwTeOxW9EBlKn3amc/18s=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "1d1478b3b1f1ac68924705a77bcdc655925cf408", + "rev": "d50f841db7b856d79fcfc1a71582dfb5ee1a5830", "type": "github" }, "original": { @@ -403,11 +403,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1650161686, - "narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=", + "lastModified": 1650701402, + "narHash": "sha256-XKfstdtqDg+O+gNBx1yGVKWIhLgfEDg/e2lvJSsp9vU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1ffba9f2f683063c2b14c9f4d12c55ad5f4ed887", + "rev": "bc41b01dd7a9fdffd32d9b03806798797532a5fe", "type": "github" }, "original": { @@ -419,11 +419,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1650244918, - "narHash": "sha256-DsS5nxjTpnoUC4pNXJI1rit7TnDTij8vQDa5PtcDCD0=", + "lastModified": 1650728030, + "narHash": "sha256-VfCYsC/0mZQlQqsXf5o5Cib1ncJQ5l7WHN7hEIMmZNw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7b38b03d76ab71bdc8dc325e3f6338d984cc35ca", + "rev": "5fb3a179605141bfa4c9c423f9b1c33658b059c8", "type": "github" }, "original": { diff --git a/nixos/modules/programs/video.nix b/nixos/modules/programs/video.nix index 7ac506b..2a01e56 100644 --- a/nixos/modules/programs/video.nix +++ b/nixos/modules/programs/video.nix @@ -57,7 +57,7 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ - youtube-dl + unstable.youtube-dl mplayer mpv diff --git a/nixos/system/desktop/packages.nix b/nixos/system/desktop/packages.nix index 51cc874..b0160da 100644 --- a/nixos/system/desktop/packages.nix +++ b/nixos/system/desktop/packages.nix @@ -380,6 +380,8 @@ in allLicenses + dogdns + memo nixfmt dateutils