Grimmauld/grimm-nixos-laptop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

move to dataset

Browse source
This commit is contained in:
Grimmauld 2024-11-25 14:27:52 +01:00
parent 573b43b8e2
commit 7fd47c51c0
Signed by: Grimmauld
GPG key ID: C2946668769F91FB
6 changed files with 36 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/tooling/git.nix
View file

@ -36,6 +36,7 @@ in
push.autoSetupRemote = true; push.autoSetupRemote = true;
core.autocrlf = "input"; core.autocrlf = "input";
commit.gpgsign = true; commit.gpgsign = true;
safe.directory = "/etc/nixos";
core.excludesfile = ( core.excludesfile = (
pkgs.writeText ".gitignore" '' pkgs.writeText ".gitignore" ''
.idea .idea

17
common/tooling/nix.nix
View file

@ -3,7 +3,6 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(writeShellScriptBin "nix-referrers" "nix-store --query --referrers $@") (writeShellScriptBin "nix-referrers" "nix-store --query --referrers $@")
(writeShellScriptBin "nixpkgs-review-head" "nixpkgs-review rev HEAD") (writeShellScriptBin "nixpkgs-review-head" "nixpkgs-review rev HEAD")
(writeShellScriptBin "rebuild" "bash -c \"nixos-rebuild switch |& nom\"")
nixpkgs-review nixpkgs-review
nixfmt-rfc-style nixfmt-rfc-style
@ -16,7 +15,13 @@
nix-init nix-init
]; ];
environment.sessionVariables = lib.mkIf pkgs.config.allowUnfree { NIXPKGS_ALLOW_UNFREE = "1"; }; environment.sessionVariables =
(lib.mkIf pkgs.config.allowUnfree { NIXPKGS_ALLOW_UNFREE = "1"; })
// {
NH_NOM = 1;
};
environment.shellAliases."rebuild" = "nixos-rebuild switch |& nom";
grimmShared.tooling.lang_servers = [ grimmShared.tooling.lang_servers = [
{ {
@ -35,6 +40,14 @@
]; ];
warn-dirty = false; warn-dirty = false;
}; };
programs.nh = {
enable = true;
# clean.enable = true;
clean.extraArgs = "--keep-since 14d --keep 16";
flake = "/etc/nixos";
};
nix.gc = { nix.gc = {
automatic = true; automatic = true;
dates = "weekly"; dates = "weekly";

19
flake.lock
View file

@ -366,17 +366,18 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1732297877, "lastModified": 1732014248,
"narHash": "sha256-OCazAn/xPjPTMo6cyMzJthmfMBuoCjcZ4O+kAkW3ixI=", "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"ref": "refs/heads/apparmor_module", "owner": "NixOS",
"rev": "43d89bd05155f93038565672464931594b9b4fcd", "repo": "nixpkgs",
"revCount": 710089, "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "git", "type": "github"
"url": "file:///home/grimmauld/coding/nixpkgs"
}, },
"original": { "original": {
"type": "git", "owner": "NixOS",
"url": "file:///home/grimmauld/coding/nixpkgs" "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-24_05": { "nixpkgs-24_05": {

6
flake.nix
View file

@ -3,8 +3,8 @@
inputs = { inputs = {
nixpkgs = { nixpkgs = {
# url = "github:NixOS/nixpkgs/nixos-unstable"; url = "github:NixOS/nixpkgs/nixos-unstable";
url = "git+file:///home/grimmauld/coding/nixpkgs"; # url = "git+file:///home/grimmauld/coding/nixpkgs";
}; };
chaotic = { chaotic = {
url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
@ -37,7 +37,7 @@
outputs = inputs @ { self, agenix, nixpkgs, chaotic, aagl-gtk-on-nix, nixos-mailserver, nixos-matrix-modules, aa-alias-manager, ... }: outputs = inputs @ { self, agenix, nixpkgs, chaotic, aagl-gtk-on-nix, nixos-mailserver, nixos-matrix-modules, aa-alias-manager, ... }:
let let
patches = [ patches = [
# ./aa_mod.patch ./aa_mod.patch
{ {
url = "https://github.com/NixOS/nixpkgs/pull/357468.patch"; url = "https://github.com/NixOS/nixpkgs/pull/357468.patch";
hash = "sha256-t+/zVO/Jyink9biD61AuDOmVt0GF3biKxR5hCAyl4Fc="; hash = "sha256-t+/zVO/Jyink9biD61AuDOmVt0GF3biKxR5hCAyl4Fc=";

6
specific/grimm-nixos-ssd/hardware-configuration.nix
View file

@ -44,6 +44,12 @@
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/etc/nixos" =
{ device = "zpool/nix_conf";
fsType = "zfs";
options = [ "noacl" ];
};
# fileSystems."/home" = # fileSystems."/home" =
# { device = "zpool/home"; # { device = "zpool/home";
# fsType = "zfs"; # fsType = "zfs";

1
users.nix
View file

@ -10,6 +10,7 @@
# shell = pkgs.xonsh; # shell = pkgs.xonsh;
description = "grimmauld"; description = "grimmauld";
openssh.authorizedKeys.keys = (import ./authorizedKeys.nix); openssh.authorizedKeys.keys = (import ./authorizedKeys.nix);
extraGroups = lib.intersectLists (lib.attrNames config.users.groups) [ extraGroups = lib.intersectLists (lib.attrNames config.users.groups) [
"networkmanager" "networkmanager"