Pull dotfiles directly from github
This commit is contained in:
parent
c77dd756bc
commit
3664746d6b
36
flake.lock
36
flake.lock
|
@ -1,5 +1,21 @@
|
||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
|
"dotfiles": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1646666700,
|
||||||
|
"narHash": "sha256-RYIWLAgxtVEwtHAETeQDzF84Sk2mWtyzLlli0MvWNG4=",
|
||||||
|
"owner": "h7x4abk3g",
|
||||||
|
"repo": "dotfiles",
|
||||||
|
"rev": "678c83b1908fe37f8a3a9f2c8a3a91adb7a6c5aa",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "h7x4abk3g",
|
||||||
|
"repo": "dotfiles",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
@ -7,11 +23,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1643933536,
|
"lastModified": 1647175256,
|
||||||
"narHash": "sha256-yRmsWAG4DnLxLIUtlaZsl0kH7rN5xSoyNRlf0YZrcH4=",
|
"narHash": "sha256-7H+veXPM7IwdN1DoZqliwb9sghlN56koV5dnCu1kpsc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "2860d7e3bb350f18f7477858f3513f9798896831",
|
"rev": "a8d00f5c038cf7ec54e7dac9c57b171c1217f008",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -23,11 +39,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1646406548,
|
"lastModified": 1647820583,
|
||||||
"narHash": "sha256-xp+3f76ycZXNf9pG65Ef9KfDl1fas2UQu/cBe/pLd+c=",
|
"narHash": "sha256-2awN2f/dXpVvms6zo2e4TBaZDtQNucMrruqNPIvb518=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "47cd6702934434dd02bc53a67dbce3e5493e33a2",
|
"rev": "01e87b327aa89d9d60fba192085bccddaa2d1b24",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -38,6 +54,7 @@
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"dotfiles": "dotfiles",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"secrets": "secrets"
|
"secrets": "secrets"
|
||||||
|
@ -50,8 +67,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1646662541,
|
"lastModified": 1647943275,
|
||||||
"narHash": "sha256-v37mxxTONQqQY9NKMx5ngFCGaT0BfAaO2nT1KNXB1jM=",
|
"narHash": "sha256-uSrGOtugLzyoyOtE1Bzv0HdlO1OJIl+rzoAZbxKP43c=",
|
||||||
|
"ref": "main",
|
||||||
|
"rev": "c76aa71028beca7f8c44adc6e6881b88843b4bb9",
|
||||||
|
"revCount": 20,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "file:///home/h7x4/git/nix-secrets"
|
"url": "file:///home/h7x4/git/nix-secrets"
|
||||||
},
|
},
|
||||||
|
|
13
flake.nix
13
flake.nix
|
@ -9,6 +9,11 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
dotfiles = {
|
||||||
|
url = "github:h7x4abk3g/dotfiles";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
|
|
||||||
# Nix expressions and keys (TODO: move keys to another solution like agenix)
|
# Nix expressions and keys (TODO: move keys to another solution like agenix)
|
||||||
# which should be kept from the main repo for privacy reasons.
|
# which should be kept from the main repo for privacy reasons.
|
||||||
#
|
#
|
||||||
|
@ -20,7 +25,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, home-manager, secrets, ... }: let
|
outputs = { self, nixpkgs, home-manager, secrets, dotfiles, ... }: let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
|
@ -37,6 +42,11 @@
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
secrets = secrets.outputs.default;
|
secrets = secrets.outputs.default;
|
||||||
colorTheme = import ./common/colors.nix;
|
colorTheme = import ./common/colors.nix;
|
||||||
|
inputs = {
|
||||||
|
home-manager = home-manager;
|
||||||
|
secrets = secrets;
|
||||||
|
dotfiles = dotfiles;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
@ -82,6 +92,7 @@
|
||||||
in {
|
in {
|
||||||
Tsuki = nixSys "tsuki" {};
|
Tsuki = nixSys "tsuki" {};
|
||||||
Eisei = nixSys "eisei" {};
|
Eisei = nixSys "eisei" {};
|
||||||
|
kasei = nixSys "kasei" {};
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{pkgs, ...}:
|
{pkgs, inputs, ...}:
|
||||||
{
|
{
|
||||||
programs.rofi = {
|
programs.rofi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -14,7 +14,7 @@
|
||||||
# ];
|
# ];
|
||||||
|
|
||||||
font = "Droid Sans 12";
|
font = "Droid Sans 12";
|
||||||
theme = ../../general/.config/rofi/themes/blank.rasi;
|
theme = "${inputs.dotfiles}/general/.config/rofi/themes/blank.rasi";
|
||||||
|
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
modi = "window,run,drun,ssh,windowcd";
|
modi = "window,run,drun,ssh,windowcd";
|
||||||
|
|
Loading…
Reference in New Issue