From 1fa9707042997834e4bbf2668cbd7248bbc92940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sun, 18 Aug 2024 12:58:26 +0200 Subject: [PATCH 1/9] [chore] ci: removed scheduled actions --- .github/workflows/check.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index dba6600..64dc4d3 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -6,9 +6,6 @@ on: - ./**.nix - ./flake.lock pull_request: - # scheduled runs are run on my own infrastructure - # schedule: - # - cron: 5 4 * * 5 # At 04:05 on Friday. jobs: check: @@ -23,21 +20,8 @@ jobs: run: | nix flake check --verbose --keep-going nix run nixpkgs#statix -- check . - lockfile: - runs-on: ubuntu-latest - needs: check - if: ${{ github.event_name == 'schedule' }} # only run when scheduled - steps: - - uses: actions/checkout@v4 - - uses: DeterminateSystems/nix-installer-action@v13 - with: - source-url: "https://install.lix.systems/lix/lix-installer-x86_64-linux" - - uses: DeterminateSystems/update-flake-lock@v23 - - name: Run `nix flake check` - run: nix flake check --verbose --keep-going build-docs: runs-on: ubuntu-latest - if: ${{ github.event_name != 'schedule' }} # only run when not scheduled steps: - uses: actions/checkout@v4 - uses: DeterminateSystems/magic-nix-cache-action@v7 From 28e6e672b12bb15634e1809633e55a2102b5ecc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sun, 18 Aug 2024 13:02:18 +0200 Subject: [PATCH 2/9] [fix] ci: remove diagnostic endpoint Maybe it fixes the CI issues? --- .github/workflows/check.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 64dc4d3..5a558be 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -15,6 +15,7 @@ jobs: - uses: DeterminateSystems/nix-installer-action@v13 with: source-url: "https://install.lix.systems/lix/lix-installer-x86_64-linux" + diagnostic-endpoint: "" - uses: DeterminateSystems/magic-nix-cache-action@v7 - name: Run `nix flake check` run: | @@ -28,6 +29,7 @@ jobs: - uses: DeterminateSystems/nix-installer-action@v13 with: source-url: "https://install.lix.systems/lix/lix-installer-x86_64-linux" + diagnostic-endpoint: "" - name: Build documentation run: nix build .#docs --print-build-logs - name: Upload artifact From 8cc3264f3485b6498511a202b8199b1aa8c141d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Wed, 21 Aug 2024 03:04:45 +0200 Subject: [PATCH 3/9] [chore] flake.lock: update inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/c42fcfbdfeae23e68fc520f9182dde9f38ad1890' (2024-08-17) → 'github:NixOS/nixpkgs/f1bad50880bae73ff2d82fafc22010b4fc097a9c' (2024-08-19) • Updated input 'nixvim': 'github:nix-community/nixvim/312db6b6e2d98dd8d22223fe383c7e0b4bab60c6' (2024-08-19) → 'github:nix-community/nixvim/851edc8df1347aef556a646c80d469a3137331ba' (2024-08-20) • Updated input 'nixvim/git-hooks': 'github:cachix/git-hooks.nix/c7012d0c18567c889b948781bc74a501e92275d1' (2024-08-09) → 'github:cachix/git-hooks.nix/bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba' (2024-08-16) • Updated input 'nixvim/treefmt-nix': 'github:numtide/treefmt-nix/349de7bc435bdff37785c2466f054ed1766173be' (2024-08-12) → 'github:numtide/treefmt-nix/1d07739554fdc4f8481068f1b11d6ab4c1a4167a' (2024-08-16) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index dbe836e..80b3725 100644 --- a/flake.lock +++ b/flake.lock @@ -240,11 +240,11 @@ ] }, "locked": { - "lastModified": 1723202784, - "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", + "lastModified": 1723803910, + "narHash": "sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "c7012d0c18567c889b948781bc74a501e92275d1", + "rev": "bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba", "type": "github" }, "original": { @@ -350,11 +350,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723938990, - "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=", + "lastModified": 1724098845, + "narHash": "sha256-D5HwjQw/02fuXbR4LCTo64koglP2j99hkDR79/3yLOE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890", + "rev": "f1bad50880bae73ff2d82fafc22010b4fc097a9c", "type": "github" }, "original": { @@ -383,11 +383,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1724036242, - "narHash": "sha256-/+gGF0tsAg2dF7Ds9Yt9Sne7ETmILKz1QVnDr+T2S2g=", + "lastModified": 1724188973, + "narHash": "sha256-JaP6B9kjXccjRp/7CY2QPSSMarjPJMB0vytfqBdJU7E=", "owner": "nix-community", "repo": "nixvim", - "rev": "312db6b6e2d98dd8d22223fe383c7e0b4bab60c6", + "rev": "851edc8df1347aef556a646c80d469a3137331ba", "type": "github" }, "original": { @@ -487,11 +487,11 @@ ] }, "locked": { - "lastModified": 1723454642, - "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=", + "lastModified": 1723808491, + "narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "349de7bc435bdff37785c2466f054ed1766173be", + "rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a", "type": "github" }, "original": { From 33aa60721496a15393a5a2bee04a1d5946e8f920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Thu, 22 Aug 2024 03:03:21 +0200 Subject: [PATCH 4/9] [chore] flake.lock: update inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixvim': 'github:nix-community/nixvim/851edc8df1347aef556a646c80d469a3137331ba' (2024-08-20) → 'github:nix-community/nixvim/b7f419a759f70126e220533b724cc17e8528b184' (2024-08-21) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 80b3725..73729df 100644 --- a/flake.lock +++ b/flake.lock @@ -383,11 +383,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1724188973, - "narHash": "sha256-JaP6B9kjXccjRp/7CY2QPSSMarjPJMB0vytfqBdJU7E=", + "lastModified": 1724222231, + "narHash": "sha256-IFlMn1lgVsZQZC9WklY9YKcCdI0mUxSYZ7EfkaKCsQU=", "owner": "nix-community", "repo": "nixvim", - "rev": "851edc8df1347aef556a646c80d469a3137331ba", + "rev": "b7f419a759f70126e220533b724cc17e8528b184", "type": "github" }, "original": { From ba7dae4178d41a93bae1063def1e991434abee70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Fri, 23 Aug 2024 03:01:21 +0200 Subject: [PATCH 5/9] [chore] flake.lock: update inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/f1bad50880bae73ff2d82fafc22010b4fc097a9c' (2024-08-19) → 'github:NixOS/nixpkgs/224042e9a3039291f22f4f2ded12af95a616cca0' (2024-08-21) • Updated input 'nixvim': 'github:nix-community/nixvim/b7f419a759f70126e220533b724cc17e8528b184' (2024-08-21) → 'github:nix-community/nixvim/1854d591cb0e5be6ad97f5091766cdf28e948265' (2024-08-22) • Updated input 'nixvim/git-hooks': 'github:cachix/git-hooks.nix/bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba' (2024-08-16) → 'github:cachix/git-hooks.nix/6cedaa7c1b4f82a266e5d30f212273e60d62cb0d' (2024-08-21) • Updated input 'unstable': 'github:NixOS/nixpkgs/8a3354191c0d7144db9756a74755672387b702ba' (2024-08-18) → 'github:NixOS/nixpkgs/c374d94f1536013ca8e92341b540eba4c22f9c62' (2024-08-21) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 73729df..b548077 100644 --- a/flake.lock +++ b/flake.lock @@ -240,11 +240,11 @@ ] }, "locked": { - "lastModified": 1723803910, - "narHash": "sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc=", + "lastModified": 1724227338, + "narHash": "sha256-TuSaYdhOxeaaE9885mFO1lZHHax33GD5A9dczJrGUjw=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba", + "rev": "6cedaa7c1b4f82a266e5d30f212273e60d62cb0d", "type": "github" }, "original": { @@ -350,11 +350,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724098845, - "narHash": "sha256-D5HwjQw/02fuXbR4LCTo64koglP2j99hkDR79/3yLOE=", + "lastModified": 1724242322, + "narHash": "sha256-HMpK7hNjhEk4z5SFg5UtxEio9OWFocHdaQzCfW1pE7w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f1bad50880bae73ff2d82fafc22010b4fc097a9c", + "rev": "224042e9a3039291f22f4f2ded12af95a616cca0", "type": "github" }, "original": { @@ -383,11 +383,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1724222231, - "narHash": "sha256-IFlMn1lgVsZQZC9WklY9YKcCdI0mUxSYZ7EfkaKCsQU=", + "lastModified": 1724340365, + "narHash": "sha256-SFJuLI6FpuLHI0PdZAIOAJoeR6Z+cRkbTUQ5TuqJw5s=", "owner": "nix-community", "repo": "nixvim", - "rev": "b7f419a759f70126e220533b724cc17e8528b184", + "rev": "1854d591cb0e5be6ad97f5091766cdf28e948265", "type": "github" }, "original": { @@ -502,11 +502,11 @@ }, "unstable": { "locked": { - "lastModified": 1723991338, - "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", + "lastModified": 1724224976, + "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a3354191c0d7144db9756a74755672387b702ba", + "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", "type": "github" }, "original": { From af4c171f6feb3f442372f83a8b60ca41cf04b933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sat, 24 Aug 2024 03:02:28 +0200 Subject: [PATCH 6/9] [chore] flake.lock: update inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/224042e9a3039291f22f4f2ded12af95a616cca0' (2024-08-21) → 'github:NixOS/nixpkgs/797f7dc49e0bc7fab4b57c021cdf68f595e47841' (2024-08-22) • Updated input 'nixvim': 'github:nix-community/nixvim/1854d591cb0e5be6ad97f5091766cdf28e948265' (2024-08-22) → 'github:nix-community/nixvim/4c8d3559ac4548723eeba9861a94ab63219b0d43' (2024-08-23) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index b548077..640f46f 100644 --- a/flake.lock +++ b/flake.lock @@ -350,11 +350,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724242322, - "narHash": "sha256-HMpK7hNjhEk4z5SFg5UtxEio9OWFocHdaQzCfW1pE7w=", + "lastModified": 1724316499, + "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "224042e9a3039291f22f4f2ded12af95a616cca0", + "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", "type": "github" }, "original": { @@ -383,11 +383,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1724340365, - "narHash": "sha256-SFJuLI6FpuLHI0PdZAIOAJoeR6Z+cRkbTUQ5TuqJw5s=", + "lastModified": 1724455584, + "narHash": "sha256-9I5x60BDMcD4NKjw6skIVUzocVDuZlQK52JRsgD54ns=", "owner": "nix-community", "repo": "nixvim", - "rev": "1854d591cb0e5be6ad97f5091766cdf28e948265", + "rev": "4c8d3559ac4548723eeba9861a94ab63219b0d43", "type": "github" }, "original": { From 469f9c38e782195ef2ed5da24651afa57d028b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sat, 24 Aug 2024 23:30:39 +0200 Subject: [PATCH 7/9] [feat] sway: enable systemd integration --- home/gui/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/home/gui/default.nix b/home/gui/default.nix index 8792695..4d11c74 100644 --- a/home/gui/default.nix +++ b/home/gui/default.nix @@ -23,8 +23,7 @@ in { config = lib.mkIf (jhome.enable && cfg.enable) { home.packages = - with pkgs; - [ + (with pkgs; [ webcord ferdium xournalpp @@ -33,9 +32,9 @@ in wl-clipboard # Extra fonts noto-fonts-cjk # Chinese, Japanese and Korean characters - (pkgs.nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) - ] - ++ lib.optional flatpakEnabled flatpak; + (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) + ]) + ++ lib.optional flatpakEnabled pkgs.flatpak; fonts.fontconfig = { enable = true; defaultFonts = lib.mkIf config.jhome.styling.enable { @@ -139,6 +138,10 @@ in inherit (cfg.sway) enable; package = swayPkg; # no sway package if it comes from the OS config = import ./sway-config.nix { inherit config pkgs; }; + systemd = { + enable = true; + xdgAutostart = true; + }; }; # Set cursor style From d0ead4286213fb79ab41a0c1609fd247d55f7ef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sun, 18 Aug 2024 12:58:26 +0200 Subject: [PATCH 8/9] [chore] ci: removed scheduled actions --- .github/workflows/check.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index dba6600..64dc4d3 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -6,9 +6,6 @@ on: - ./**.nix - ./flake.lock pull_request: - # scheduled runs are run on my own infrastructure - # schedule: - # - cron: 5 4 * * 5 # At 04:05 on Friday. jobs: check: @@ -23,21 +20,8 @@ jobs: run: | nix flake check --verbose --keep-going nix run nixpkgs#statix -- check . - lockfile: - runs-on: ubuntu-latest - needs: check - if: ${{ github.event_name == 'schedule' }} # only run when scheduled - steps: - - uses: actions/checkout@v4 - - uses: DeterminateSystems/nix-installer-action@v13 - with: - source-url: "https://install.lix.systems/lix/lix-installer-x86_64-linux" - - uses: DeterminateSystems/update-flake-lock@v23 - - name: Run `nix flake check` - run: nix flake check --verbose --keep-going build-docs: runs-on: ubuntu-latest - if: ${{ github.event_name != 'schedule' }} # only run when not scheduled steps: - uses: actions/checkout@v4 - uses: DeterminateSystems/magic-nix-cache-action@v7 From 09f036b1ef60ac570cbe70a77e3abb798b5d8576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sun, 18 Aug 2024 13:02:18 +0200 Subject: [PATCH 9/9] [fix] ci: remove diagnostic endpoint Maybe it fixes the CI issues? --- .github/workflows/check.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 64dc4d3..5a558be 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -15,6 +15,7 @@ jobs: - uses: DeterminateSystems/nix-installer-action@v13 with: source-url: "https://install.lix.systems/lix/lix-installer-x86_64-linux" + diagnostic-endpoint: "" - uses: DeterminateSystems/magic-nix-cache-action@v7 - name: Run `nix flake check` run: | @@ -28,6 +29,7 @@ jobs: - uses: DeterminateSystems/nix-installer-action@v13 with: source-url: "https://install.lix.systems/lix/lix-installer-x86_64-linux" + diagnostic-endpoint: "" - name: Build documentation run: nix build .#docs --print-build-logs - name: Upload artifact