Compare commits
7 commits
28e6e672b1
...
09f036b1ef
Author | SHA1 | Date | |
---|---|---|---|
09f036b1ef | |||
d0ead42862 | |||
469f9c38e7 | |||
af4c171f6f | |||
ba7dae4178 | |||
33aa607214 | |||
8cc3264f34 |
3 changed files with 25 additions and 36 deletions
18
.github/workflows/check.yml
vendored
18
.github/workflows/check.yml
vendored
|
@ -6,9 +6,6 @@ on:
|
||||||
- ./**.nix
|
- ./**.nix
|
||||||
- ./flake.lock
|
- ./flake.lock
|
||||||
pull_request:
|
pull_request:
|
||||||
# scheduled runs are run on my own infrastructure
|
|
||||||
# schedule:
|
|
||||||
# - cron: 5 4 * * 5 # At 04:05 on Friday.
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
check:
|
check:
|
||||||
|
@ -18,32 +15,21 @@ jobs:
|
||||||
- uses: DeterminateSystems/nix-installer-action@v13
|
- uses: DeterminateSystems/nix-installer-action@v13
|
||||||
with:
|
with:
|
||||||
source-url: "https://install.lix.systems/lix/lix-installer-x86_64-linux"
|
source-url: "https://install.lix.systems/lix/lix-installer-x86_64-linux"
|
||||||
|
diagnostic-endpoint: ""
|
||||||
- uses: DeterminateSystems/magic-nix-cache-action@v7
|
- uses: DeterminateSystems/magic-nix-cache-action@v7
|
||||||
- name: Run `nix flake check`
|
- name: Run `nix flake check`
|
||||||
run: |
|
run: |
|
||||||
nix flake check --verbose --keep-going
|
nix flake check --verbose --keep-going
|
||||||
nix run nixpkgs#statix -- check .
|
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:
|
build-docs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: ${{ github.event_name != 'schedule' }} # only run when not scheduled
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: DeterminateSystems/magic-nix-cache-action@v7
|
- uses: DeterminateSystems/magic-nix-cache-action@v7
|
||||||
- uses: DeterminateSystems/nix-installer-action@v13
|
- uses: DeterminateSystems/nix-installer-action@v13
|
||||||
with:
|
with:
|
||||||
source-url: "https://install.lix.systems/lix/lix-installer-x86_64-linux"
|
source-url: "https://install.lix.systems/lix/lix-installer-x86_64-linux"
|
||||||
|
diagnostic-endpoint: ""
|
||||||
- name: Build documentation
|
- name: Build documentation
|
||||||
run: nix build .#docs --print-build-logs
|
run: nix build .#docs --print-build-logs
|
||||||
- name: Upload artifact
|
- name: Upload artifact
|
||||||
|
|
30
flake.lock
generated
30
flake.lock
generated
|
@ -240,11 +240,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723202784,
|
"lastModified": 1724227338,
|
||||||
"narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=",
|
"narHash": "sha256-TuSaYdhOxeaaE9885mFO1lZHHax33GD5A9dczJrGUjw=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "c7012d0c18567c889b948781bc74a501e92275d1",
|
"rev": "6cedaa7c1b4f82a266e5d30f212273e60d62cb0d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -350,11 +350,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723938990,
|
"lastModified": 1724316499,
|
||||||
"narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=",
|
"narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890",
|
"rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -383,11 +383,11 @@
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1724036242,
|
"lastModified": 1724455584,
|
||||||
"narHash": "sha256-/+gGF0tsAg2dF7Ds9Yt9Sne7ETmILKz1QVnDr+T2S2g=",
|
"narHash": "sha256-9I5x60BDMcD4NKjw6skIVUzocVDuZlQK52JRsgD54ns=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "312db6b6e2d98dd8d22223fe383c7e0b4bab60c6",
|
"rev": "4c8d3559ac4548723eeba9861a94ab63219b0d43",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -487,11 +487,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723454642,
|
"lastModified": 1723808491,
|
||||||
"narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=",
|
"narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "349de7bc435bdff37785c2466f054ed1766173be",
|
"rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -502,11 +502,11 @@
|
||||||
},
|
},
|
||||||
"unstable": {
|
"unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723991338,
|
"lastModified": 1724224976,
|
||||||
"narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=",
|
"narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8a3354191c0d7144db9756a74755672387b702ba",
|
"rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -23,8 +23,7 @@ in
|
||||||
{
|
{
|
||||||
config = lib.mkIf (jhome.enable && cfg.enable) {
|
config = lib.mkIf (jhome.enable && cfg.enable) {
|
||||||
home.packages =
|
home.packages =
|
||||||
with pkgs;
|
(with pkgs; [
|
||||||
[
|
|
||||||
webcord
|
webcord
|
||||||
ferdium
|
ferdium
|
||||||
xournalpp
|
xournalpp
|
||||||
|
@ -33,9 +32,9 @@ in
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
# Extra fonts
|
# Extra fonts
|
||||||
noto-fonts-cjk # Chinese, Japanese and Korean characters
|
noto-fonts-cjk # Chinese, Japanese and Korean characters
|
||||||
(pkgs.nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
|
(nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
|
||||||
]
|
])
|
||||||
++ lib.optional flatpakEnabled flatpak;
|
++ lib.optional flatpakEnabled pkgs.flatpak;
|
||||||
fonts.fontconfig = {
|
fonts.fontconfig = {
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultFonts = lib.mkIf config.jhome.styling.enable {
|
defaultFonts = lib.mkIf config.jhome.styling.enable {
|
||||||
|
@ -139,6 +138,10 @@ in
|
||||||
inherit (cfg.sway) enable;
|
inherit (cfg.sway) enable;
|
||||||
package = swayPkg; # no sway package if it comes from the OS
|
package = swayPkg; # no sway package if it comes from the OS
|
||||||
config = import ./sway-config.nix { inherit config pkgs; };
|
config = import ./sway-config.nix { inherit config pkgs; };
|
||||||
|
systemd = {
|
||||||
|
enable = true;
|
||||||
|
xdgAutostart = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Set cursor style
|
# Set cursor style
|
||||||
|
|
Loading…
Add table
Reference in a new issue