Compare commits
5 Commits
c4510abf88
...
6a2c1e2330
| Author | SHA1 | Date | |
|---|---|---|---|
| 6a2c1e2330 | |||
| d0ce6513d6 | |||
| d8a76e62db | |||
| 49f980496d | |||
| c855bb7f5c |
@@ -93,3 +93,6 @@
|
|||||||
|
|
||||||
[includeIf "gitdir:~/work/"]
|
[includeIf "gitdir:~/work/"]
|
||||||
path = ~/.gitconfig.work
|
path = ~/.gitconfig.work
|
||||||
|
|
||||||
|
[includeIf "gitdir:~/nix-dev-shells/"]
|
||||||
|
path = ~/.gitconfig.work
|
||||||
|
|||||||
42
flake.lock
generated
42
flake.lock
generated
@@ -121,11 +121,11 @@
|
|||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "pkgs/firefox-addons",
|
"dir": "pkgs/firefox-addons",
|
||||||
"lastModified": 1771732978,
|
"lastModified": 1772424169,
|
||||||
"narHash": "sha256-o7gZh/eXFkEEmzwlBdIbgCJhmdlqQhOhVjudqgsIefg=",
|
"narHash": "sha256-mhv7yclJj+qCagNv0WOuob5yQNV1aTqKcJLfBMUqsVA=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "nur-expressions",
|
"repo": "nur-expressions",
|
||||||
"rev": "18226106e18bc40cce99d436ee741a946f1888f6",
|
"rev": "701de032cc247a1c309a34f0ed646e824efd7ac6",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -284,11 +284,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771857445,
|
"lastModified": 1772024342,
|
||||||
"narHash": "sha256-NCrhxU9wq5+4jQG1fvRbyTnH8GSbH6LovreVoH2fOL4=",
|
"narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "3d7a52f678227930ab089f5d9b384f2d50f7d534",
|
"rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -344,11 +344,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771851181,
|
"lastModified": 1772380461,
|
||||||
"narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=",
|
"narHash": "sha256-O3ukj3Bb3V0Tiy/4LUfLlBpWypJ9P0JeUgsKl2nmZZY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c",
|
"rev": "f140aa04d7d14f8a50ab27f3691b5766b17ae961",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -453,11 +453,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771423359,
|
"lastModified": 1771969195,
|
||||||
"narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=",
|
"narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "740a22363033e9f1bb6270fbfb5a9574067af15b",
|
"rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -469,11 +469,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771369470,
|
"lastModified": 1772198003,
|
||||||
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
|
"narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0182a361324364ae3f436a63005877674cf45efb",
|
"rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -667,11 +667,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771735105,
|
"lastModified": 1772401007,
|
||||||
"narHash": "sha256-MJuVJeszZEziquykEHh/hmgIHYxUcuoG/1aowpLiSeU=",
|
"narHash": "sha256-YHykQg0h9hrlZGpMcywnaFzQ1Kn/5YNCCOSaaAl6z7Q=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "d7755d820f5fa8acf7f223309c33e25d4f92e74f",
|
"rev": "d8be5ea4cd3bc363492ab5bc6e874ccdc5465fe4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -717,11 +717,11 @@
|
|||||||
"tinted-zed": "tinted-zed"
|
"tinted-zed": "tinted-zed"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771787992,
|
"lastModified": 1772296853,
|
||||||
"narHash": "sha256-Vg4bGwwenNYI8p3nJTl9FRyeIyrjATeZrZr+GyUSDrw=",
|
"narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "30054cca073b49b42a71289edec858f535b27fe9",
|
"rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ in
|
|||||||
../../modules
|
../../modules
|
||||||
../../modules/stylix.nix
|
../../modules/stylix.nix
|
||||||
../../modules/ai-tools.nix
|
../../modules/ai-tools.nix
|
||||||
|
../../modules/anki.nix
|
||||||
../../modules/cloud
|
../../modules/cloud
|
||||||
../../modules/comms
|
../../modules/comms
|
||||||
../../modules/desktop/niri
|
../../modules/desktop/niri
|
||||||
@@ -28,6 +29,7 @@ in
|
|||||||
../../modules/kitty.nix
|
../../modules/kitty.nix
|
||||||
../../modules/nvim.nix
|
../../modules/nvim.nix
|
||||||
../../modules/pandoc.nix
|
../../modules/pandoc.nix
|
||||||
|
../../modules/secrets
|
||||||
../../modules/browser
|
../../modules/browser
|
||||||
../../modules/shell
|
../../modules/shell
|
||||||
../../modules/music
|
../../modules/music
|
||||||
@@ -76,6 +78,8 @@ in
|
|||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
|
xdg.systemDirs.config = [ "/etc/xdg" ];
|
||||||
|
|
||||||
home = {
|
home = {
|
||||||
stateVersion = "25.05";
|
stateVersion = "25.05";
|
||||||
inherit username;
|
inherit username;
|
||||||
@@ -99,6 +103,10 @@ in
|
|||||||
github.enable = true;
|
github.enable = true;
|
||||||
gitlab.enable = true;
|
gitlab.enable = true;
|
||||||
pandoc.enable = true;
|
pandoc.enable = true;
|
||||||
|
secrets = {
|
||||||
|
enable = true;
|
||||||
|
vault.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
shell.bash.enable = true;
|
shell.bash.enable = true;
|
||||||
starship.enable = true;
|
starship.enable = true;
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ in
|
|||||||
|
|
||||||
programs.anki = {
|
programs.anki = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = config.nixgl.wrap pkgs.anki;
|
||||||
addons = with pkgs.ankiAddons; [
|
addons = with pkgs.ankiAddons; [
|
||||||
anki-connect
|
anki-connect
|
||||||
puppy-reinforcement
|
puppy-reinforcement
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ config, lib, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
options.nixgl.wrap = lib.mkOption {
|
options.nixgl.wrap = lib.mkOption {
|
||||||
@@ -13,6 +13,7 @@
|
|||||||
pkg: flags:
|
pkg: flags:
|
||||||
if config.lib ? nixGL then
|
if config.lib ? nixGL then
|
||||||
pkg.overrideAttrs (old: {
|
pkg.overrideAttrs (old: {
|
||||||
|
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.makeWrapper ];
|
||||||
postInstall = (old.postInstall or "") + ''
|
postInstall = (old.postInstall or "") + ''
|
||||||
wrapProgram $out/bin/${pkg.meta.mainProgram} --add-flags "${flags}"
|
wrapProgram $out/bin/${pkg.meta.mainProgram} --add-flags "${flags}"
|
||||||
'';
|
'';
|
||||||
|
|||||||
20
home/modules/secrets/default.nix
Normal file
20
home/modules/secrets/default.nix
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
options.secrets = {
|
||||||
|
enable = lib.mkEnableOption "secrets";
|
||||||
|
};
|
||||||
|
|
||||||
|
imports = [ ./vault.nix ];
|
||||||
|
|
||||||
|
config = lib.mkIf config.secrets.enable {
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
sops
|
||||||
|
age
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
16
home/modules/secrets/vault.nix
Normal file
16
home/modules/secrets/vault.nix
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
{
|
||||||
|
options.secrets.vault = {
|
||||||
|
enable = lib.mkEnableOption "vault CLI";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf config.secrets.vault.enable {
|
||||||
|
home.packages = with pkgs; [ vault-bin ];
|
||||||
|
};
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user