From 03024637335586b3c35485b70be6b1f873f52d62 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Mon, 26 Feb 2024 19:14:36 +0100 Subject: [PATCH 1/3] mail: enable archive --- hosts/falkenstein/modules/mail/default.nix | 4 +++ users/rouven/modules/aerc/default.nix | 37 ++++++++++++++++++++++ users/rouven/modules/default.nix | 1 + 3 files changed, 42 insertions(+) create mode 100644 users/rouven/modules/aerc/default.nix diff --git a/hosts/falkenstein/modules/mail/default.nix b/hosts/falkenstein/modules/mail/default.nix index c19faa5..256d899 100644 --- a/hosts/falkenstein/modules/mail/default.nix +++ b/hosts/falkenstein/modules/mail/default.nix @@ -122,6 +122,10 @@ in auto = "create"; specialUse = "Trash"; }; + Archive = { + auto = "no"; + specialUse = "Archive"; + }; }; modules = [ pkgs.dovecot_pigeonhole diff --git a/users/rouven/modules/aerc/default.nix b/users/rouven/modules/aerc/default.nix new file mode 100644 index 0000000..b764ccb --- /dev/null +++ b/users/rouven/modules/aerc/default.nix @@ -0,0 +1,37 @@ +{ ... }: +{ + programs = { + aerc = { + enable = true; + extraConfig = { + # general = { + # unsafe-accounts-conf = true; + # }; + ui = { + sort = "date"; + dirlist-tree = true; + fuzzy-complete = true; + styleset-name = "dracula"; + threading-enabled = true; + icon-encrypted = "󰯄"; + icon-signed = ""; + icon-unknown = ""; + icon-attachment = ""; + icon-new = ""; + icon-old = ""; + icon-replied = ""; + icon-marked = ""; + icon-deleted = ""; + }; + filters = { + "text/plain" = "colorize"; + "text/html" = "html | colorize"; + "message/delivery-status" = "colorize"; + "message/rfc822" = "colorize"; + "text/calendar" = "calendar"; + }; + }; + + }; + }; +} diff --git a/users/rouven/modules/default.nix b/users/rouven/modules/default.nix index 9ea32e1..83d4337 100644 --- a/users/rouven/modules/default.nix +++ b/users/rouven/modules/default.nix @@ -1,6 +1,7 @@ { ... }: { imports = [ + ./aerc ./foot ./git ./gpg From b4af2256784b2f5847107434c5aaf2cffd34723c Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Mon, 26 Feb 2024 19:15:36 +0100 Subject: [PATCH 2/3] user fixes --- users/rouven/modules/aerc/default.nix | 3 ++- users/rouven/modules/packages.nix | 3 ++- users/rouven/modules/wayland/waybar.nix | 24 +----------------------- 3 files changed, 5 insertions(+), 25 deletions(-) diff --git a/users/rouven/modules/aerc/default.nix b/users/rouven/modules/aerc/default.nix index b764ccb..1eb42a4 100644 --- a/users/rouven/modules/aerc/default.nix +++ b/users/rouven/modules/aerc/default.nix @@ -20,7 +20,8 @@ icon-new = ""; icon-old = ""; icon-replied = ""; - icon-marked = ""; + icon-marked = "󰄳"; + icon-flagged = ""; icon-deleted = ""; }; filters = { diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix index 39a482e..eb3fbba 100644 --- a/users/rouven/modules/packages.nix +++ b/users/rouven/modules/packages.nix @@ -8,7 +8,7 @@ zip unzip man-pages - pcmanfm + cinnamon.nemo xdg-utils # used for xdg-open appimage-run seafile-client @@ -42,6 +42,7 @@ bitwarden-cli # misc + hugo neofetch # obligatory jetbrains.idea-ultimate #😎 croc # send files anywhere diff --git a/users/rouven/modules/wayland/waybar.nix b/users/rouven/modules/wayland/waybar.nix index 7220107..cc4fe9a 100644 --- a/users/rouven/modules/wayland/waybar.nix +++ b/users/rouven/modules/wayland/waybar.nix @@ -4,13 +4,12 @@ programs.waybar = { enable = true; systemd.enable = true; - # package = hyprland.packages.x86_64-linux.waybar-hyprland; settings = { mainBar = { layer = "top"; position = "top"; height = 26; - modules-left = [ "sway/workspaces" "river/tags" "custom/spotifytitle" "river/window" ]; + modules-left = [ "sway/workspaces" "river/tags" "river/window" ]; modules-right = [ "network" "cpu" "pulseaudio" "battery" "tray" "custom/notification" "clock" ]; network = { format-wifi = " {essid} ({signalStrength}%)"; @@ -54,12 +53,6 @@ escape = true; }; - "custom/spotifytitle" = { - format = " {}"; - max-length = 80; - return-type = "json"; - exec = "${lib.getExe pkgs.pww} -w spotifyd:title -p None 2> /dev/null"; - }; cpu = { format = "{usage}% "; }; @@ -138,7 +131,6 @@ background-color: #eb4d4b; } - #custom-spotifytitle, #custom-notification, #clock, #battery, @@ -168,19 +160,6 @@ background-color: #${config.colorScheme.palette.base00}; } - #custom-spotifytitle { - background: #1db954; - color: #191414; - opacity: 1; - transition-property: opacity; - transition-duration: 0.25s; - } - - #custom-spotifytitle.Paused, - #custom-spotifytitle.Inactive { - opacity: 0.5; - } - #battery { background-color: #${config.colorScheme.palette.base02}; color: #${config.colorScheme.palette.base05}; @@ -230,6 +209,5 @@ background-color: #${config.colorScheme.palette.base01}; color: #${config.colorScheme.palette.base05}; } - ''; } From f4fc1ccdf3fb48e9fdd550947215afb7c418888c Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Mon, 26 Feb 2024 19:16:04 +0100 Subject: [PATCH 3/3] cleanup and add ifsr cache --- flake.lock | 46 ++++++++++++++++++++++---------------------- flake.nix | 6 +++--- overlays/default.nix | 11 ++++------- shared/nix.nix | 3 ++- 4 files changed, 32 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index 2f0508e..cfadb71 100644 --- a/flake.lock +++ b/flake.lock @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1708031129, - "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=", + "lastModified": 1708806879, + "narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8", + "rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a", "type": "github" }, "original": { @@ -202,24 +202,24 @@ "locked": { "lastModified": 1706522977, "narHash": "sha256-Tq69CQ+uutfY477w8uCRyF/2V0Wh/+zHzM3qwcVmqsk=", - "owner": "therealr5", + "owner": "rouven0", "repo": "TruckSimulatorBot-images", "rev": "d54a772d48a329a402433cc90502700a6699008e", "type": "github" }, "original": { - "owner": "therealr5", + "owner": "rouven0", "repo": "TruckSimulatorBot-images", "type": "github" } }, "impermanence": { "locked": { - "lastModified": 1706639736, - "narHash": "sha256-CaG4j9+UwBDfinxxvJMo6yOonSmSo0ZgnbD7aj2Put0=", + "lastModified": 1708968331, + "narHash": "sha256-VUXLaPusCBvwM3zhGbRIJVeYluh2uWuqtj4WirQ1L9Y=", "owner": "nix-community", "repo": "impermanence", - "rev": "cd13c2917eaa68e4c49fea0ff9cada45440d7045", + "rev": "a33ef102a02ce77d3e39c25197664b7a636f9c30", "type": "github" }, "original": { @@ -281,11 +281,11 @@ ] }, "locked": { - "lastModified": 1708225687, - "narHash": "sha256-NJBDfvknI26beOFmjO2coeJMTTUCCtw2Iu+rvJ1Zb9k=", + "lastModified": 1708830466, + "narHash": "sha256-nGKe3Y1/jkLR2eh1aRSVBtKadMBNv8kOnB52UXqRy6A=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "17352eb241a8d158c4ac523b19d8d2a6c8efe127", + "rev": "f070c7eeec3bde8c8c8baa9c02b6d3d5e114d73b", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708118438, - "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", + "lastModified": 1708807242, + "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", + "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", "type": "github" }, "original": { @@ -349,13 +349,13 @@ "locked": { "lastModified": 1698315015, "narHash": "sha256-RWYymaHHx6pi4HRLfJJTF3u4Im22uUtVZDUvTbP0Qrc=", - "owner": "therealr5", + "owner": "rouven0", "repo": "pfersel", "rev": "40292aa59ed9f6630dc39405f318842a9c8e7cb3", "type": "github" }, "original": { - "owner": "therealr5", + "owner": "rouven0", "repo": "pfersel", "type": "github" } @@ -400,13 +400,13 @@ "locked": { "lastModified": 1706780558, "narHash": "sha256-tZRNaZKENRzd83oLgqgG/G2A+7FgsISFhgblGjFM244=", - "owner": "therealr5", + "owner": "rouven0", "repo": "purge", "rev": "3875053bd588aeee14849c50c60f6a33ac784da3", "type": "github" }, "original": { - "owner": "therealr5", + "owner": "rouven0", "repo": "purge", "type": "github" } @@ -488,15 +488,15 @@ ] }, "locked": { - "lastModified": 1706780552, - "narHash": "sha256-qXEAZNReY2jeoxLO/uZmZMOEOQq6BRq/Mh20BQGF2Bs=", - "owner": "therealr5", + "lastModified": 1708375524, + "narHash": "sha256-6XxKJhGupxakfrz8GBJJ/l9RvLs3tt9wuj3c8MZoSuo=", + "owner": "rouven0", "repo": "TruckSimulatorBot", - "rev": "88194a54c984fb91090c00d116c821627af9ed2f", + "rev": "6b33532486100f83fc9c7f2da3d1b54ea4fe5986", "type": "github" }, "original": { - "owner": "therealr5", + "owner": "rouven0", "repo": "TruckSimulatorBot", "type": "github" } diff --git a/flake.nix b/flake.nix index 54e1d98..f2b7da7 100644 --- a/flake.nix +++ b/flake.nix @@ -26,15 +26,15 @@ nix-colors.url = "github:Misterio77/nix-colors"; purge = { - url = "github:therealr5/purge"; + url = "github:rouven0/purge"; inputs.nixpkgs.follows = "nixpkgs"; }; trucksimulatorbot = { - url = "github:therealr5/TruckSimulatorBot"; + url = "github:rouven0/TruckSimulatorBot"; inputs.nixpkgs.follows = "nixpkgs"; }; pfersel = { - url = "github:therealr5/pfersel"; + url = "github:rouven0/pfersel"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/overlays/default.nix b/overlays/default.nix index 8cda764..b03b091 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -8,17 +8,14 @@ let inherit (prev) python3Packages; in rec { - pcmanfm = prev.pcmanfm.overrideAttrs (_: { - # remove deskop preferences shortcut - postInstall = '' - rm $out/share/applications/pcmanfm-desktop-pref.desktop - ''; - }); - pww = callPackage ../pkgs/pww { }; ianny = callPackage ../pkgs/ianny { }; tpm2-pkcs11 = prev.tpm2-pkcs11.override { fapiSupport = false; }; + imv = prev.imv.override { + # freeimage is broken + withBackends = [ "libtiff" "libjpeg" "libpng" "librsvg" "libheif" ]; + }; gnome-break-timer = callPackage ../pkgs/gnome-break-timer { }; jmri = callPackage ../pkgs/jmri { }; diff --git a/shared/nix.nix b/shared/nix.nix index f428010..ba3d866 100644 --- a/shared/nix.nix +++ b/shared/nix.nix @@ -6,15 +6,16 @@ nixpkgs.flake = nixpkgs; }; nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; - # keep build-time deps around for offline-rebuilding settings = { auto-optimise-store = true; experimental-features = [ "nix-command" "flakes" "repl-flake" ]; substituters = [ "https://cache.rfive.de" + "https://cache.ifsr.de" ]; trusted-public-keys = [ "cache.rfive.de:of5d+o6mfGXQSR3lk6ApfDBr4ampAUaNHux1O/XY3Tw=" + "cache.ifsr.de:y55KBAMF4YkjIzXwYOKVk9fcQS+CZ9RM1zAAMYQJtsg=" ]; }; };