Formatting

home/default.nix

@@ -15,9 +15,7 @@ in {
     ./mpclient.nix
     ./neovim
   ];
-  services.gpg-agent = {
-    enable = true;
-  };
+  services.gpg-agent = { enable = true; };
 
   programs = {
     home-manager.enable = true;
@@ -35,6 +33,11 @@ in {
         set -g status off
       '';
     };
+    password-store = {
+      package = pkgs.pass-wayland.withExtensions
+        (exts: [ exts.pass-update pkgs.pass-clip ]);
+      enable = true;
+    };
     git = {
       aliases = { sync = "!git pull -r && git push"; };
       enable = true;

home/desktop/default.nix

@@ -3,7 +3,7 @@ let
   inherit (import ../../pkgs) desktop-pkgs;
   inherit (import ../../lib) colors;
 in {
-  imports = [ ./sleep-nag.nix ./kitty.nix ./wallpaper.nix ./gnome.nix ];
+  imports = [ ./sleep-nag.nix ./kitty.nix ./wallpaper.nix ./gnome.nix ./firefox.nix ];
   m-0.colors = colors;
   home = {
     packages = builtins.attrValues desktop-pkgs;

home/desktop/gnome.nix

@@ -1,4 +1,4 @@
-{ ... }: {
+{ pkgs, ... }: {
   services.gpg-agent.pinentryFlavor = "gnome3";
   dconf.settings = {
     "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/terminal" =

home/desktop/kitty.nix

@@ -12,7 +12,8 @@ in {
       "ctrl+minus" = "change_font_size all -1.0";
     };
     settings = {
-      # linux_display_server = "wayland"; # Causes ugly decorations
+      linux_display_server = "wayland"; # Causes ugly decorations
+      hide_window_decorations = true;
       font_size = "10.5";
 
       foreground = colors.foreground;

home/desktop/rofi.nix

@@ -1,64 +0,0 @@
-{ pkgs, lib, config, ... }:
-with lib;
-let inherit (config.m-0) colors workspaces terminal;
-in {
-
-  home = { packages = with pkgs; [ rofi-pass ]; };
-  programs = {
-    rofi = {
-      enable = true;
-      extraConfig = ''
-        rofi.modi: combi,window,drun,run,ssh,keys
-        rofi.combi-modi: window,drun,run
-      '';
-      borderWidth = 0;
-      separator = "none";
-      fullscreen = false;
-      terminal = terminal;
-      yoffset = 19;
-      location = "top";
-      scrollbar = false;
-      padding = 10;
-      cycle = false;
-      lines = 30;
-      font = "monospace 10.5";
-      colors = {
-        window = {
-          background = "argb:c0${builtins.substring 1 6 colors.background}";
-          border = colors.blue;
-          separator = colors.blue;
-        };
-        rows = {
-          normal = {
-            background = colors.background;
-            foreground = colors.foreground;
-            backgroundAlt = colors.black;
-            highlight = {
-              background = colors.blue;
-              foreground = colors.white;
-            };
-          };
-          active = {
-            background = colors.background;
-            foreground = colors.foreground;
-            backgroundAlt = colors.black;
-            highlight = {
-              background = colors.blue;
-              foreground = colors.white;
-            };
-          };
-          urgent = {
-            background = colors.background;
-            foreground = colors.foreground;
-            backgroundAlt = colors.black;
-            highlight = {
-              background = colors.blue;
-              foreground = colors.white;
-            };
-          };
-        };
-      };
-    };
-  };
-
-}

home/firefox.nix

@@ -1,4 +0,0 @@
-{ ... }: {
-  programs.firefox.enable = true;
-  programs.browserpass.enable = true;
-}

home/modes.nix

@@ -63,7 +63,6 @@ in {
         ./mpclient.nix
         ./on-my-machine.nix
         ./desktop
-        ./firefox.nix
         ./git-sign.nix
         ./laptop.nix
         ./mail.nix

pkgs/default.nix

@@ -31,7 +31,7 @@ in rec {
     '';
   };
   desktop-pkgs = {
-    inherit (pkgs) lm_sensors xwayland dmenu xdg_utils libnotify pinentry;
+    inherit (pkgs) lm_sensors xwayland xdg_utils libnotify;
     inherit (pkgs.gnomeExtensions) appindicator system-monitor;
     inherit (pkgs.gnome3)
       dconf dconf-editor gnome-tweaks gnome-shell-extensions adwaita-icon-theme
@@ -45,9 +45,8 @@ in rec {
     inherit obelisk;
   };
   accounting-pkgs = {
-    jali = pkgs.callPackage ./jali { };
     inherit (pkgs.haskellPackages) hledger hledger-ui hledger-web;
-    inherit (pkgs) ledger;
+    inherit (pkgs) ledger jali;
   };
   system-pkgs = core-system-pkgs // extra-system-pkgs // {
     inherit (import ../lib/test.nix)
@@ -55,5 +54,4 @@ in rec {
     inherit (my-lib) home-manager;
   };
   foreign-home-pkgs = extra-system-pkgs;
-  email2matrix = pkgs.callPackage ./email2matrix { };
 }

pkgs/email2matrix/default.nix

@@ -1,12 +0,0 @@
-{ buildGoModule, fetchFromGitHub, ... }:
-buildGoModule rec {
-  name = "email2matrix";
-  version = "782bcfdd67983ff27f0b9cec5c81cf1a20796ab0";
-  src = fetchFromGitHub {
-    owner = "devture";
-    repo = "email2matrix";
-    rev = version;
-    sha256 = "0nx99iab2y10m4jh4jl9c4y7j4iy8zlyfcn42v4y4mlk1507czlj";
-  };
-  modSha256 = "0nrl1d1628isd6183a9rj4qmsmzpbsf656cm75vw0lz2x0s4x7dg";
-}

pkgs/jali/default.nix

@@ -1,19 +0,0 @@
-{ aqbanking, python3Packages, fetchgit }:
-let
-  andir = import (builtins.fetchTarball {
-    url = "https://github.com/andir/nixpkgs/archive/aqbanking.tar.gz";
-    sha256 = "06m7risi68jfqgv001ip77lzz6bylvvdn5j8sn845c54zpm6qp36";
-  }) { };
-in with python3Packages;
-buildPythonApplication rec {
-  name = "${pname}-${version}";
-  pname = "jali";
-  doCheck = false;
-  version = "b47d3b9";
-  src = fetchgit {
-    url = "https://git.darmstadt.ccc.de/jali/jali.git";
-    rev = version;
-    sha256 = "0l5h9hjri77zifx3x4khw7ncmmc9l9ppisdjilsfllzkabz4xjf4";
-  };
-  propagatedBuildInputs = [ jinja2 pendulum GitPython andir.aqbanking ];
-}