harald/nixcfg
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: harald:6f89baaf944c711744f16ca298450069c6c873ae
Branches Tags
harald:main
harald:b24.05
..
compare: harald:f71b0358d3ea2e1666e1a31be29f59f48ceea6ff
Branches Tags
harald:main
harald:b24.05

No commits in common. "6f89baaf944c711744f16ca298450069c6c873ae" and "f71b0358d3ea2e1666e1a31be29f59f48ceea6ff" have entirely different histories.
6f89baaf94 ... f71b0358d3

7 changed files with 55 additions and 53 deletions
Show stats Expand all files Collapse all files

50
flake.lock
View file

@ -19,16 +19,16 @@
"brew-src": { "brew-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1740943974, "lastModified": 1731323744,
"narHash": "sha256-2lRLfb6qwoUAsX/XtYmt/ETxtGid6/VaBeFiRsoVMtU=", "narHash": "sha256-SxUQm4cTHcaoPQHoXe26ZV8cZiMWBGow8MjE4L+MckM=",
"owner": "Homebrew", "owner": "Homebrew",
"repo": "brew", "repo": "brew",
"rev": "64efed206deeb9c2304d9e5b5910dcbf0a509c15", "rev": "254bf3fe9d8fa2e1b2fb55dbcf535b2d870180c4",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Homebrew", "owner": "Homebrew",
"ref": "4.4.23", "ref": "4.4.5",
"repo": "brew", "repo": "brew",
"type": "github" "type": "github"
} }
@ -73,11 +73,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741126078, "lastModified": 1736820923,
"narHash": "sha256-ng0a4cIq3c9E3iGKomlwqKzVYs2RLOzQho2U1Mc2sqU=", "narHash": "sha256-SDuKLOWAh8VJRXlNWQn9QE99bjeEUAAbYXqrKGbsiyk=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "c172f50b55b087f8e7801631de977461603bb976", "rev": "944c2b181792ae7ae6b20c0df3f44879c11706c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -94,11 +94,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741786315, "lastModified": 1736711425,
"narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", "narHash": "sha256-8hKhPQuMtXfJi+4lPvw3FBk/zSJVHeb726Zo0uF1PP8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", "rev": "f720e64ec37fa16ebba6354eadf310f81555cc07",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -366,11 +366,11 @@
"homebrew-bundle": { "homebrew-bundle": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1742346374, "lastModified": 1736995067,
"narHash": "sha256-DU6SixntQDZ4a29NZLTwvOaA4m2t+65fASwvQHF7jks=", "narHash": "sha256-gsgVUMf+Hfo4HquzrTpxFAHtMJV0WUvy43fVCmgYD+o=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-bundle", "repo": "homebrew-bundle",
"rev": "05ef3436f1e9c9355ed78f538d27cb0dfb7051fc", "rev": "a537c1c541f13830e197e4c55161dfe935a1f072",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -382,11 +382,11 @@
"homebrew-cask": { "homebrew-cask": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1742448858, "lastModified": 1737013725,
"narHash": "sha256-jArXTHaZl6eER0QuNjVNee3kftnPwLprpYcOk1RU9dY=", "narHash": "sha256-GI6FRisho2K8SZIZQxO9hIb+GoI77OvBp79J0glMdkY=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask", "repo": "homebrew-cask",
"rev": "3f2080f9531bba0a6f1d4c8de0ae6b2964a2aa42", "rev": "45dbf1f69834e11c03b0396696604380c6b2fd05",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -398,11 +398,11 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1742451229, "lastModified": 1737009843,
"narHash": "sha256-wtyM20aMVKXyooc4Wulivr35tUFmNXjxz3YWv3F3E6E=", "narHash": "sha256-Ft3OZGBbONgAi6abhuDgATm7DXeS7I1u8I6Z6cZvY10=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
"rev": "2ad483ba44590da050eb681eb052e63d042b7340", "rev": "790e310427ca023a4d94f3cef3e6fea1012f394d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -657,11 +657,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1741032878, "lastModified": 1736041957,
"narHash": "sha256-s9YOBz8vAxPlI4wORma3D7km8wZOEe/7Hg/u3brmwUQ=", "narHash": "sha256-Kk/cVtkxwfHNoB6nINUarMLTtyAEvH+ohzxKBptMzzg=",
"owner": "zhaofengli-wip", "owner": "zhaofengli-wip",
"repo": "nix-homebrew", "repo": "nix-homebrew",
"rev": "a82c55b07f670a01da5a72b7a07fe41c256a4380", "rev": "a6d99cc7436fc18c097b3536d9c45c0548c694c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2658,11 +2658,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742406979, "lastModified": 1736808430,
"narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=", "narHash": "sha256-wlgdf/n7bJMLBheqt1jmPoxJFrUP6FByKQFXuM9YvIk=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609", "rev": "553c7cb22fed19fd60eb310423fdc93045c51ba8",
"type": "github" "type": "github"
}, },
"original": { "original": {

11
homes/x86_64-linux/harald@x1/default.nix
View file

@ -18,7 +18,6 @@
tools = { tools = {
git.enable = true; git.enable = true;
}; };
gui.kbd.ellipsis.enable = true;
}; };
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
@ -65,6 +64,16 @@
}; };
dconf.settings."org/gnome/desktop/input-sources".xkb-options = [ "mod:ellipsis" ]; dconf.settings."org/gnome/desktop/input-sources".xkb-options = [ "mod:ellipsis" ];
xdg.configFile."xkb/symbols/mod".text = ''
xkb_symbols "ellipsis" {
key <AB09> { [ period, greater, ellipsis, division ] };
};
'';
xdg.configFile."xkb/rules/evdev".text = ''
! option = symbols
mod:ellipsis = +mod(ellipsis)
! include %S/evdev
'';
xdg.enable = true; xdg.enable = true;
xdg.mime.enable = true; xdg.mime.enable = true;

25
modules/home/gui/kbd/default.nix
View file

@ -1,25 +0,0 @@
{ config, lib, ... }:
with lib;
let
cfg = config.metacfg.gui.kbd;
in
{
options.metacfg.gui.kbd = {
ellipsis = mkEnableOption "ellipsis keybinding for period key";
};
config = mkIf cfg.ellipsis {
xdg.configFile."xkb/symbols/mod".text = ''
xkb_symbols "ellipsis" {
key <AB09> { [ period, greater, ellipsis, division ] };
};
'';
xdg.configFile."xkb/rules/evdev".text = ''
! option = symbols
mod:ellipsis = +mod(ellipsis)
! include %S/evdev
'';
};
}

18
modules/home/host/default.nix Normal file
View file

@ -0,0 +1,18 @@
{
lib,
config,
pkgs,
host ? null,
format ? "unknown",
...
}:
let
inherit (lib) types;
inherit (lib.metacfg) mkOpt;
in
{
options.metacfg.host = {
name = mkOpt (types.nullOr types.str) host "The host name.";
};
}

2
systems/aarch64-darwin/m4/default.nix
View file

@ -42,8 +42,6 @@ with lib.metacfg;
dnsmasq dnsmasq
virt-manager virt-manager
qemu qemu
claude-code
nodejs
]; ];
users.users.harald.shell = pkgs.fish; users.users.harald.shell = pkgs.fish;

1
systems/aarch64-linux/m4nix/default.nix
View file

@ -18,6 +18,7 @@ with lib.metacfg;
secureboot.enable = false; secureboot.enable = false;
tools = { tools = {
direnv.enable = true; direnv.enable = true;
#git.enable = true;
}; };
user.extraGroups = [ user.extraGroups = [
"docker" "docker"

1
systems/x86_64-linux/x1/default.nix
View file

@ -23,6 +23,7 @@ with lib.metacfg;
homeprinter.enable = true; homeprinter.enable = true;
tools = { tools = {
direnv.enable = true; direnv.enable = true;
#git.enable = true;
}; };
user.extraGroups = [ user.extraGroups = [
"docker" "docker"