From 11b1eb654d5aafff484f3671fa773515faa78f0f Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Mon, 15 May 2023 22:59:59 +0200 Subject: [PATCH] removed notmuch --- flake.lock | 24 +++++++++---------- hosts/falkenstein-1/default.nix | 1 - pkgs/jmri/default.nix | 7 ++++-- users/rouven/modules/accounts/default.nix | 28 ----------------------- users/rouven/modules/helix/default.nix | 9 +++++++- users/rouven/modules/packages.nix | 13 ----------- 6 files changed, 25 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index 5ad6247..bcfca0e 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1684061181, - "narHash": "sha256-EJpZ+Drpt3aHpowddpsQFBWsqLSJHyP6dnremTVMdWw=", + "lastModified": 1684157850, + "narHash": "sha256-xGHTCgvAxO5CgAL6IAgE/VGRX2wob2Y+DPyqpXJ32oQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "e4272987f785a8848205263abb4911b922c21e1b", + "rev": "c0deab0effd576e70343cb5df0c64428e0e0d010", "type": "github" }, "original": { @@ -44,11 +44,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1684068895, - "narHash": "sha256-1oSX5LQmSl/lcpPdM+NG2TlLynFmVbubNeIoSF1Mmv0=", + "lastModified": 1684167111, + "narHash": "sha256-0JKyr8WOpcXJP5XaLnUSI7e1d7N5Rcpyf72+N4ZEtjo=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "7c207243e41b5b4f35d790767ad2e21eba1b7a0b", + "rev": "5b84b0fb445bc4485510bba516c84141aaeafd04", "type": "github" }, "original": { @@ -80,11 +80,11 @@ }, "impermanence": { "locked": { - "lastModified": 1682268411, - "narHash": "sha256-ICDKQ7tournRVtfM8C2II0qHiOZOH1b3dXVOCsgr11o=", + "lastModified": 1684144492, + "narHash": "sha256-5TBG9kZGdKrZGHdyjLA04ODSzhx1Bx/vwMxfRgWF+JU=", "owner": "nix-community", "repo": "impermanence", - "rev": "df1692e2d9f1efc4300b1ea9201831730e0b817d", + "rev": "ec1a8e70d61261f9ada30f4e450ea7230d9efb62", "type": "github" }, "original": { @@ -134,11 +134,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1683965003, - "narHash": "sha256-DrzSdOnLv/yFBvS2FqmwBA2xIbN/Lny/WlxHyoLR9zE=", + "lastModified": 1684169666, + "narHash": "sha256-N5jrykeSxLVgvm3Dd3hZ38/XwM/jU+dltqlXgrGlYxk=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "81cd886719e10d4822b2a6caa96e95d56cc915ef", + "rev": "71ce85372a614d418d5e303dd5702a79d1545c04", "type": "github" }, "original": { diff --git a/hosts/falkenstein-1/default.nix b/hosts/falkenstein-1/default.nix index f860d99..86f4577 100644 --- a/hosts/falkenstein-1/default.nix +++ b/hosts/falkenstein-1/default.nix @@ -15,7 +15,6 @@ loader = { grub = { enable = true; - version = 2; efiSupport = true; efiInstallAsRemovable = true; device = "/dev/sda"; diff --git a/pkgs/jmri/default.nix b/pkgs/jmri/default.nix index 8cdbb6c..a323e5f 100644 --- a/pkgs/jmri/default.nix +++ b/pkgs/jmri/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lib, ant, jdk, ... }: +{ stdenv, fetchFromGitHub, lib, ant, jdk11, ... }: stdenv.mkDerivation rec { pname = "jmri"; version = "5.3.5"; @@ -12,9 +12,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ant - jdk + jdk11 ]; + buildInputs = [ + jdk11 + ]; buildPhase = '' ant package-linux diff --git a/users/rouven/modules/accounts/default.nix b/users/rouven/modules/accounts/default.nix index a7b719d..3c16436 100644 --- a/users/rouven/modules/accounts/default.nix +++ b/users/rouven/modules/accounts/default.nix @@ -36,7 +36,6 @@ in }; mbsync.enable = true; msmtp.enable = true; - notmuch.enable = true; }; accounts.email.accounts = { "rouven@rfive.de" = rec { @@ -157,7 +156,6 @@ in }; }; msmtp.enable = true; - notmuch.enable = true; neomutt = let c = mbsync.groups.tud.channels; in { enable = true; @@ -225,19 +223,6 @@ in }; }; msmtp.enable = true; - # notmuch.enable = true; - notmuch = { - enable = true; - neomutt = { - enable = true; - virtualMailboxes = [ - { - name = "IFSR-Unread"; - query = "folder:iFSR/Inbox tag:unread"; - } - ]; - }; - }; neomutt = let c = mbsync.groups.ifsr.channels; in { enable = true; @@ -296,19 +281,6 @@ in }; }; msmtp.enable = true; - # notmuch.enable = true; - notmuch = { - enable = true; - neomutt = { - enable = true; - virtualMailboxes = [ - { - name = "gmail-Unread"; - query = "tag:unread"; - } - ]; - }; - }; neomutt = let c = mbsync.groups.gmail.channels; in { enable = true; diff --git a/users/rouven/modules/helix/default.nix b/users/rouven/modules/helix/default.nix index 8b7f8d8..5ea2820 100644 --- a/users/rouven/modules/helix/default.nix +++ b/users/rouven/modules/helix/default.nix @@ -4,7 +4,7 @@ gdb lldb rust-analyzer - nil + rnix-lsp (python3.withPackages (ps: with ps; [ pyls-isort pylsp-mypy @@ -29,6 +29,13 @@ "ui.background" = "{}"; "ui.virtual.inlay-hint" = { fg = "#666666"; }; }; + languages = [ + { + name = "nix"; + auto-format = true; + language-server.command = "rnix-lsp"; + } + ]; settings = { theme = "dracula-transparent"; editor = { diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix index 46a28a9..5b42783 100644 --- a/users/rouven/modules/packages.nix +++ b/users/rouven/modules/packages.nix @@ -1,17 +1,13 @@ { pkgs, ... }: { home.packages = with pkgs; [ - # temp here for testing - thunderbird # essentials wpa_supplicant_gui # manage wifi pcmanfm # rock solid file manager xdg-utils # used for xdg-open snapper-gui - # comma # run any command kleopatra - python310Packages.pyhanko # graphics evince # pdf viewer @@ -29,8 +25,6 @@ # internet google-chrome - nextcloud-client - transmission-gtk # messaging discord @@ -46,23 +40,18 @@ yubikey-manager-qt # yubioath-flutter # broken, TODO fix bitwarden - bitwarden-cli # misc - btop neofetch # obligatory virt-manager ventoy - xsane # scanning jetbrains.idea-community nix-output-monitor - ripgrep # better grep duf # better df croc # send files anywhere powerline-fonts - # password pass # libs @@ -74,7 +63,6 @@ ]; programs.obs-studio.enable = true; - programs.nix-index.enable = true; xdg.mimeApps = { enable = true; @@ -97,4 +85,3 @@ }; }; } -