unworkable state

.github/workflows/sync-main.yml

@@ -49,12 +49,21 @@ jobs:
               exit 1
               ;;
           esac
+      - name: Check for changes
+        run: |
+          git fetch origin main "${{ steps.branch.outputs.source }}"
+          HAS_CHANGES=true
+          if git diff --quiet \
+            "origin/main...origin/${{ steps.branch.outputs.source }}"; then
+            HAS_CHANGES=false
+          fi
 
       - name: Check for existing PR
         id: existing
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          if $HAS_CHANGES; then
             PR_NUMBER=$(gh pr list \
               --base main \
               --head "${{ steps.branch.outputs.source }}" \
@@ -63,6 +72,7 @@ jobs:
               --jq '.[0].number // empty')
 
             echo "number=$PR_NUMBER" >> "$GITHUB_OUTPUT"
+          fi
 
       - name: Create PR
         id: create
@@ -70,6 +80,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          if $HAS_CHANGES; then
             gh pr create \
               --base main \
               --head "${{ steps.branch.outputs.source }}" \
@@ -84,22 +95,26 @@ jobs:
               --jq '.[0].number')
 
             echo "number=$PR_NUMBER" >> "$GITHUB_OUTPUT"
-
+          fi
       - name: Determine PR number
         id: pr
         run: |
+          if $HAS_CHANGES; then
             if [ -n "${{ steps.existing.outputs.number }}" ]; then
               echo "number=${{ steps.existing.outputs.number }}" >> "$GITHUB_OUTPUT"
             else
               echo "number=${{ steps.create.outputs.number }}" >> "$GITHUB_OUTPUT"
             fi
+          fi
 
       - name: Enable auto-merge
         if: steps.pr.outputs.number != ''
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          if $HAS_CHANGES; then
             gh pr merge \
               "${{ steps.pr.outputs.number }}" \
               --auto \
               --merge
+          fi

flake.lock

@@ -1,5 +1,30 @@
 {
   "nodes": {
+    "agenix": {
+      "inputs": {
+        "darwin": "darwin",
+        "home-manager": [
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1770165109,
+        "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=",
+        "owner": "ryantm",
+        "repo": "agenix",
+        "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ryantm",
+        "repo": "agenix",
+        "type": "github"
+      }
+    },
     "caelestia-cli": {
       "inputs": {
         "caelestia-shell": [
@@ -11,11 +36,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780375472,
-        "narHash": "sha256-Q8RAJoYlakA6B2I5DVcuxzNbhCNU1nnIjqQZYP1KGrM=",
+        "lastModified": 1786071436,
+        "narHash": "sha256-/CQJ781dRGWWUMrJ34vIj1PQnNEEWgnEEuod0r5LKGk=",
         "owner": "caelestia-dots",
         "repo": "cli",
-        "rev": "d1c8c8fc09738d1b40576e97c274b4a11a2e0ac7",
+        "rev": "751fbc555a83faba5dd589270d14eeb22afab174",
         "type": "github"
       },
       "original": {
@@ -34,11 +59,11 @@
         "quickshell": "quickshell"
       },
       "locked": {
-        "lastModified": 1781178648,
-        "narHash": "sha256-z6V1T7MHShM7TfFIMCDp94Bi1Wk9LJfK96vm8YFGY5M=",
+        "lastModified": 1786238888,
+        "narHash": "sha256-pnO0u0UUYwkr72pJR5Giu93LZfU/fhTKJZYa1xeM7Po=",
         "owner": "caelestia-dots",
         "repo": "shell",
-        "rev": "a16c957a8bd13e0cfd09928ca0a22fecd3681e44",
+        "rev": "817a220e8e87c4df9f3681033a0d8a8054cdaa30",
         "type": "github"
       },
       "original": {
@@ -47,6 +72,28 @@
         "type": "github"
       }
     },
+    "darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "agenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1744478979,
+        "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "rev": "43975d782b418ebf4969e9ccba82466728c2851b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lnl7",
+        "ref": "master",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -72,12 +119,12 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1778716662,
-        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
-        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
-        "revCount": 475,
+        "lastModified": 1785627969,
+        "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
+        "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
+        "revCount": 483,
         "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.475%2Brev-f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb/019e2533-0324-7e90-93eb-29b02e1a61cd/source.tar.gz"
+        "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.483%2Brev-427bf4bd9435fdf21321c8cc628c24efc14c0f7a/019fc124-5bcc-79d1-a1e4-306df724dc0a/source.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -86,7 +133,7 @@
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -108,11 +155,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781319724,
-        "narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
+        "lastModified": 1785119570,
+        "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae",
+        "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d",
         "type": "github"
       },
       "original": {
@@ -124,11 +171,11 @@
     },
     "import-tree": {
       "locked": {
-        "lastModified": 1778781969,
-        "narHash": "sha256-Jjuz5CmSkur8KvLDoGa+vylEp+RkQtv4mt/qcMznpH0=",
+        "lastModified": 1784254960,
+        "narHash": "sha256-iI88R3wHz8wTKQb5orvpc51L/Xr64AJyxid/0MKa/b8=",
         "owner": "vic",
         "repo": "import-tree",
-        "rev": "d321337efd0f23a9eb14a42adb7b2c29313ab274",
+        "rev": "4ebb10ae17d5f1ad366e7aef5b92cb8eecf24f69",
         "type": "github"
       },
       "original": {
@@ -164,11 +211,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780928816,
-        "narHash": "sha256-s4wU4nfs8xsXvwPtD0yebTPaOgmtDesmEvWuKFES6cE=",
+        "lastModified": 1786462419,
+        "narHash": "sha256-A7Q3UIyzDg1O54E0W6HOQIzvsVJq/rMuelJR+ELLRvI=",
         "owner": "tomasriveral",
         "repo": "nix-git-cherry-picker",
-        "rev": "785b747ebca67f3e11b49ef5a85f9d3635bfe85d",
+        "rev": "aec69257dc9b68d875333ec9f4a7b310d878abd1",
         "type": "github"
       },
       "original": {
@@ -179,11 +226,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1780902259,
-        "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
+        "lastModified": 1786535285,
+        "narHash": "sha256-rG5HKMAgAhMgydvKGtco6rqTxRq4EDZQCx9USLvVqYw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca",
+        "rev": "9f78f44a87948854445dae0b6bf82b2e87e4efb5",
         "type": "github"
       },
       "original": {
@@ -195,11 +242,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1777168982,
-        "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
+        "lastModified": 1785031560,
+        "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
+        "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c",
         "type": "github"
       },
       "original": {
@@ -218,11 +265,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781273662,
-        "narHash": "sha256-50dd7Cs1mUHq1srw7UojdzCYOB4TfrIXMv7XHHPU9zw=",
+        "lastModified": 1785077063,
+        "narHash": "sha256-rJxX9Mq16TOiIlf+nNR4SaLsWf1yII8xsQpJUNio3Yg=",
         "owner": "tomasriveral",
         "repo": "nixpkgs-notifier",
-        "rev": "12183f26e8b196d9906f82dc05f9672793c61038",
+        "rev": "39a89ffbdc49cc9ab6f67bc4be7ea2f7d3e2b38c",
         "type": "github"
       },
       "original": {
@@ -233,11 +280,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1781268102,
-        "narHash": "sha256-Zn5KTggEmUB3lXn/ccERNcBdddE6IaOFber9dWViWDg=",
+        "lastModified": 1786534138,
+        "narHash": "sha256-fBJMdnKUTUDtfi/BYLr71HLaC9dG382arxLF2Egg2uo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "49a4bd0573c376468dd7996ddb6f9fa31d8c4d97",
+        "rev": "044bfe75bfe4c7bbe043dc17b5e42ea823b84a09",
         "type": "github"
       },
       "original": {
@@ -257,11 +304,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780908812,
-        "narHash": "sha256-syxEJP0NNgVZYHp/zRVuz32VYf+ULD9itZk7V06SCos=",
+        "lastModified": 1786346006,
+        "narHash": "sha256-PDM9fB1zBhqVVE75WxRM7vIo3QhL2LGKKdd6N+hTGlg=",
         "owner": "tomasriveral",
         "repo": "notewrapper",
-        "rev": "e670ef935f0dd87dc8a8c6982147a9b8dce7565e",
+        "rev": "689c3074c03328e2086dc032a2fc3de00bbef466",
         "type": "github"
       },
       "original": {
@@ -281,11 +328,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1781158593,
-        "narHash": "sha256-zxlheX4o1MK00dkYzoXm7Srj5SD9iOCSp4N7f1iShr0=",
+        "lastModified": 1786270331,
+        "narHash": "sha256-GRhNuYIXR/0WWBya4CHfTKyCbL3wuFPJC5yBh5pHU8s=",
         "owner": "r14dd",
         "repo": "patent",
-        "rev": "68772d068088d62a030619090959165af5e71ed1",
+        "rev": "d852cea921124a8b9002db9beb2af2d935af8130",
         "type": "github"
       },
       "original": {
@@ -302,11 +349,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780303737,
-        "narHash": "sha256-7HgdJBG4BgAPDyHKKxWtxj7nziqsQo6zQCXtwy+L9fs=",
+        "lastModified": 1785704021,
+        "narHash": "sha256-eQtczKMAS4ItlB4pr1B3MqBZiyRVl2nkqNdtyRSQMa8=",
         "ref": "refs/heads/master",
-        "rev": "b66495fcc5022681b56b61f928c7acbe910e722c",
-        "revCount": 821,
+        "rev": "28771c7c74b42e20afca0b1b63980cb46515537c",
+        "revCount": 835,
         "type": "git",
         "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
       },
@@ -317,6 +364,7 @@
     },
     "root": {
       "inputs": {
+        "agenix": "agenix",
         "caelestia-shell": "caelestia-shell",
         "disko": "disko",
         "flake-parts": "flake-parts",
@@ -369,6 +417,21 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -47,6 +47,11 @@
       url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    agenix = {
+      url = "github:ryantm/agenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.home-manager.follows = "home-manager";
+    };
     /*
       microPlugins-vivify = {
       url = "git+https://codeberg.org/gibbert/micro-vivify";
@@ -70,7 +75,8 @@
             "steam"
             "steam-unwrapped"
             "cheatsheet.nvim"
-            "zoom-us" "zoom"
+            "zoom-us"
+            "zoom"
           ];
           mkUnfreePredicate = pkg:
             builtins.elem (inputs.nixpkgs.lib.getName pkg) unfreePkgs;

modules/applications/browser.nix

@@ -164,6 +164,10 @@
             install_url = "https://addons.mozilla.org/firefox/downloads/file/4790089/consumer_rights_wiki-latest.xpi";
             installation_mode = "force_installed";
           };
+          "archivebox@tjhorner.dev" = {
+            install_url = "https://addons.mozilla.org/firefox/downloads/file/4820668/archivebox_exporter-latest.xpi";
+            installation_mode = "force_installed";
+          };
         };
         DisableTelemetry = true;
         DisableFirefoxStudies = true;
@@ -344,12 +348,6 @@
               keyword = "nixpkgs tracker";
               url = "https://nixpk.gs/pr-tracker.html";
             }
-            {
-              name = "fahrlehrer";
-              tags = ["theorie" "fahrlehrer" "conduite"];
-              keyword = "fahrlehrer24";
-              url = "https://app.fahrlehrer24.ch/";
-            }
             {
               name = "cogito";
               tags = ["cogito" "esprit" "critique"];
@@ -398,6 +396,12 @@
               keyword = "rryan-tm logs";
               url = "https://nixpkgs-update-logs.nix-community.org";
             }
+            {
+              name = "Nix function search";
+              tags = ["nixpkgs" "nix" "search"];
+              keyword = "nix function search";
+              url = "https://noogle.dev";
+            }
           ];
         };
         search = {

modules/applications/kdrive.nix

@@ -48,11 +48,12 @@
       name = "custom-checkKdrive";
       runtimeInputs = with pkgs; [
         rclone
-        matrix-commander-rs
+        curl
         libnotify
       ];
       text = ''
-
+        # shellcheck disable=SC1091
+        source /run/agenix/ntfy
         # waits for an internet connection. It pings both Google DNS  and Cloudfare dns in case one of them is down
         until ping -c1 -W1 1.1.1.1 >/dev/null 2>&1 || \
           ping -c1 -W1 8.8.8.8 >/dev/null 2>&1
@@ -72,9 +73,11 @@
         else
           echo "kdrive rclone failed with error: $output"
           notify-send "rclone kdrive failed" "$output"
-          matrix-commander-rs --verbose -m "rclone kdrive failed.<br>Error: <pre>$output</pre><br><a href=\"https://matrix.to/#/@notificationbot_0000:matrix.org\">@notificationbot_0000</a>" \
-          --html \
-          -r "\!BXRRokBmEdNOyYdfOF:matrix.org"
+          curl \
+            -u ":$NTFY_TOKEN" \
+            -d "Rclone couldnt access kdrive (rclone lsd kdrive). Error: $output" \
+            -H "Title: Rclone kdrive" \
+            "$NTFY_SERVER/Alerts"
         fi
       '';
     };

modules/applications/mullvad.nix

@@ -1,15 +1,13 @@
 _: {
-  flake.nixosModules.mullvad = {pkgs-unstable, ...}: {
+  flake.nixosModules.mullvad = _: {
     services.mullvad-vpn = {
       enable = true;
-      package = pkgs-unstable.mullvad-vpn;
     };
   };
-  flake.homeModules.mullvad = {pkgs-unstable, ...}: {
+  flake.homeModules.mullvad = _: {
     programs.mullvad-vpn = {
       # gui
       enable = true;
-      package = pkgs-unstable.mullvad-vpn;
     };
   };
 }

modules/applications/neovim.nix

@@ -53,6 +53,8 @@ _: {
         pkgs-unstable.vimPlugins.nvim-treesitter-parsers.printf
         pkgs-unstable.vimPlugins.nvim-treesitter-parsers.python
         pkgs-unstable.vimPlugins.nvim-treesitter-parsers.sparql
+        pkgs-unstable.vimPlugins.lean-nvim
+        pkgs-unstable.vimPlugins.vim-ledger
         pkgs-unstable.vimPlugins.telescope-nvim
         pkgs-unstable.vimPlugins.nvim-scrollbar
         pkgs-unstable.vimPlugins.promise-async
@@ -371,7 +373,7 @@ _: {
           },
         })
 
-        vim.lsp.enable({ "lua_ls", "clangd", "pylsp", "texlab", "nixd", "ltex"})
+        vim.lsp.enable({ "lua_ls", "clangd", "pylsp", "texlab", "nixd", "ltex", "leanls"})
               -- =========================
               -- DASHBOARD
               -- =========================
@@ -474,7 +476,12 @@ _: {
               -- =========================
               require('lualine').setup { options = { theme  = "gruvbox_dark" } }
 
-
+              -- ==================
+              -- lean
+              -- ==================
+              require('lean').setup({
+                mappings = true,
+              })
               --==================0
               -- Some utils
               --==================

modules/applications/notewrapper.nix

@@ -1,5 +1,5 @@
 {inputs, ...}: {
-  flake.homeModules.notewrapper = {pkgs, ...}: {
+  flake.homeModules.laptop-notewrapper = {pkgs, ...}: {
     home.packages = [
       inputs.notewrapper.packages.${pkgs.system}.default
     ];
@@ -8,7 +8,7 @@
       force = true;
       text = ''
         {
-          "directory": ["~/Documents/Notes/", "~/test/"],
+          "directory": ["~/kdrive/Notes/"],
           "render": true,
           "jumpToEndOfFileOnLaunch": true,
           "editor": "neovim",
@@ -16,7 +16,36 @@
           "dateEntry": "# %Y %m %d %a",
           "newLineOnOpening": true,
           "backup": {
-            "enable": true,
+            "enable": false,
+            "directory": {
+              "~/Documents/Notes/": "~/kdrive/Notes/",
+              "~/test/": "~/backupTest/"
+            },
+            "interval": "daily",
+            "rsyncArgs": ["-Lqah", "--update"]
+          }
+        }
+      '';
+    };
+  };
+  flake.homeModules.desktop-notewrapper = {pkgs, ...}: {
+    home.packages = [
+      inputs.notewrapper.packages.${pkgs.system}.default
+    ];
+    home.file.".config/notewrapper/config.json" = {
+      enable = true;
+      force = true;
+      text = ''
+        {
+          "directory": ["~/hdd/kdrive/Notes/"],
+          "render": true,
+          "jumpToEndOfFileOnLaunch": true,
+          "editor": "neovim",
+          "journalRegex": ".*journal.*",
+          "dateEntry": "# %Y %m %d %a",
+          "newLineOnOpening": true,
+          "backup": {
+            "enable": false,
             "directory": {
               "~/Documents/Notes/": "~/kdrive/Notes/",
               "~/test/": "~/backupTest/"

modules/applications/tmux.nix

@@ -0,0 +1,8 @@
+_: {
+  flake.homeModules.tmux = _: {
+    programs.tmux = {
+      enable = true;
+      clock24 = true;
+    };
+  };
+}

modules/applications/zsh.nix

@@ -88,6 +88,7 @@ _: {
         nnvim = "nvim";
         nvvim = "nvim";
         nviim = "nvim";
+        hledger-ui = "puffin";
       };
     };
   };

modules/hardware/battery.nix

@@ -36,7 +36,8 @@
     services.system76-scheduler.settings.cfsProfiles.enable = true; # Better scheduling for CPU cycles - thanks System76!!!
     services.thermald.enable = false; # Enable thermald, the temperature management daemon. (only necessary if on Intel CPUs)
     services.power-profiles-daemon.enable = true; # ppd is recommended over tlp for framework 16
-    /*services.tlp = {
+    /*
+      services.tlp = {
       enable = true; # Enable TLP (better than gnomes internal power manager)
       settings = {
         CPU_BOOST_ON_AC = 1;
@@ -51,7 +52,8 @@
         PLATFORM_PROFILE_ON_BAT = "powersave";
         STOP_CHARGE_THRESH_BAT1 = 80;
       };
-    };*/
+    };
+    */
     environment.systemPackages = [
       self.packages.${pkgs.system}.custom-performance
     ];

modules/hardware/hardwareUtils.nix

@@ -2,8 +2,8 @@ _: {
   flake.nixosModules.hardwareUtils-laptop = {pkgs, ...}: {
     environment.systemPackages = with pkgs; [
       # used for the framework 16 laptop
-      framework-tool
-      framework-tool-tui
+      #framework-tool
+      #framework-tool-tui
       vial # Open-source GUI and QMK fork for configuring your keyboard in real time
     ];
   };

modules/hardware/onxyboox.nix

@@ -0,0 +1,10 @@
+_: {
+  flake.nixosModules.onxyboox = {pkgs, ...}: {
+    services.gvfs.enable = true;
+    environment.systemPackages = with pkgs; [
+      gvfs
+      calibre
+      kdePackages.kio-extras
+    ];
+  };
+}

modules/hosts/desktop.nix

@@ -30,6 +30,8 @@
       games
       hardware-configuration-desktop
       hdd
+      hledger
+      hledger-desktop
       hyprland
       IO
       kdrive-desktop # we will setup this later
@@ -69,7 +71,7 @@
       mullvad
       neovim
       nix-git-cherry-picker-desktop
-      notewrapper
+      desktop-notewrapper
       oh-my-zsh
       ripgrep
       rofi
@@ -78,6 +80,7 @@
       swaync # used in performance mode
       thunderbird
       tomasr
+      tmux
       vivify
       waybar-minimal # used in performance mode
       zoxide
@@ -130,7 +133,7 @@
     home.homeDirectory = "/home/tomasr";
 
     home.sessionVariables = {
-      EDITOR = "neovim";
+      EDITOR = "nvim";
       TERMINAL = "kitty";
     };
 

modules/hosts/laptop.nix

@@ -9,6 +9,8 @@
       inherit (self) pkgs-unstable pkgs-local pkgs-master;
     };
     modules = with self.nixosModules; [
+      inputs.agenix.nixosModules.default
+      agenix
       # important do not remove
       home-manager-laptop
       laptop
@@ -18,7 +20,7 @@
       audioAndMedia
       autoCleanup-laptop
       autoUpdate-laptop
-      battery-laptop
+      #battery-laptop
       bluetooth
       bootloader
       browsers
@@ -31,6 +33,8 @@
       gitBackup
       hardware-configuration-laptop
       hardwareUtils-laptop
+      hledger
+      hledger-laptop
       hyprland
       IO
       kdrive-laptop
@@ -43,6 +47,7 @@
       nixUtils
       notifications
       office
+      onxyboox
       #ollama
       otherUtils
       printer
@@ -63,14 +68,14 @@
       fastfetch
       git
       gtk
-      hyprland
-      hyprland-laptop
+      hyprland-old
+      #hyprland-laptop
       kitty
       librewolf
       mullvad
       neovim
       nix-git-cherry-picker-laptop
-      notewrapper
+      laptop-notewrapper
       oh-my-zsh
       ripgrep
       rofi
@@ -78,6 +83,7 @@
       ssh
       swaync # used in performance mode
       thunderbird
+      tmux
       tomasr
       vivify
       waybar-minimal # used in performance mode
@@ -126,8 +132,10 @@
     home.homeDirectory = "/home/tomasr";
 
     home.sessionVariables = {
-      EDITOR = "neovim";
+      EDITOR = "nvim";
       TERMINAL = "kitty";
+      SYSTEMD_PAGER = "cat";
+      PAGER = "cat";
     };
 
     # Required for Home Manager

modules/utilities/agenix.nix

@@ -0,0 +1,17 @@
+{inputs, ...}: {
+  flake.nixosModules.agenix = {pkgs, ...}: {
+    environment.systemPackages = [
+      inputs.agenix.packages.${pkgs.system}.default
+      pkgs.age
+    ];
+    age.identityPaths = [
+      "/etc/ssh/ssh_host_ed25519_key"
+    ];
+    age.secrets.ntfy = {
+      file = ../../secrets/ntfy.age;
+      owner = "tomasr";
+      group = "users";
+      mode = "0400";
+    };
+  };
+}

modules/utilities/audioAndMedia.nix

@@ -19,6 +19,8 @@
       self.packages.${pkgs.system}.custom-changeAudioOutput
       kdePackages.okular
       kdePackages.dolphin
+      kdePackages.dolphin-plugins
+      kdePackages.ark
       pulseaudio # sound server
       playerctl # controls media player
       pavucontrol # PulseAudio Volume Control

modules/utilities/autoCleanup.nix

@@ -2,8 +2,12 @@
   flake.nixosModules.autoCleanup-laptop = {
     pkgs,
     pkgs-unstable,
+    config,
     ...
   }: {
+    age.secrets.ntfy = {
+      file = ../../secrets/ntfy.age;
+    };
     # Ensure your script is available system-wide
     environment.systemPackages = [
       self.packages.${pkgs.system}.custom-cleanNix-laptop
@@ -17,6 +21,9 @@
       description = "NixOS configuration auto cleanup";
 
       serviceConfig = {
+        Environment = [
+          "NTFY_SECRET=${config.age.secrets.ntfy.path}"
+        ];
         Type = "oneshot";
 
         ExecStart = "/run/current-system/sw/bin/custom-cleanNix";
@@ -54,8 +61,12 @@
   flake.nixosModules.autoCleanup-desktop = {
     pkgs,
     pkgs-unstable,
+    config,
     ...
   }: {
+    age.secrets.ntfy = {
+      file = ../../secrets/ntfy.age;
+    };
     # Ensure your script is available system-wide
     environment.systemPackages = [
       self.packages.${pkgs.system}.custom-cleanNix-desktop
@@ -69,6 +80,9 @@
       description = "NixOS configuration auto cleanup";
 
       serviceConfig = {
+        Environment = [
+          "NTFY_SECRET=${config.age.secrets.ntfy.path}"
+        ];
         Type = "oneshot";
 
         ExecStart = "/run/current-system/sw/bin/custom-cleanNix";
@@ -108,14 +122,18 @@
       runtimeInputs = with pkgs; [
         git
         nixos-rebuild
-        matrix-commander-rs
+        curl
         libnotify
         alejandra
         deadnix
+        statix
       ];
 
       text = ''
-        set -e
+        set -ex
+
+        # shellcheck disable=SC1090
+        source "$NTFY_SECRET"
 
         FLAKE_DIR="/home/tomasr/nixos"
         FLAKE="$FLAKE_DIR#laptop"
@@ -139,7 +157,7 @@
         alejandra "$FLAKE_DIR" # formats the config
         echo "--------------------------------------------------------------"
 
-        if sudo /run/current-system/sw/bin/nixos-rebuild switch --flake "$FLAKE" 2> "$ERROR_FILE"; then # use /run/.../bin/ uses the sudoless rule
+        if /run/wrappers/bin/sudo /run/current-system/sw/bin/nixos-rebuild switch --flake "$FLAKE" 2> "$ERROR_FILE"; then # use /run/.../bin/ uses the sudoless rule
 
           if ! git -C "$FLAKE_DIR" diff --quiet HEAD; then
             git -C "$FLAKE_DIR" add -A
@@ -148,9 +166,11 @@
 
             notify-send "Nix auto cleanup" "Everything OK"
 
-            matrix-commander-rs --verbose -m "Nix auto cleanup. Everything OK.<br><a href=\"https://matrix.to/#/@notificationbot_0000:matrix.org\">@notificationbot_0000</a>" \
-              --html \
-              -r "\!BXRRokBmEdNOyYdfOF:matrix.org"
+            curl \
+              -u ":$NTFY_TOKEN" \
+              -d "Everything OK" \
+              -H "Title: Laptop Nix auto cleanup" \
+              "$NTFY_SERVER/Alerts"
             else
               notify-send "Nix auto cleanup" "No changes"
               git -C "$FLAKE_DIR" push
@@ -161,9 +181,11 @@
 
           notify-send -u critical "Nix auto cleanup" "FAILED"
 
-          matrix-commander-rs --verbose -m "Nix auto cleanup failed.<br>Error: <pre>$ERROR_MSG</pre><br><a href=\"https://matrix.to/#/@notificationbot_0000:matrix.org\">@notificationbot_0000</a>" \
-            --html \
-            -r "\!BXRRokBmEdNOyYdfOF:matrix.org"
+          curl \
+              -u ":$NTFY_TOKEN" \
+              -d "Nix auto cleanup failed. Error: $ERROR_MSG" \
+              -H "Title: Laptop Nix auto cleanup" \
+              "$NTFY_SERVER/Alerts"
 
           git -C "$FLAKE_DIR" reset --hard "pre-cleanup-$TIME"
         fi
@@ -178,14 +200,18 @@
       runtimeInputs = with pkgs; [
         git
         nixos-rebuild
-        matrix-commander-rs
+        curl
         libnotify
         alejandra
         deadnix
+        statix
       ];
 
       text = ''
-        set -e
+        set -ex
+
+        # shellcheck disable=SC1090
+        source "$NTFY_SECRET"
 
         FLAKE_DIR="/home/tomasr/nixos"
         FLAKE="$FLAKE_DIR#desktop"
@@ -209,7 +235,7 @@
         alejandra "$FLAKE_DIR" # formats the config
         echo "--------------------------------------------------------------"
 
-        if sudo /run/current-system/sw/bin/nixos-rebuild switch --flake "$FLAKE" 2> "$ERROR_FILE"; then # use /run/.../bin/ uses the sudoless rule
+        if /run/wrappers/bin/sudo /run/current-system/sw/bin/nixos-rebuild switch --flake "$FLAKE" 2> "$ERROR_FILE"; then # use /run/.../bin/ uses the sudoless rule
 
           if ! git -C "$FLAKE_DIR" diff --quiet HEAD; then
             git -C "$FLAKE_DIR" add -A
@@ -218,9 +244,11 @@
 
             notify-send "Nix auto cleanup" "Everything OK"
 
-            matrix-commander-rs --verbose -m "Nix auto cleanup. Everything OK.<br><a href=\"https://matrix.to/#/@notificationbot_0000:matrix.org\">@notificationbot_0000</a>" \
-              --html \
-              -r "\!BXRRokBmEdNOyYdfOF:matrix.org"
+            curl \
+              -u ":$NTFY_TOKEN" \
+              -d "Everything OK" \
+              -H "Title: Desktop Nix auto cleanup" \
+              "$NTFY_SERVER/Alerts"
             else
               notify-send "Nix auto cleanup" "No changes"
               git -C "$FLAKE_DIR" push
@@ -231,9 +259,11 @@
 
           notify-send -u critical "Nix auto cleanup" "FAILED"
 
-          matrix-commander-rs --verbose -m "Nix auto cleanup failed.<br>Error: <pre>$ERROR_MSG</pre><br><a href=\"https://matrix.to/#/@notificationbot_0000:matrix.org\">@notificationbot_0000</a>" \
-            --html \
-            -r "\!BXRRokBmEdNOyYdfOF:matrix.org"
+          curl \
+              -u ":$NTFY_TOKEN" \
+              -d "Nix auto cleanup failed. Error: $ERROR_MSG" \
+              -H "Title: Desktop Nix auto cleanup" \
+              "$NTFY_SERVER/Alerts"
 
           git -C "$FLAKE_DIR" reset --hard "pre-cleanup-$TIME"
         fi

modules/utilities/autoUpdate.nix

@@ -1,5 +1,12 @@
 {self, ...}: {
-  flake.nixosModules.autoUpdate-laptop = {pkgs, ...}: {
+  flake.nixosModules.autoUpdate-laptop = {
+    pkgs,
+    config,
+    ...
+  }: {
+    age.secrets.ntfy = {
+      file = ../../secrets/ntfy.age;
+    };
     # Ensure your script is available system-wide
     environment.systemPackages = [
       self.packages.${pkgs.system}.custom-autoupdate-laptop
@@ -12,6 +19,9 @@
       description = "NixOS flake auto update";
 
       serviceConfig = {
+        Environment = [
+          "NTFY_SECRET=${config.age.secrets.ntfy.path}"
+        ];
         Type = "oneshot";
 
         ExecStart = "/run/current-system/sw/bin/custom-autoupdate";
@@ -46,7 +56,14 @@
   };
 
   ## desktop
-  flake.nixosModules.autoUpdate-desktop = {pkgs, ...}: {
+  flake.nixosModules.autoUpdate-desktop = {
+    pkgs,
+    config,
+    ...
+  }: {
+    age.secrets.ntfy = {
+      file = ../../secrets/ntfy.age;
+    };
     # Ensure your script is available system-wide
     environment.systemPackages = [
       self.packages.${pkgs.system}.custom-autoupdate-desktop
@@ -59,6 +76,9 @@
       description = "NixOS flake auto update";
 
       serviceConfig = {
+        Environment = [
+          "NTFY_SECRET=${config.age.secrets.ntfy.path}"
+        ];
         Type = "oneshot";
 
         ExecStart = "/run/current-system/sw/bin/custom-autoupdate";
@@ -98,11 +118,14 @@
       runtimeInputs = with pkgs; [
         git
         nixos-rebuild
-        matrix-commander-rs
+        curl
         libnotify
+        nix
       ];
 
       text = ''
+        # shellcheck disable=SC1090
+        source "$NTFY_SECRET"
         set -e
 
         FLAKE_DIR="/home/tomasr/nixos"
@@ -119,7 +142,7 @@
         # update lock only
         nix flake update --flake "$FLAKE_DIR"
 
-        if sudo /run/current-system/sw/bin/nixos-rebuild switch --flake "$FLAKE" 2> "$ERROR_FILE"; then # use /run/.../bin/ uses the sudoless rule
+        if /run/wrappers/bin/sudo ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --flake "$FLAKE" 2> "$ERROR_FILE"; then # use /run/.../bin/ uses the sudoless rule
 
           if ! git -C "$FLAKE_DIR" diff --quiet -- flake.lock; then
             git -C "$FLAKE_DIR" add flake.lock
@@ -128,9 +151,11 @@
 
             notify-send "Flake autoupdate" "Rebuild OK"
 
-            matrix-commander-rs --verbose -m "Flake rebuild succesfull.<br><a href=\"https://matrix.to/#/@notificationbot_0000:matrix.org\">@notificationbot_0000</a>" \
-              --html \
-              -r "\!BXRRokBmEdNOyYdfOF:matrix.org"
+            curl \
+              -u ":$NTFY_TOKEN" \
+              -d "Laptop Flake rebuild successful" \
+              -H "Title: Flake autoupdate" \
+              "$NTFY_SERVER/Alerts"
             else
               notify-send "Flake autoupdate" "No changes"
               git -C "$FLAKE_DIR" push
@@ -141,9 +166,12 @@
 
           notify-send -u critical "Flake autoupdate" "FAILED"
 
-          matrix-commander-rs --verbose -m "Flake rebuild failed.<br>Error: <pre>$ERROR_MSG</pre><br><a href=\"https://matrix.to/#/@notificationbot_0000:matrix.org\">@notificationbot_0000</a>" \
-            --html \
-            -r "\!BXRRokBmEdNOyYdfOF:matrix.org"
+          curl \
+            -u ":$NTFY_TOKEN" \
+            -d "Laptop Flake rebuild failed. Error: $ERROR_MSG" \
+            -H "Title: Flake autoupdate FAILED" \
+            -H "Priority: urgent" \
+            "$NTFY_SERVER/Alerts"
 
           git -C "$FLAKE_DIR" reset --hard "pre-autoupdate-$TIME"
         fi
@@ -159,11 +187,14 @@
       runtimeInputs = with pkgs; [
         git
         nixos-rebuild
-        matrix-commander-rs
         libnotify
+        curl
+        nix
       ];
 
       text = ''
+        # shellcheck disable=SC1090
+        source "$NTFY_SECRET"
         set -e
 
         FLAKE_DIR="/home/tomasr/nixos"
@@ -180,7 +211,7 @@
         # update lock only
         nix flake update --flake "$FLAKE_DIR"
 
-        if sudo /run/current-system/sw/bin/nixos-rebuild switch --flake "$FLAKE" 2> "$ERROR_FILE"; then # use /run/.../bin/ uses the sudoless rule
+        if /run/wrappers/bin/sudo /run/current-system/sw/bin/nixos-rebuild switch --flake "$FLAKE" 2> "$ERROR_FILE"; then # use /run/.../bin/ uses the sudoless rule
 
           if ! git -C "$FLAKE_DIR" diff --quiet -- flake.lock; then
             git -C "$FLAKE_DIR" add flake.lock
@@ -189,9 +220,12 @@
 
             notify-send "Flake autoupdate" "Rebuild OK"
 
-            matrix-commander-rs --verbose -m "Flake rebuild succesfull.<br><a href=\"https://matrix.to/#/@notificationbot_0000:matrix.org\">@notificationbot_0000</a>" \
-              --html \
-              -r "\!BXRRokBmEdNOyYdfOF:matrix.org"
+            curl \
+              -u ":$NTFY_TOKEN" \
+              -d "Flake rebuild successful" \
+              -H "Title: Desktop Flake autoupdate" \
+              "$NTFY_SERVER/Alerts"
+
             else
               notify-send "Flake autoupdate" "No changes"
               git -C "$FLAKE_DIR" push
@@ -202,9 +236,12 @@
 
           notify-send -u critical "Flake autoupdate" "FAILED"
 
-          matrix-commander-rs --verbose -m "Flake rebuild failed.<br>Error: <pre>$ERROR_MSG</pre><br><a href=\"https://matrix.to/#/@notificationbot_0000:matrix.org\">@notificationbot_0000</a>" \
-            --html \
-            -r "\!BXRRokBmEdNOyYdfOF:matrix.org"
+          curl \
+            -u ":$NTFY_TOKEN" \
+            -d "Flake rebuild failed. Error: $ERROR_MSG" \
+            -H "Title: Desktop Flake autoupdate FAILED" \
+            -H "Priority: urgent" \
+            "$NTFY_SERVER/Alerts"
 
           git -C "$FLAKE_DIR" reset --hard "pre-autoupdate-$TIME"
         fi

modules/utilities/budget.nix

@@ -0,0 +1,20 @@
+_: {
+  flake.nixosModules.hledger = {pkgs, ...}: {
+    environment.systemPackages = with pkgs; [
+      hledger
+      hledger-web
+      asciinema # used for some hledger demos
+      puffin
+    ];
+  };
+  flake.nixosModules.hledger-laptop = _: {
+    environment.variables = {
+      LEDGER_FILE = "/home/tomasr/kdrive/Budget/hledger.journal";
+    };
+  };
+  flake.nixosModules.hledger-desktop = _: {
+    environment.variables = {
+      LEDGER_FILE = "/home/tomasr/hdd/kdrive/Budget/hledger.journal";
+    };
+  };
+}

modules/utilities/communicationAndNotification.nix

@@ -3,44 +3,26 @@
     environment.systemPackages = with pkgs; [
       libnotify # Library that sends desktop notifications to a notification daemon
       socat # Utility for bidirectional data transfer between two independent data channels (used to communicate between hyprland and awww to change wallpapers dinamically)
-      matrix-commander-rs # matrix client used to send notifications from scripts to my phone
       # battery notifications
       self.packages.${pkgs.system}.custom-batterynotify
       self.packages.${pkgs.system}.custom-batterywarning
-      # checks if matrix-commander-rs is installed and logged in
-      self.packages.${pkgs.system}.custom-checkMatrix
       self.packages.${pkgs.system}.custom-gitnotify # checks if git is set up
       self.packages.${pkgs.system}.custom-checkKdrive # check if kdrive is set up with rclone
       zoom-us
     ];
   };
   perSystem = {pkgs, ...}: {
-    packages.custom-checkMatrix = pkgs.writeShellApplication {
-      name = "custom-checkMatrix";
-
-      runtimeInputs = with pkgs; [
-        matrix-commander-rs
-        libnotify
-      ];
-
-      text = ''
-        expected="@totorile1:unredacted.org"
-
-        current="$(matrix-commander-rs --whoami | tr -d '\n')"
-
-        if [ "$current" != "$expected" ]; then
-          notify-send "matrix-commander-rs" \
-            "You are not logged in as @totorile1:unredacted.org\nLog:\n$current"
-        fi
-      '';
-    };
     packages.custom-gitnotify = pkgs.writeShellApplication {
       name = "custom-gitnotify";
       runtimeInputs = with pkgs; [
         git
         libnotify
+        curl
       ];
       text = ''
+        # shellcheck disable=SC1091
+        source /run/agenix/ntfy
+
         # Check if git is installed
         if ! command -v git >/dev/null 2>&1; then
             exit 0
@@ -53,9 +35,10 @@
             notify-send \
                 "Git not configured" \
                 "Set your identity\n or remove this warning by removing the custom-gitnotify line in\n ~/nixos/modules/applications/hyprland.nix"
-            matrix-commander-rs --verbose -m "Git not configured.<br>Set your identify or remove this warning by removing the custom-gitnotify in ~/nixos/modules/applications/hyprland.nix<br><a href=\"https://matrix.to/#/@notificationbot_0000:matrix.org\">@notificationbot_0000</a>" \
-            --html \
-            -r "\!BXRRokBmEdNOyYdfOF:matrix.org"
+            curl \
+              -u ":$NTFY_TOKEN" \
+              -d "Git not configured" \
+              "$NTFY_SERVER/Alerts"
         fi
       '';
     };

modules/utilities/development.nix

@@ -48,11 +48,17 @@
           "configFetchTime": 1,
           "localNotify": true,
           "matrix": {
-            "enable": true,
+            "enable": false,
             "room": "!BXRRokBmEdNOyYdfOF:matrix.org",
             "ping": true,
             "userPing": "@notificationbot_0000",
             "userPingServer": "matrix.org"
+          },
+          "ntfy": {
+            "enable": true,
+            "auth": ":$NTFY_TOKEN",
+            "server": "$NTFY_SERVER",
+            "topic": "Alerts"
           }
         }
       '';

modules/utilities/gitBackup.nix

@@ -1,5 +1,12 @@
 {self, ...}: {
-  flake.nixosModules.gitBackup = {pkgs, ...}: {
+  flake.nixosModules.gitBackup = {
+    pkgs,
+    config,
+    ...
+  }: {
+    age.secrets.ntfy = {
+      file = ../../secrets/ntfy.age;
+    };
     environment.systemPackages = [
       self.packages.${pkgs.system}.custom-gitBackup
     ];
@@ -9,6 +16,9 @@
 
       serviceConfig = {
         Type = "oneshot";
+        Environment = [
+          "NTFY_SECRET=${config.age.secrets.ntfy.path}"
+        ];
 
         ExecStart = "/run/current-system/sw/bin/custom-gitBackup";
 
@@ -41,11 +51,14 @@
       name = "custom-gitBackup";
       runtimeInputs = with pkgs; [
         rsync
-        matrix-commander-rs
+        curl
         libnotify
         self.packages.${pkgs.system}.custom-checkKdrive
       ];
       text = ''
+        # shellcheck disable=SC1090
+        source "$NTFY_SECRET"
+
         # checks if kdrive is available
         custom-checkKdrive
 
@@ -69,9 +82,11 @@
         notify_error() {
             local message="$1"
             notify-send "Git Backup Failed" "$message"
-            matrix-commander-rs --verbose -m "Git Backup Failed: $message <br><a href=\"https://matrix.to/#/@notificationbot_0000:matrix.org\">@notificationbot_0000</a>" \
-            --html \
-            -r "\!BXRRokBmEdNOyYdfOF:matrix.org"
+            curl \
+              -u ":$NTFY_TOKEN" \
+              -d "Git backup failed. Error: $message" \
+              -H "Title: Git Backup" \
+              "$NTFY_SERVER/Alerts"
 
         }
 

modules/utilities/networking.nix

@@ -16,7 +16,15 @@ _: {
     networking.networkmanager.enable = true;
 
     # Enable the OpenSSH daemon.
-    # services.openssh.enable = true;
+    services.openssh = {
+      enable = true;
+      hostKeys = [
+        {
+          path = "/etc/ssh/ssh_host_ed25519_key";
+          type = "ed25519";
+        }
+      ];
+    };
 
     # Open ports in the firewall.
     # networking.firewall.allowedTCPPorts = [ ... ];

modules/utilities/office.nix

@@ -3,6 +3,12 @@ _: {
     environment.systemPackages = with pkgs; [
       libreoffice
       birdtray
+      kdePackages.korganizer
+      #needed for korganizer
+      kdePackages.akonadi
+      kdePackages.akonadi-calendar
+      kdePackages.akonadi-calendar-tools
     ];
+    programs.kde-pim.kontact = true; # needed for korganizer
   };
 }

modules/utilities/rss.nix

@@ -1,7 +1,7 @@
 _: {
   flake.nixosModules.rss = {pkgs, ...}: {
     environment.systemPackages = with pkgs; [
-      nom
+      newsflash
     ];
   };
 }

secrets/secrets.nix

@@ -0,0 +1,9 @@
+let
+  backupAgeKey = "age1y4lhpk7awhjyu42p46ulg5q2c49r2lnwu8tyyk4ejj6jztd64uksfhd670";
+  laptopHostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJCsewl8ZXXMjRyO20cBIiuW2gA4mGoMkxQ0dcMyNidR root@nixos";
+in {
+  "ntfy.age".publicKeys = [
+    backupAgeKey
+    laptopHostKey
+  ];
+}