Compare commits

...

7 commits

Author SHA1 Message Date
09f036b1ef [fix] ci: remove diagnostic endpoint
All checks were successful
/ check (push) Successful in 21s
/ build (audiomenu) (push) Successful in 1s
/ build (docs) (push) Successful in 1s
/ build (jpassmenu) (push) Successful in 1s
/ build (nixosConfigurations.vm.config.system.build.toplevel) (push) Successful in 1s
/ build (nvim) (push) Successful in 1s
Maybe it fixes the CI issues?
2024-08-24 23:44:47 +02:00
d0ead42862 [chore] ci: removed scheduled actions 2024-08-24 23:44:47 +02:00
469f9c38e7
[feat] sway: enable systemd integration
All checks were successful
/ check (push) Successful in 19s
/ build (audiomenu) (push) Successful in 2s
/ build (docs) (push) Successful in 2s
/ build (jpassmenu) (push) Successful in 2s
/ build (nixosConfigurations.vm.config.system.build.toplevel) (push) Successful in 2s
/ build (nvim) (push) Successful in 2s
2024-08-24 23:30:52 +02:00
af4c171f6f
[chore] flake.lock: update inputs
All checks were successful
/ check (push) Successful in 20s
/ build (audiomenu) (push) Successful in 2s
/ build (docs) (push) Successful in 2s
/ build (jpassmenu) (push) Successful in 2s
/ build (nixosConfigurations.vm.config.system.build.toplevel) (push) Successful in 2s
/ build (nvim) (push) Successful in 1s
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)
2024-08-24 03:02:28 +02:00
ba7dae4178
[chore] flake.lock: update inputs
All checks were successful
/ check (push) Successful in 20s
/ build (audiomenu) (push) Successful in 1s
/ build (docs) (push) Successful in 1s
/ build (jpassmenu) (push) Successful in 1s
/ build (nixosConfigurations.vm.config.system.build.toplevel) (push) Successful in 1s
/ build (nvim) (push) Successful in 1s
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)
2024-08-23 03:01:21 +02:00
33aa607214
[chore] flake.lock: update inputs
All checks were successful
/ check (push) Successful in 19s
/ build (audiomenu) (push) Successful in 1s
/ build (docs) (push) Successful in 1s
/ build (jpassmenu) (push) Successful in 1s
/ build (nixosConfigurations.vm.config.system.build.toplevel) (push) Successful in 1s
/ build (nvim) (push) Successful in 1s
Flake lock file updates:

• Updated input 'nixvim':
    'github:nix-community/nixvim/851edc8df1347aef556a646c80d469a3137331ba' (2024-08-20)
  → 'github:nix-community/nixvim/b7f419a759f70126e220533b724cc17e8528b184' (2024-08-21)
2024-08-22 03:03:21 +02:00
8cc3264f34
[chore] flake.lock: update inputs
All checks were successful
/ check (push) Successful in 20s
/ build (audiomenu) (push) Successful in 2s
/ build (docs) (push) Successful in 2s
/ build (jpassmenu) (push) Successful in 2s
/ build (nixosConfigurations.vm.config.system.build.toplevel) (push) Successful in 2s
/ build (nvim) (push) Successful in 1s
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)
2024-08-21 03:04:45 +02:00
3 changed files with 25 additions and 36 deletions

View file

@ -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:
@ -18,32 +15,21 @@ 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: |
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
- 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

30
flake.lock generated
View file

@ -240,11 +240,11 @@
]
},
"locked": {
"lastModified": 1723202784,
"narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=",
"lastModified": 1724227338,
"narHash": "sha256-TuSaYdhOxeaaE9885mFO1lZHHax33GD5A9dczJrGUjw=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "c7012d0c18567c889b948781bc74a501e92275d1",
"rev": "6cedaa7c1b4f82a266e5d30f212273e60d62cb0d",
"type": "github"
},
"original": {
@ -350,11 +350,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1723938990,
"narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=",
"lastModified": 1724316499,
"narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890",
"rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
"type": "github"
},
"original": {
@ -383,11 +383,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1724036242,
"narHash": "sha256-/+gGF0tsAg2dF7Ds9Yt9Sne7ETmILKz1QVnDr+T2S2g=",
"lastModified": 1724455584,
"narHash": "sha256-9I5x60BDMcD4NKjw6skIVUzocVDuZlQK52JRsgD54ns=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "312db6b6e2d98dd8d22223fe383c7e0b4bab60c6",
"rev": "4c8d3559ac4548723eeba9861a94ab63219b0d43",
"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": {
@ -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": {

View file

@ -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