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
38 changes: 19 additions & 19 deletions flake.lock

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

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
};
};
dms = {
url = "github:AvengeMedia/DankMaterialShell/v1.4.3";
url = "github:AvengeMedia/DankMaterialShell/v1.4.4";
inputs.nixpkgs.follows = "nixpkgs";
};
dms-plugin-registry = {
Expand Down
3 changes: 3 additions & 0 deletions nix/flake/cachix.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
config,
inputs,
lib,
...
Expand All @@ -9,6 +10,7 @@ let
attrValues
concatLists
filter
mapAttrsToList
;

inherit (lib.my)
Expand All @@ -20,6 +22,7 @@ in
push = {
ilkecan = concatLists [
(filter isPatchedInput (attrValues inputs))
(mapAttrsToList (_: v: v.apps.ci.program) config.allSystems)
];
};
};
Expand Down
10 changes: 9 additions & 1 deletion nix/hosts/mephistopheles/input.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
{
config,
pkgs,
userConfig,
...
}:

{
programs = {
ydotool.enable = true; # https://github.com/ReimuNotMoe/ydotool
};

services = {
libinput = {
enable = true;
Expand All @@ -20,5 +25,8 @@
};
};

users.groups.input.members = [ userConfig.home.username ];
users.groups = {
${config.programs.ydotool.group}.members = [ userConfig.home.username ];
input.members = [ userConfig.home.username ];
};
}
2 changes: 1 addition & 1 deletion nix/hosts/mephistopheles/sops.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ in
templates = {
nix-access-tokens = {
content = ''
access-tokens = ${concatStringsSep " " (mapAttrsToList (k: v: "${k}=${v}") nixAccessTokens)}
access-tokens = ${concatStringsSep " " (mapAttrsToList (n: v: "${n}=${v}") nixAccessTokens)}
'';
group = config.users.groups.wheel.name;
mode = "0440";
Expand Down
2 changes: 1 addition & 1 deletion nix/modules/flake/cachix-push.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ in
options = {
flake.cachix = {
push = mkOption {
type = types.attrsOf (types.listOf types.package);
type = with types; attrsOf (listOf pathInStore);
default = { };
description = "Attrset mapping Cachix cache names to lists of derivations to push.";
};
Expand Down
1 change: 0 additions & 1 deletion nix/users/ilkecan/command-line/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ in
lz4
page
watchexec
ydotool
];
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ in
q = "{searchTerms}";
udm = "14"; # https://udm14.org/
};
query = concatStringsSep "&" (mapAttrsToList (k: v: "${k}=${v}") queryParams);
query = concatStringsSep "&" (mapAttrsToList (n: v: "${n}=${v}") queryParams);
in
[ { template = "https://www.google.com/search?${query}"; } ];
iconMapObj."32" = "https://www.google.com/favicon.ico";
Expand Down
23 changes: 23 additions & 0 deletions nix/users/ilkecan/utilities/zellij/layouts.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
config,
lib,
...
}:

let
inherit (lib)
removeSuffix
;

inherit (lib.my)
importTree
;
in
{
programs.zellij.layouts = importTree {
root = ./layouts;
depth = 1;
importFn = x: import x { inherit config; };
normalizeNameFn = removeSuffix ".nix";
};
}
118 changes: 58 additions & 60 deletions nix/users/ilkecan/utilities/zellij/layouts/code.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,67 +4,65 @@
}:

{
programs.zellij.layouts.code = {
layout._children = [
{
tab = {
_props = {
name = "Neovim";
focus = true;
hide_floating_panes = true;
};
_children = [
{ pane._props.command = "nvim"; }
{
floating_panes.pane._props = {
command = "codex";
x = "10%";
y = "10%";
width = "80%";
height = "80%";
};
}
{
pane = {
_props = {
size = 1;
borderless = true;
};
plugin._props.location = "zellij:compact-bar";
};
}
];
layout._children = [
{
tab = {
_props = {
name = "Neovim";
focus = true;
hide_floating_panes = true;
};
}
{
tab = {
_props = {
name = "terminal";
hide_floating_panes = true;
};
_children = [
{ pane._props.command = config.home.defaultShell.meta.mainProgram; }
{
floating_panes.pane._props = {
command = "zsh";
x = "10%";
y = "10%";
width = "80%";
height = "80%";
_children = [
{ pane._props.command = "nvim"; }
{
floating_panes.pane._props = {
command = "codex";
x = "10%";
y = "10%";
width = "80%";
height = "80%";
};
}
{
pane = {
_props = {
size = 1;
borderless = true;
};
}
{
pane = {
_props = {
size = 1;
borderless = true;
};
plugin._props.location = "zellij:compact-bar";
};
}
];
plugin._props.location = "zellij:compact-bar";
};
}
];
};
}
{
tab = {
_props = {
name = "terminal";
hide_floating_panes = true;
};
}
];
};
_children = [
{ pane._props.command = config.home.defaultShell.meta.mainProgram; }
{
floating_panes.pane._props = {
command = "zsh";
x = "10%";
y = "10%";
width = "80%";
height = "80%";
};
}
{
pane = {
_props = {
size = 1;
borderless = true;
};
plugin._props.location = "zellij:compact-bar";
};
}
];
};
}
];
}
13 changes: 0 additions & 13 deletions nix/users/ilkecan/utilities/zellij/layouts/default.nix

This file was deleted.

Loading