local customizations

             @@ -1,6 +1,4 @@     1      1# SPDX-License-Identifier: LGPL-2.1-or-later     2       mkosi.local/     3       mkosi.local.conf     4      2mkosi.output/     5      3mkosi.cache/     6      4mkosi.tools/

             @@ -1,1 +1,1 @@     1       systemd/**            1/systemd/**

             @@ -1,9 +1,10 @@     1      1BIN_DIR := mkosi.profiles/custom/mkosi.extra/usr/local/bin     2      2PACKAGES_DIR := mkosi.profiles/custom/mkosi.packages     3      3btdu := $(BIN_DIR)/btdu            4jj := $(BIN_DIR)/jj     4      5opensnitch := $(PACKAGES_DIR)/opensnitch.rpm     5      6opensnitch_ui := $(PACKAGES_DIR)/opensnitch_ui.rpm     6       ALL := $(btdu) $(opensnitch) $(opensnitch_ui)            7ALL := $(btdu) $(jj) $(opensnitch) $(opensnitch_ui)     7      8LATEST_VERSION = $(shell mkosi summary --json | jq -r '.Images[] | select(.Image == "main") | .ImageVersion')     8      9INSTALLED_VERSION = $(shell grep IMAGE_VERSION /etc/os-release | cut -d= -f2 | tr -d \")     9     10             @@ -17,9 +18,18 @@    17     18$(BIN_DIR) $(PACKAGES_DIR):    18     19	mkdir -p $@    19     20           21$(jj): $(MAKE_TMPDIR)/jj.tar.gz           22	echo 9967a240e3294a0bce4444c55d40a35b70af44c69b558689aced95e4e497cef2 $(MAKE_TMPDIR)/jj.tar.gz | sha256sum --check           23	tar -xzf $(MAKE_TMPDIR)/jj.tar.gz -C $(MAKE_TMPDIR) --one-top-level=jj_out --overwrite           24	cp $(MAKE_TMPDIR)/jj_out/jj $@           25           26$(MAKE_TMPDIR)/jj.tar.gz:           27	wget https://github.com/jj-vcs/jj/releases/download/v0.35.0/jj-v0.35.0-x86_64-unknown-linux-musl.tar.gz -O $(MAKE_TMPDIR)/jj.tar.gz           28    20     29$(btdu): $(MAKE_TMPDIR)/btdu    21     30	echo 35b9bb752e6aa902b8281e92a5411b2f1cfb9fa251089adf909dc95efc011c48 $(MAKE_TMPDIR)/btdu | sha256sum --check    22     31	cp $(MAKE_TMPDIR)/btdu $@           32	chmod +x $@    23     33    24     34$(MAKE_TMPDIR)/btdu:    25     35	wget https://github.com/CyberShadow/btdu/releases/download/v0.6.0/btdu-static-x86_64 -O $(MAKE_TMPDIR)/btdu             @@ -45,8 +55,8 @@    45     55	ln -s ~/Vaults/particleos_keys/sbctl/var/keys/db/db.key mkosi.key    46     56    47     57.PHONY: build    48       build:    49       	mkosi build --auto-bump           58build: deps           59	mkosi build --auto-bump --cache-only never    50     60    51     61.PHONY: systemd    52     62systemd:             @@ -56,13 +66,12 @@    56     66sysupdate:    57     67	mkosi sysupdate -- update    58     68	mkdir -p versions    59       	cat mkosi.output/ParticleOS_$(LATEST_VERSION)_x86-64.manifest | gzip > versions/$(LATEST_VERSION).manifest.gz    60     69	cat mkosi.output/ParticleOS_$(LATEST_VERSION)_x86-64.changelog | gzip > versions/$(LATEST_VERSION).changelog.gz    61     70    62     71.PHONY: diff_changelog    63     72diff_changelog:    64       	diff --color=always -u <(gzip --decompress --to-stdout versions/$(INSTALLED_VERSION).changelog.gz) mkosi.output/ParticleOS_$(LATEST_VERSION)_x86-64.changelog           73	sh -c 'diff --color=always -u <(gzip --decompress --to-stdout versions/$(INSTALLED_VERSION).changelog.gz) mkosi.output/ParticleOS_$(LATEST_VERSION)_x86-64.changelog; test $$? -le 1'    65     74    66     75.PHONY: diff_manifest    67     76diff_manifest:    68       	diff --color=always -u <(gzip --decompress --to-stdout versions/$(INSTALLED_VERSION).manifest.gz) mkosi.output/ParticleOS_$(LATEST_VERSION)_x86-64.manifest           77	sh -c 'diff --color=always -u /etc/mkosi-manifest mkosi.output/ParticleOS_$(LATEST_VERSION)_x86-64.manifest; test $$? -le 1'

             @@ -3,9 +3,6 @@     3      3Release=43     4      4     5      5[Build]     6       ToolsTree=default     7       ToolsTreeDistribution=fedora     8       ToolsTreeProfiles=misc,runtime,gui     9      6ExtraSearchPaths=./systemd/build/mkosi.builddir/fedora~43~x86-64/    10      7    11      8[Config]             @@ -16,140 +13,3 @@    16     13    17     14[Content]    18     15VolatilePackageDirectories=./systemd/build/mkosi.builddir/fedora~43~x86-64/    19       Packages=    20               # keyrings for building other distro images    21               archlinux-keyring    22               debian-keyring    23               ansible    24               awk    25               bash    26               bash-completion    27               binutils    28               bind-utils    29               bat    30               clatd    31               clang-devel    32               cowsay    33               cmatrix    34               curl    35               debian-keyring    36               dictd    37               du-dust    38               duf    39               d2    40               emacs    41               entr    42               exfatprogs    43               exiftool    44               fastfetch    45               fcitx5-mozc    46               fcitx5-configtool    47               fcitx5-gtk    48               fcitx5-qt    49               firejail    50               fontawesome-fonts-all    51               kcm-fcitx5    52               fd-find    53               file    54               fish    55               flatpak    56               fprintd-pam    57               fortune    58               # needed for appimage    59               fuse-libs    60               fzf    61               gcc    62               git    63               git-absorb    64               git-delta    65               git-lfs    66               glances    67               # needed for geoclue?    68               glib-networking    69               guestfs-tools    70               golang    71               graphviz    72               htop    73               iio-sensor-proxy    74               ImageMagick    75               iperf3    76               java-latest-openjdk    77               katago-opencl    78               intel-opencl    79               OpenCL-ICD-Loader    80               @kde-desktop    81               kde-connect    82               kde-partitionmanager    83               kitty    84               kitty-shell-integration    85               kitty-terminfo    86               krfb    87               libfprint-tod    88               libfprint-2-tod1-broadcom    89               libfprint-tod-selinux    90               litecli    91               lm_sensors    92               lolcat    93               lshw    94               lsof    95               man    96               # include mkosi just for shell completion and man pages    97               mkosi    98               mokutil    99               mpv   100               ncdu   101               neovim   102               ninja   103               okular   104               osc   105               # needed for bell fish function   106               oxygen-sounds   107               pre-commit   108               python3-neovim   109               nmap   110               nmap-ncat   111               # for coc.nvim   112               npm   113               # needed for clatd on F43 apparently   114               perl-IPC-Cmd   115               perl-JSON   116               pipewire-utils   117               plasma-disks   118               plasma-vault   119               pnpm   120               powertop   121               proxychains-ng   122               pv   123               python3-netaddr   124               ripgrep   125               rubygem-asciidoctor   126               rustup   127               rsync   128               sbctl   129               setroubleshoot   130               sbsigntools   131               sqlite   132               stgit   133               tcpdump   134               # not yet available for fedora 43   135               terraform-ls   136               tmux   137               toolbox   138               tor   139               translate-shell   140               trash-cli   141               ttyplot   142               units   143               unrar-free   144               @virtualization   145               wget   146               whois   147               wl-clipboard   148               wireshark   149               yubikey-manager   150               kernel   151               # repository directory comes from mkosi.packages   152               repository/opensnitch_ui.rpm   153               repository/opensnitch.rpm   154               python3-grpcio+protobuf   155               python3-slugify

             @@ -1,1 +1,1 @@     1       15bd1496c9b59c1ec8ee05e78c65eeb3f148c898            12e5f717545e2664ce2ed6b2dd84744b3789156b1

             @@ -0,0 +1,148 @@            1[Content]            2Packages=            3        # keyrings for building other distro images            4        archlinux-keyring            5        debian-keyring            6        ansible            7        ansible-collection-ansible-posix            8        ansible-collection-community-postgresql            9        ansible-collection-community-general           10        ansible-collection-community-crypto           11        python3-ansible-lint           12        asciiquarium           13        awk           14        bash           15        bash-completion           16        bat           17        binutils           18        bind-utils           19        bridge-utils           20        clatd           21        clang-devel           22        cowsay           23        cmatrix           24        curl           25        dictd           26        diffoscope           27        du-dust           28        duf           29        d2           30        emacs           31        entr           32        exfatprogs           33        exiftool           34        fastfetch           35        fcitx5-mozc           36        fcitx5-configtool           37        fcitx5-gtk           38        fcitx5-qt           39        firejail           40        kcm-fcitx5           41        fd-find           42        file           43        fish           44        flatpak           45        fprintd-pam           46        fortune           47        # needed for appimage           48        fuse-libs           49        fzf           50        gcc           51        git           52        git-absorb           53        git-delta           54        git-lfs           55        glances           56        # needed for geoclue?           57        glib-networking           58        guestfs-tools           59        golang           60        graphviz           61        htop           62        iio-sensor-proxy           63        ImageMagick           64        iperf3           65        java-latest-openjdk           66        katago-opencl           67        intel-opencl           68        OpenCL-ICD-Loader           69        @kde-desktop           70        kde-connect           71        kde-partitionmanager           72        kitty           73        kitty-shell-integration           74        kitty-terminfo           75        krfb           76        libfprint-tod           77        libfprint-2-tod1-broadcom           78        libfprint-tod-selinux           79        litecli           80        lm_sensors           81        lolcat           82        lshw           83        lsof           84        man           85        # include mkosi just for shell completion and man pages           86        mkosi           87        mokutil           88        mpv           89        ncdu           90        neovim           91        ninja           92        okular           93        opentofu           94        osc           95        # needed for bell fish function           96        oxygen-sounds           97        pre-commit           98        python3-neovim           99        nmap          100        nmap-ncat          101        # for coc.nvim          102        npm          103        # needed for clatd on F43 apparently          104        perl-IPC-Cmd          105        perl-JSON          106        pipewire-utils          107        plasma-disks          108        plasma-vault          109        pnpm          110        powertop          111        progress          112        proxychains-ng          113        pv          114        python3-netaddr          115        restic          116        autorestic          117        ripgrep          118        rubygem-asciidoctor          119        rustup          120        rsync          121        sbctl          122        setroubleshoot          123        sbsigntools          124        sqlite          125        stgit          126        tcpdump          127        # not yet available for fedora 43          128        terraform-ls          129        tmux          130        toolbox          131        tor          132        translate-shell          133        trash-cli          134        ttyplot          135        units          136        unrar-free          137        @virtualization          138        wget          139        whois          140        wl-clipboard          141        wireshark          142        yubikey-manager          143        kernel          144        # repository directory comes from mkosi.packages          145        repository/opensnitch_ui.rpm          146        repository/opensnitch.rpm          147        python3-grpcio+protobuf          148        python3-slugify

             @@ -1,10 +0,0 @@     1       [copr:copr.fedorainfracloud.org:chenxiaolong:sbctl]     2       name=Copr repo for sbctl owned by chenxiaolong     3       baseurl=https://download.copr.fedorainfracloud.org/results/chenxiaolong/sbctl/fedora-$releasever-$basearch/     4       type=rpm-md     5       skip_if_unavailable=True     6       gpgcheck=1     7       gpgkey=https://download.copr.fedorainfracloud.org/results/chenxiaolong/sbctl/pubkey.gpg     8       repo_gpgcheck=0     9       enabled=1    10       enabled_metadata=1

             @@ -1,10 +0,0 @@     1       [copr:copr.fedorainfracloud.org:grahamwhiteuk:libfprint-tod]     2       name=Copr repo for libfprint-tod owned by grahamwhiteuk     3       baseurl=https://download.copr.fedorainfracloud.org/results/grahamwhiteuk/libfprint-tod/fedora-$releasever-$basearch/     4       type=rpm-md     5       skip_if_unavailable=True     6       gpgcheck=1     7       gpgkey=https://download.copr.fedorainfracloud.org/results/grahamwhiteuk/libfprint-tod/pubkey.gpg     8       repo_gpgcheck=0     9       enabled=1    10       enabled_metadata=1

             @@ -1,13 +0,0 @@     1       [hashicorp]     2       name=Hashicorp Stable - $basearch     3       baseurl=https://rpm.releases.hashicorp.com/fedora/$releasever/$basearch/stable     4       enabled=1     5       gpgcheck=1     6       gpgkey=https://rpm.releases.hashicorp.com/gpg     7            8       [hashicorp-test]     9       name=Hashicorp Test - $basearch    10       baseurl=https://rpm.releases.hashicorp.com/fedora/$releasever/$basearch/test    11       enabled=0    12       gpgcheck=1    13       gpgkey=https://rpm.releases.hashicorp.com/gpg

             @@ -3,6 +3,7 @@     3      3# This overrides the same file from systemd since we want to symlink everything     4      4# into /etc instead of copying so updates to /usr propagate properly.     5      5L /etc/os-release - - - - ../usr/lib/os-release            6L /etc/mkosi-manifest - - - - ../usr/lib/mkosi-manifest     6      7L+ /etc/mtab - - - - ../proc/self/mounts     7      8# Contains the default systemd locale     8      9L /etc/locale.conf             @@ -71,6 +72,10 @@    71     72L? /etc/manpath.config    72     73# Required by man-db-cache-update.service    73     74L? /etc/sysconfig/man-db           75# some programs still rely on logrotate           76L? /etc/logrotate.conf           77L? /etc/logrotate.d           78    74     79    75     80## custom    76     81C /etc/opensnitchd

             @@ -1,2 +0,0 @@     1       enable opensnitch.service     2       enable fprintd.service

             @@ -0,0 +1,10 @@            1[copr:copr.fedorainfracloud.org:chenxiaolong:sbctl]            2name=Copr repo for sbctl owned by chenxiaolong            3baseurl=https://download.copr.fedorainfracloud.org/results/chenxiaolong/sbctl/fedora-$releasever-$basearch/            4type=rpm-md            5skip_if_unavailable=True            6gpgcheck=1            7gpgkey=https://download.copr.fedorainfracloud.org/results/chenxiaolong/sbctl/pubkey.gpg            8repo_gpgcheck=0            9enabled=1           10enabled_metadata=1

             @@ -0,0 +1,10 @@            1[copr:copr.fedorainfracloud.org:grahamwhiteuk:libfprint-tod]            2name=Copr repo for libfprint-tod owned by grahamwhiteuk            3baseurl=https://download.copr.fedorainfracloud.org/results/grahamwhiteuk/libfprint-tod/fedora-$releasever-$basearch/            4type=rpm-md            5skip_if_unavailable=True            6gpgcheck=1            7gpgkey=https://download.copr.fedorainfracloud.org/results/grahamwhiteuk/libfprint-tod/pubkey.gpg            8repo_gpgcheck=0            9enabled=1           10enabled_metadata=1

             @@ -0,0 +1,13 @@            1[hashicorp]            2name=Hashicorp Stable - $basearch            3baseurl=https://rpm.releases.hashicorp.com/fedora/$releasever/$basearch/stable            4enabled=1            5gpgcheck=1            6gpgkey=https://rpm.releases.hashicorp.com/gpg            7            8[hashicorp-test]            9name=Hashicorp Test - $basearch           10baseurl=https://rpm.releases.hashicorp.com/fedora/$releasever/$basearch/test           11enabled=0           12gpgcheck=1           13gpgkey=https://rpm.releases.hashicorp.com/gpg

             @@ -0,0 +1,3 @@            1enable opensnitch.service            2enable fprintd.service            3enable units_cur.timer

             @@ -0,0 +1,8 @@            1[Unit]            2Description=Update GNU Units currencies            3After=network-online.target            4Requires=network-online.target            5            6[Service]            7StateDirectory=units            8ExecStart=/usr/bin/units_cur

             @@ -0,0 +1,9 @@            1[Unit]            2Description=Update GNU Units currencies            3            4[Timer]            5OnCalendar=weekly            6Persistent=yes            7            8[Install]            9WantedBy=timers.target

             @@ -0,0 +1,7 @@            1[Unit]            2Description=Autorestic Backups Service            3            4[Service]            5ExecStart=/usr/bin/autorestic --ci cron            6ExecStartPost=/usr/bin/autorestic --ci forget            7Type=oneshot

             @@ -0,0 +1,9 @@            1[Unit]            2Description=Autorestic Backups Timer            3            4[Timer]            5OnCalendar=daily            6Persistent=yes            7            8[Install]            9WantedBy=timers.target

             @@ -0,0 +1,2 @@            1[Service]            2StateDirectory=logrotate