From d340b9c08b7f576faa2029755c8908401af96eef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Tue, 9 Jun 2026 16:26:34 +0200 Subject: [PATCH 1/5] micro-vivify: comment out from flake.nix --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index a95a4ee..363ea8a 100644 --- a/flake.nix +++ b/flake.nix @@ -45,10 +45,10 @@ url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; - microPlugins-vivify = { + /*microPlugins-vivify = { url = "git+https://codeberg.org/gibbert/micro-vivify"; flake = false; - }; + };*/ flake-parts = { url = "github:hercules-ci/flake-parts"; }; From 7e0ba6278c32367c6a25fc03be9a58b72c94315c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Tue, 9 Jun 2026 16:39:17 +0200 Subject: [PATCH 2/5] snapshot pre-cleanup-2026-06-09T14-39-17Z From b1edbc9378f4bdda92f3ea76841d0cb593453339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Tue, 9 Jun 2026 16:39:36 +0200 Subject: [PATCH 3/5] Auto: cleanup-2026-06-09T14-39-17Z --- flake.lock | 17 ---- flake.nix | 6 +- modules/applications/git.nix | 6 +- modules/applications/kdrive.nix | 14 ++-- modules/applications/zsh.nix | 2 +- modules/hardware/disko/disko-config.nix | 2 +- modules/hardware/hardware-configuration.nix | 86 +++++++++++---------- modules/hardware/nvidia.nix | 2 +- modules/utilities/development.nix | 3 +- 9 files changed, 66 insertions(+), 72 deletions(-) diff --git a/flake.lock b/flake.lock index 92c8dc5..c660d8e 100644 --- a/flake.lock +++ b/flake.lock @@ -156,22 +156,6 @@ "type": "github" } }, - "microPlugins-vivify": { - "flake": false, - "locked": { - "lastModified": 1770382657, - "narHash": "sha256-yWmIgT90mC9PhzyH/itDbRMmRTiZiwW+Yo0dsHW7ni8=", - "ref": "refs/heads/main", - "rev": "3c5cb25facf3fc4143bfea9323a60eda65ef8485", - "revCount": 8, - "type": "git", - "url": "https://codeberg.org/gibbert/micro-vivify" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/gibbert/micro-vivify" - } - }, "nix-git-cherry-picker": { "inputs": { "flake-utils": [ @@ -391,7 +375,6 @@ "flake-utils": "flake-utils", "home-manager": "home-manager", "import-tree": "import-tree", - "microPlugins-vivify": "microPlugins-vivify", "nix-git-cherry-picker": "nix-git-cherry-picker", "nixos-grub-themes": "nixos-grub-themes", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index 363ea8a..c86261b 100644 --- a/flake.nix +++ b/flake.nix @@ -45,10 +45,12 @@ url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; - /*microPlugins-vivify = { + /* + microPlugins-vivify = { url = "git+https://codeberg.org/gibbert/micro-vivify"; flake = false; - };*/ + }; + */ flake-parts = { url = "github:hercules-ci/flake-parts"; }; diff --git a/modules/applications/git.nix b/modules/applications/git.nix index 02a2c6e..4d12f77 100644 --- a/modules/applications/git.nix +++ b/modules/applications/git.nix @@ -2,9 +2,11 @@ _: { flake.homeModules.git = _: { programs.git = { enable = true; - /*settings = { + /* + settings = { init.defaultBranch = "main"; - };*/ + }; + */ }; programs.gh = { enable = true; diff --git a/modules/applications/kdrive.nix b/modules/applications/kdrive.nix index e7cac9a..d432f13 100644 --- a/modules/applications/kdrive.nix +++ b/modules/applications/kdrive.nix @@ -25,22 +25,24 @@ systemd.user.services.kdrive-sync = { serviceConfig = { ExecStart = "${self.packages.${pkgs.system}.custom-synckdrive-desktop}/bin/custom-synckdrive"; - - Nice = 19; # lowest CPU scheduling priority + + Nice = 19; # lowest CPU scheduling priority IOSchedulingClass = "idle"; IOSchedulingPriority = 7; - + # Optional: - CPUWeight = 1; # minimum relative CPU share + CPUWeight = 1; # minimum relative CPU share }; }; - /*systemd.user.timers.kdrive-sync = { + /* + systemd.user.timers.kdrive-sync = { wantedBy = [ "timers.target" ]; timerConfig = { OnBootSec = "1m"; OnUnitActiveSec = "5m"; }; - };*/ + }; + */ }; perSystem = {pkgs, ...}: { packages.custom-checkKdrive = pkgs.writeShellApplication { diff --git a/modules/applications/zsh.nix b/modules/applications/zsh.nix index 59525d7..c58545b 100644 --- a/modules/applications/zsh.nix +++ b/modules/applications/zsh.nix @@ -33,7 +33,7 @@ _: { command cat "$@" fi } - + custom-eza() { # behaves differently if we just call it or if we pipe initContent if [[ -t 1 ]]; then eza -hlF -aa --color=always --hyperlink --group-directories-first --show-symlinks --icons=always --git --no-permissions "$@" diff --git a/modules/hardware/disko/disko-config.nix b/modules/hardware/disko/disko-config.nix index 53cee37..f78d8dd 100644 --- a/modules/hardware/disko/disko-config.nix +++ b/modules/hardware/disko/disko-config.nix @@ -30,7 +30,7 @@ _: { content = { type = "btrfs"; - extraArgs = [ "-f" ]; + extraArgs = ["-f"]; subvolumes = { "@root" = { diff --git a/modules/hardware/hardware-configuration.nix b/modules/hardware/hardware-configuration.nix index 1cbe592..9087fa0 100644 --- a/modules/hardware/hardware-configuration.nix +++ b/modules/hardware/hardware-configuration.nix @@ -33,49 +33,53 @@ _: { nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }; -flake.nixosModules.hardware-configuration-desktop = # Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: + flake.nixosModules.hardware-configuration-desktop = + # Do not modify this file! It was generated by ‘nixos-generate-config’ + # and may be overwritten by future invocations. Please make changes + # to /etc/nixos/configuration.nix instead. + { + config, + lib, + modulesPath, + ... + }: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + boot.initrd.availableKernelModules = ["vmd" "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + fileSystems."/" = { + device = "/dev/disk/by-uuid/14bcd132-b4a3-46f2-ac35-3497340de4b2"; + fsType = "btrfs"; + }; - fileSystems."/" = - { device = "/dev/disk/by-uuid/14bcd132-b4a3-46f2-ac35-3497340de4b2"; - fsType = "btrfs"; + fileSystems."/home" = { + device = "/dev/disk/by-uuid/14bcd132-b4a3-46f2-ac35-3497340de4b2"; + fsType = "btrfs"; + options = ["subvol=home"]; + }; + + fileSystems."/nix" = { + device = "/dev/disk/by-uuid/14bcd132-b4a3-46f2-ac35-3497340de4b2"; + fsType = "btrfs"; + options = ["subvol=nix"]; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/BAB4-34F6"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; + + swapDevices = [ + {device = "/dev/disk/by-uuid/ce6f9a68-0517-4f8a-b375-66f2173efe59";} + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }; - - fileSystems."/home" = - { device = "/dev/disk/by-uuid/14bcd132-b4a3-46f2-ac35-3497340de4b2"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; - - fileSystems."/nix" = - { device = "/dev/disk/by-uuid/14bcd132-b4a3-46f2-ac35-3497340de4b2"; - fsType = "btrfs"; - options = [ "subvol=nix" ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/BAB4-34F6"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/ce6f9a68-0517-4f8a-b375-66f2173efe59"; } - ]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -}; } diff --git a/modules/hardware/nvidia.nix b/modules/hardware/nvidia.nix index 911c8d5..adb4a80 100644 --- a/modules/hardware/nvidia.nix +++ b/modules/hardware/nvidia.nix @@ -1,7 +1,7 @@ _: { flake.nixosModules.nvidia = _: { hardware.graphics.enable = true; - services.xserver.videoDrivers = [ "nvidia" ]; + services.xserver.videoDrivers = ["nvidia"]; hardware.nvidia.open = true; }; } diff --git a/modules/utilities/development.nix b/modules/utilities/development.nix index 49f46ce..a851b63 100644 --- a/modules/utilities/development.nix +++ b/modules/utilities/development.nix @@ -24,7 +24,8 @@ gnumake go direnv - git gh + git + gh cling # c interpreter used for coding # lsp clang-tools From 68d81d5c4b5d71bd20a32eb865c90eb8a7f215ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Tue, 9 Jun 2026 20:11:13 +0200 Subject: [PATCH 4/5] mathematics: init module with lean4 --- modules/applications/mathematics.nix | 7 +++++++ modules/hosts/desktop.nix | 1 + modules/hosts/laptop.nix | 1 + 3 files changed, 9 insertions(+) create mode 100644 modules/applications/mathematics.nix diff --git a/modules/applications/mathematics.nix b/modules/applications/mathematics.nix new file mode 100644 index 0000000..2d8ce6e --- /dev/null +++ b/modules/applications/mathematics.nix @@ -0,0 +1,7 @@ +_: { + flake.nixosModules.mathematics = {pkgs, ...}: { + environment.systemPackages = with pkgs; [ + elan + ]; + }; +} diff --git a/modules/hosts/desktop.nix b/modules/hosts/desktop.nix index b46a235..fa83317 100644 --- a/modules/hosts/desktop.nix +++ b/modules/hosts/desktop.nix @@ -35,6 +35,7 @@ kdrive-desktop # we will setup this later latex ly + mathematics mullvad networking notifications diff --git a/modules/hosts/laptop.nix b/modules/hosts/laptop.nix index f6b1400..85fe064 100644 --- a/modules/hosts/laptop.nix +++ b/modules/hosts/laptop.nix @@ -36,6 +36,7 @@ kdrive-laptop latex ly + mathematics mullvad networking notifications From 433bb52cde2961b8b28f4914d04d9e9c1e2ba516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Wed, 10 Jun 2026 10:26:16 +0200 Subject: [PATCH 5/5] CI: weekly PR merge to main from desktop and laptop --- .github/workflows/sync-main.yml | 58 +++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/sync-main.yml diff --git a/.github/workflows/sync-main.yml b/.github/workflows/sync-main.yml new file mode 100644 index 0000000..d92f97f --- /dev/null +++ b/.github/workflows/sync-main.yml @@ -0,0 +1,58 @@ +name: Sync branches into main + +on: + schedule: + - cron: "0 14 * * 1" + + - cron: "0 14 * * 3" + + workflow_dispatch: + +permissions: + contents: write + pull-requests: write + +jobs: + sync: + runs-on: ubuntu-latest + + steps: + - name: Determine source branch + id: branch + run: | + DOW=$(date -u +%u) + + if [ "$DOW" = "1" ]; then + echo "source=laptop" >> "$GITHUB_OUTPUT" + elif [ "$DOW" = "3" ]; then + echo "source=desktop" >> "$GITHUB_OUTPUT" + else + echo "Not a scheduled sync day" + exit 1 + fi + + - name: Create pull request + id: cpr + uses: peter-evans/create-pull-request@v7 + with: + token: ${{ secrets.GITHUB_TOKEN }} + base: main + branch: ${{ steps.branch.outputs.source }} + title: "Weekly sync: ${{ steps.branch.outputs.source }} → main" + body: | + This pull request was created automatically by GitHub Actions. + + If the branch can be merged cleanly, auto-merge will merge it automatically. + + If there are merge conflicts, this PR will remain open until they are resolved. + draft: false + + - name: Enable auto-merge + if: steps.cpr.outputs.pull-request-number + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + gh pr merge \ + ${{ steps.cpr.outputs.pull-request-number }} \ + --auto \ + --merge