Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: check the PR

on:
pull_request:
branches:
- main

jobs:
check:
runs-on: ubuntu-latest
permissions:
contents: read # required for `actions/checkout`
steps:
- uses: actions/checkout@v6

- uses: wimpysworld/nothing-but-nix@v10
with:
nix-permission-edict: true

- uses: nixbuild/nix-quick-install-action@v34

- run: nix run
env:
CACHIX_AUTH_TOKEN: "${{ secrets.CACHIX_AUTH_TOKEN }}"
18 changes: 9 additions & 9 deletions .zellij-layout.kdl
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,22 @@ layout {
}
}

tab focus=true name="Neovim" {
tab focus=true name="Neovim" hide_floating_panes=true {
pane command="nvim"

floating_panes {
pane command="claude" x="10%" y="10%" width="80%" height="80%" {
args "--ide"
}
}

pane size=1 borderless=true {
plugin location="zellij:compact-bar"
}
}

tab name="terminal" {
pane split_direction="vertical" {
pane

pane command="claude" {
start_suspended true
}
}
tab name="shell" {
pane command="zsh"

pane size=1 borderless=true {
plugin location="zellij:compact-bar"
Expand Down
66 changes: 33 additions & 33 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions flake/per-system/apps/ci.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
pkgs,
}:

pkgs.writeShellApplication {
name = "ci";

runtimeInputs = with pkgs; [ unstable.nix-fast-build ];

text = ''
nix-fast-build --no-nom --skip-cached --cachix-cache ilkecan "$@"
'';
}
22 changes: 22 additions & 0 deletions flake/per-system/apps/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
lib,
...
}:

let
inherit (lib) getExe;

mkApp = drv: {
type = "app";
program = getExe drv;
inherit (drv) meta;
};
in
{
perSystem = { self', pkgs, ... }: {
apps = {
ci = mkApp (import ./ci.nix { inherit pkgs; });
default = self'.apps.ci;
};
};
}
1 change: 1 addition & 0 deletions flake/per-system/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

{
imports = [
./apps
./args
./dev-shells.nix
./pre-commit.nix
Expand Down
2 changes: 1 addition & 1 deletion hosts/mephistopheles/hardware/monitor.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
];

boot.extraModulePackages = with config.boot.kernelPackages; [ ddcci-driver ];
boot.kernelModules = [ "ddcci-backlight" ];
boot.kernelModules = [ "ddcci" ];

services.udev.extraRules = let
# https://wiki.nixos.org/wiki/Backlight#Via_ddcci-driver
Expand Down
2 changes: 1 addition & 1 deletion hosts/mephistopheles/impermanence.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"sysroot.mount"
];

unitConfig.DefaultDependencies = "no";
unitConfig.DefaultDependencies = false;
serviceConfig.Type = "oneshot";
script = ''
mkdir /btrfs_tmp
Expand Down
2 changes: 1 addition & 1 deletion hosts/mephistopheles/users.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
hashedPasswordFile = config.sops.secrets.ilkecan-hashed-password.path;
isNormalUser = true;
extraGroups = [ config.users.groups.wheel.name ];
shell = userConfig.programs.zsh.package;
shell = userConfig.home.defaultShell;
};
};
};
Expand Down
6 changes: 3 additions & 3 deletions inputs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ let
mapAttrsToList
;

patchInput = { owner, repo, src, name, pulls }:
patchInput = { owner, repo, src, name, pulls, patches ? [ ] }:
let
mkPatch = number: sha256:
{
inherit sha256;
name = "${owner}-${repo}-${number}.patch";
url = "https://github.com/${owner}/${repo}/pull/${number}.patch?full_index=1";
};
patches = map fetchpatch2 (mapAttrsToList mkPatch pulls);
src' = applyPatches { inherit name src patches; };
patches' = patches ++ map fetchpatch2 (mapAttrsToList mkPatch pulls);
src' = applyPatches { inherit name src; patches = patches'; };

flake = import "${src'}/flake.nix";
outputs = flake.outputs ({ inherit self; } // src.inputs);
Expand Down
2 changes: 1 addition & 1 deletion inputs/nixpkgs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
name = "nixpkgs";
pulls = {
"470359" = "sha256-33Vr0X+xhWjbkQhPCivRC8C9yQS1U6vct9U0H4Rtvxo="; # nixos/automatic-timezoned: Fix boot delays and systemd unit ordering
"494001" = "sha256-6dJgDCqmUx86kVgsqSXKSUF1v0GPvsA2hTKy/S7E2+I="; # nixos/envfs: fix compatibility with systemd in initrd
"494001" = "sha256-OP15IGdZLNhJIXLbZyA/nTZkaB2VVIm1R4vDeHQaLSs="; # nixos/envfs: fix compatibility with systemd in initrd
};
}
20 changes: 20 additions & 0 deletions modules/home-manager/default-shell.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
lib,
...
}:

let
inherit (lib)
mkOption
types
;
in
{
options = {
home.defaultShell = mkOption {
type = types.shellPackage;
readOnly = true;
description = "The user's default shell package.";
};
};
}
1 change: 1 addition & 0 deletions modules/home-manager/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

{
imports = [
./default-shell.nix
./xdg-bin-home.nix
];
}
3 changes: 3 additions & 0 deletions users/ilkecan/command-line/shells/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
config,
...
}:

Expand All @@ -7,4 +8,6 @@
./nushell.nix
./zsh
];

home.defaultShell = config.programs.zsh.package;
}
2 changes: 1 addition & 1 deletion users/ilkecan/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ in
unstable.overskride
pwvucontrol
wasistlos
telegram-desktop
unstable.telegram-desktop # https://github.com/NixOS/nixpkgs/issues/497549
ruffle # https://github.com/ruffle-rs/ruffle

ast-grep # https://github.com/ast-grep/ast-grep
Expand Down
2 changes: 1 addition & 1 deletion users/ilkecan/multimedia/video.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{
home.packages = with pkgs; [
ffmpeg-full
# stremio # https://github.com/NixOS/nixpkgs/pull/468728
unstable.stremio-linux-shell
vlc
];

Expand Down
Loading
Loading