Compare commits
9 commits
8fc94c368b
...
aba8c18f58
| Author | SHA1 | Date | |
|---|---|---|---|
| aba8c18f58 | |||
dd626c2fc0
|
|||
|
939f79f04d
|
|||
|
9dea0100c9
|
|||
|
f30f235f19
|
|||
|
115aa92ddd
|
|||
|
bd8e6a0715
|
|||
|
e23c78fdb5
|
|||
|
d5cf98310f
|
8 changed files with 73 additions and 66 deletions
80
flake.lock
generated
80
flake.lock
generated
|
|
@ -38,11 +38,11 @@
|
||||||
},
|
},
|
||||||
"crane": {
|
"crane": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730060262,
|
"lastModified": 1730652660,
|
||||||
"narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=",
|
"narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=",
|
||||||
"owner": "ipetkov",
|
"owner": "ipetkov",
|
||||||
"repo": "crane",
|
"repo": "crane",
|
||||||
"rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76",
|
"rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -80,11 +80,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730675461,
|
"lastModified": 1730751873,
|
||||||
"narHash": "sha256-Mhqz3p/HEiI/zxBJWO57LYQf6gGlJB0tci6fiVXLjd8=",
|
"narHash": "sha256-sdY29RWz0S7VbaoTwSy6RummdHKf0wUTaBlqPxrtvmQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "380847d94ff0fedee8b50ee4baddb162c06678df",
|
"rev": "856a2902156ba304efebd4c1096dbf7465569454",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -119,11 +119,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730711584,
|
"lastModified": 1730798123,
|
||||||
"narHash": "sha256-7XpfL6x0or0qH3NjtiujcyUzFrZu72b/pyLCbwk0+2s=",
|
"narHash": "sha256-olT8nqVIOx5A3F1qrO+lQtiJY55gtKGt0bUzkEwEyVE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "ca2129b1d5afb32e46299dc48e03467522352bd5",
|
"rev": "0c0c0dba05690c02ea7d508fd59389052c5f6438",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -204,11 +204,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727826117,
|
"lastModified": 1730504689,
|
||||||
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
|
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
|
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -353,11 +353,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable_2"
|
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730302582,
|
"lastModified": 1730814269,
|
||||||
"narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=",
|
"narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf",
|
"rev": "d70155fdc00df4628446352fc58adc640cd705c2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -555,11 +555,11 @@
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730107060,
|
"lastModified": 1730739295,
|
||||||
"narHash": "sha256-EnVVq1oNcimZmQYl6UlLYs0jhC6aLah0bsFMy2syEak=",
|
"narHash": "sha256-aYeJ/P/9AuK6Kee63ZdsmDjEwhnksF+gIv/OyGtlBJE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "lanzaboote",
|
"repo": "lanzaboote",
|
||||||
"rev": "0ad4ce46649b390da8bebcc229917f9863c98fe2",
|
"rev": "cef39a78679c266300874e7a7000b4da066228d4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -571,11 +571,11 @@
|
||||||
"lix": {
|
"lix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730726176,
|
"lastModified": 1730764481,
|
||||||
"narHash": "sha256-kXaJRGoWdyDSIO32zC2/1mGFOKiApJcSS9HVwFX3YM8=",
|
"narHash": "sha256-Fyor1ynFLPdNM+eazlX95eca8PBLCi2op4+tixs5SXs=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "6b7076f81c25941559f7d132a5ebc2fcfcedcc4d",
|
"rev": "1c28270c9d18e3a4913f70d62428b43973aa256a",
|
||||||
"revCount": 16447,
|
"revCount": 16448,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git@git.lix.systems/lix-project/lix"
|
"url": "https://git@git.lix.systems/lix-project/lix"
|
||||||
},
|
},
|
||||||
|
|
@ -679,11 +679,11 @@
|
||||||
"nixpkgs": "nixpkgs_5"
|
"nixpkgs": "nixpkgs_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730698801,
|
"lastModified": 1730779758,
|
||||||
"narHash": "sha256-sq68bCmk4tCXSt5CoRNimfigIZSLJSpNi/gjFtNLjRE=",
|
"narHash": "sha256-5WI9AnsBwhLzVRnQm3Qn9oAbROnuLDQTpaXeyZCK8qw=",
|
||||||
"owner": "LnL7",
|
"owner": "LnL7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "189d2d422c773fa065cc9c72e6806f007ebb9be0",
|
"rev": "0e3f3f017c14467085f15d42343a3aaaacd89bcb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -717,11 +717,11 @@
|
||||||
},
|
},
|
||||||
"nixosHardware": {
|
"nixosHardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730537918,
|
"lastModified": 1730797322,
|
||||||
"narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=",
|
"narHash": "sha256-cH9emjYIbDYTde/CKOmU97rh7sKuyfedzPcTz4OTJkE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "f6e0cd5c47d150c4718199084e5764f968f1b560",
|
"rev": "1b0b927860d7eb367ee6a3123ddeb7a8e24bd836",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -844,11 +844,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730327045,
|
"lastModified": 1730741070,
|
||||||
"narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
|
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "080166c15633801df010977d9d7474b4a6c549d7",
|
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -860,11 +860,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable_2": {
|
"nixpkgs-stable_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720386169,
|
"lastModified": 1730741070,
|
||||||
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
|
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
|
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1097,11 +1097,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable_3"
|
"nixpkgs-stable": "nixpkgs-stable_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729104314,
|
"lastModified": 1730302582,
|
||||||
"narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
|
"narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "pre-commit-hooks.nix",
|
"repo": "pre-commit-hooks.nix",
|
||||||
"rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
|
"rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1209,11 +1209,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729996302,
|
"lastModified": 1730601085,
|
||||||
"narHash": "sha256-QEU1NQq1+7s1na69Chig9K0iDDTKN0O4Zreo9A9rccA=",
|
"narHash": "sha256-Sgax33jGuvVHTjl1P78IwzlhAGyOxtx5Q26inKja8S4=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "a1b337569f334ff0a01b57627f17b201d746d24c",
|
"rev": "8d1b40f8dfd7539aaa3de56e207e22b3cc451825",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -51,23 +51,23 @@ in
|
||||||
en_US-large
|
en_US-large
|
||||||
it_IT
|
it_IT
|
||||||
]);
|
]);
|
||||||
home.activation = {
|
home.activation.cloneCcrEmacsFlake =
|
||||||
cloneCcrEmacsFlake = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
let
|
||||||
PATH=$PATH:${
|
path = lib.makeBinPath (
|
||||||
lib.makeBinPath (
|
with pkgs;
|
||||||
with pkgs;
|
[
|
||||||
[
|
git
|
||||||
git
|
openssh
|
||||||
openssh
|
]
|
||||||
]
|
);
|
||||||
)
|
in
|
||||||
}
|
lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
||||||
if [ ! -d "$HOME/.config/emacs" ]; then
|
PATH=$PATH:${path}
|
||||||
mkdir "$HOME/.config/emacs"
|
if [ ! -d "$HOME/.config/emacs" ]; then
|
||||||
$DRY_RUN_CMD ln -s "$HOME/projects/aciceri/nixfleet/hmModules/emacs/init.el" "$HOME/.config/emacs/init.el"
|
mkdir "$HOME/.config/emacs"
|
||||||
$DRY_RUN_CMD ln -s "$HOME/.config/emacs" "$HOME/emacs"
|
$DRY_RUN_CMD ln -s "$HOME/projects/aciceri/nixfleet/hmModules/emacs/init.el" "$HOME/.config/emacs/init.el"
|
||||||
fi
|
$DRY_RUN_CMD ln -s "$HOME/.config/emacs" "$HOME/emacs"
|
||||||
$DRY_RUN_CMD ln -sfn ${treesitGrammars} "$HOME/.config/emacs/tree-sitter"
|
fi
|
||||||
|
$DRY_RUN_CMD ln -sfn ${treesitGrammars} "$HOME/.config/emacs/tree-sitter"
|
||||||
'';
|
'';
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -62,6 +62,7 @@ in
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
profiles.default = {
|
profiles.default = {
|
||||||
|
search.force = true;
|
||||||
search.default = "DuckDuckGo";
|
search.default = "DuckDuckGo";
|
||||||
search.engines = {
|
search.engines = {
|
||||||
"Searx" = {
|
"Searx" = {
|
||||||
|
|
|
||||||
|
|
@ -30,9 +30,10 @@ windowrulev2 = workspace 9, class:^(Spotify)$
|
||||||
windowrulev2 = float, title:^(floating)$
|
windowrulev2 = float, title:^(floating)$
|
||||||
|
|
||||||
bind = $mod, b, exec, firefox
|
bind = $mod, b, exec, firefox
|
||||||
bind = $mod, t, exec, footclient $SHELL -C "zellij"
|
# bind = $mod, t, exec, footclient $SHELL -C "zellij"
|
||||||
|
bind = $mod, t, exec, footclient $SHELL
|
||||||
bind = $mod, RETURN, exec, emacsclient -c --eval "(ccr/start-eshell)"
|
bind = $mod, RETURN, exec, emacsclient -c --eval "(ccr/start-eshell)"
|
||||||
bind = $mod, m, exec, footclient $SHELL -C "aerc"
|
bind = $mod, m, exec, emacsclient -c --eval '(notmuch-search "tag:new")'
|
||||||
bind = $mod, d, exec, fuzzel --background-color=253559cc --border-radius=5 --border-width=0
|
bind = $mod, d, exec, fuzzel --background-color=253559cc --border-radius=5 --border-width=0
|
||||||
bind = $mod, s, exec, screenshot.sh
|
bind = $mod, s, exec, screenshot.sh
|
||||||
bind = $mod, n, exec, logseq
|
bind = $mod, n, exec, logseq
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@
|
||||||
WantedBy = [ "default.target" ];
|
WantedBy = [ "default.target" ];
|
||||||
};
|
};
|
||||||
Service = {
|
Service = {
|
||||||
# ExecStartPre = "${lib.getExe' pkgs.toybox "rm"} -f ${config.programs.atuin.settings.daemon.socket_path}";
|
ExecStartPre = "${lib.getExe' pkgs.toybox "rm"} -f ${config.programs.atuin.settings.daemon.socket_path}";
|
||||||
ExecStart = "${lib.getExe pkgs.atuin} daemon";
|
ExecStart = "${lib.getExe pkgs.atuin} daemon";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
@ -83,7 +83,8 @@
|
||||||
];
|
];
|
||||||
shellInit =
|
shellInit =
|
||||||
''
|
''
|
||||||
fish_vi_key_bindings
|
# fish_vi_key_bindings
|
||||||
|
fish_default_key_bindings
|
||||||
''
|
''
|
||||||
+ lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) ''
|
+ lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) ''
|
||||||
export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path})
|
export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path})
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,6 @@
|
||||||
"imv"
|
"imv"
|
||||||
"catppuccin"
|
"catppuccin"
|
||||||
"libreoffice"
|
"libreoffice"
|
||||||
"logseq"
|
|
||||||
"emacs"
|
"emacs"
|
||||||
];
|
];
|
||||||
extraGroups = [ ];
|
extraGroups = [ ];
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@
|
||||||
"hass-poweroff"
|
"hass-poweroff"
|
||||||
"forgejo-runners"
|
"forgejo-runners"
|
||||||
"teamviewer"
|
"teamviewer"
|
||||||
"macos-ventura"
|
# "macos-ventura"
|
||||||
"sunshine"
|
"sunshine"
|
||||||
"mount-sisko"
|
"mount-sisko"
|
||||||
"adb"
|
"adb"
|
||||||
|
|
@ -90,7 +90,6 @@
|
||||||
"zathura"
|
"zathura"
|
||||||
"imv"
|
"imv"
|
||||||
"libreoffice"
|
"libreoffice"
|
||||||
"logseq"
|
|
||||||
"emacs"
|
"emacs"
|
||||||
"vial"
|
"vial"
|
||||||
];
|
];
|
||||||
|
|
@ -128,10 +127,15 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
systemd.services.ddcci = {
|
systemd.services.ddcci = {
|
||||||
serviceConfig.Type = "oneshot";
|
|
||||||
script = ''
|
script = ''
|
||||||
echo 'ddcci 0x37' > /sys/bus/i2c/devices/i2c-2/new_device
|
echo 'ddcci 0x37' > /sys/bus/i2c/devices/i2c-2/new_device
|
||||||
'';
|
'';
|
||||||
|
wantedBy = [ "graphical.target" ];
|
||||||
|
restartIfChanged = false;
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
RemainAfterExit = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
|
||||||
|
|
@ -89,6 +89,7 @@ let
|
||||||
kind-icon
|
kind-icon
|
||||||
ef-themes
|
ef-themes
|
||||||
indent-bars
|
indent-bars
|
||||||
|
ement
|
||||||
])
|
])
|
||||||
++ (with nongnuPackages; [
|
++ (with nongnuPackages; [
|
||||||
eat
|
eat
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue