Compare commits
46 Commits
6c1b0faea4
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
| a4431b66be | |||
| 2a4a3b82c8 | |||
| 679c86d4a8 | |||
| cb6228b8dd | |||
| 55c2311bd7 | |||
| 402002e6e6 | |||
| d1808f48a2 | |||
| 1b39463be3 | |||
| 53e0917a01 | |||
| 28e58c72de | |||
| 5bda0b3ad6 | |||
| 948c150a06 | |||
| afbe54d983 | |||
| ce222ef2b1 | |||
| 13c8c4432f | |||
| 41bd32951d | |||
| acc0385350 | |||
| 7ecbf30138 | |||
| 61b30f5062 | |||
| 83b70c6c81 | |||
| 0ea18214a5 | |||
| 57db7a1db8 | |||
| c695346b3c | |||
| 914d548d9f | |||
| c9394673db | |||
| 8ee9c32d9c | |||
| 48ed1287d7 | |||
| 9713bb6ae2 | |||
| afdbf7cfa2 | |||
| 9e9d2bbfcc | |||
| 04b08dee44 | |||
| 7d03e428bc | |||
| 3682c1ad10 | |||
| 5f639e747d | |||
| 3159d20e6d | |||
| e6240591c9 | |||
| 5f96f98158 | |||
| a1abf5b4a1 | |||
| ba8ef4f585 | |||
| eb057a2c3a | |||
| 8effe5f401 | |||
| 8fae2a5338 | |||
| 1c379cc4a3 | |||
| 69f3fa445b | |||
| d80478e4e9 | |||
| 53bb5718f3 |
Generated
+31
-63
@@ -1,23 +1,5 @@
|
||||
{
|
||||
"nodes": {
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765835352,
|
||||
"narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "a34fae9c08a15ad73f295041fec82323541400a9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@@ -25,11 +7,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1782233665,
|
||||
"narHash": "sha256-h/xOtrByoA/Ak1lWHn0O1lVZz4qWYbwOSLQ8YSwQO0I=",
|
||||
"lastModified": 1791642191,
|
||||
"narHash": "sha256-0bK0A59rVUn1SRZzo4cNi4VSqAe7vR1gL2/MZl53Frw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "062581938b4a378a82dfbb294b494808157153a1",
|
||||
"rev": "c58f54c733a7894d84fa2fdff26cc12088c4b78c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -39,25 +21,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"kube": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1767247330,
|
||||
"narHash": "sha256-CxXwzmvAOO07719jzE0Zw14C9r3fQcXfPllLtt5cIzo=",
|
||||
"rev": "4a4d79a290c92de630e503f395fc8fd709904c1b",
|
||||
"type": "tarball",
|
||||
"url": "https://gitea.home-frikker.dedyn.io/api/v1/repos/jfrikker/kube/archive/4a4d79a290c92de630e503f395fc8fd709904c1b.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://gitea.home-frikker.dedyn.io/jfrikker/kube/archive/1.0.1.tar.gz"
|
||||
}
|
||||
},
|
||||
"nix-index-database": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@@ -65,11 +28,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1782030356,
|
||||
"narHash": "sha256-h4WpMr455AfRub0FXBaon6Vcpe0waUyJ4GivIW6oyd4=",
|
||||
"lastModified": 1791711434,
|
||||
"narHash": "sha256-LpIhxnuO0tYeZ4k7BbNMxsPs2zJpB4hWXO1jdhUuE7Q=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "3017088b49efd404f78e3b104f553b97e4af786b",
|
||||
"rev": "9a2dd40780eeab8543aa97c59c26f11267025616",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -80,11 +43,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1781577229,
|
||||
"narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
|
||||
"lastModified": 1791734076,
|
||||
"narHash": "sha256-i5qk1kLiit98rRbh1AXmWBNT9QXC/y4l5Wk/u5EdpDQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
|
||||
"rev": "7fd4004d0511991fff3a0524856a9be09e28c5f0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -94,27 +57,32 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1765674936,
|
||||
"narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
"kube": "kube",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixpkgs": "nixpkgs"
|
||||
"nixpkgs": "nixpkgs",
|
||||
"rycee": "rycee"
|
||||
}
|
||||
},
|
||||
"rycee": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1790708379,
|
||||
"narHash": "sha256-UShpDPmypGviorjBWDwRtKWUTdVik7Zp6bt1t875jV4=",
|
||||
"owner": "~rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "b549e36268fa8c975535d0405f66e013b234a0a4",
|
||||
"type": "sourcehut"
|
||||
},
|
||||
"original": {
|
||||
"owner": "~rycee",
|
||||
"repo": "nur-expressions",
|
||||
"type": "sourcehut"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -4,23 +4,46 @@
|
||||
inputs = {
|
||||
# Specify the source of Home Manager and Nixpkgs.
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/master";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
kube = {
|
||||
url = "https://gitea.home-frikker.dedyn.io/jfrikker/kube/archive/1.0.1.tar.gz";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
# kube = {
|
||||
# url = "https://gitea.home-frikker.dedyn.io/jfrikker/kube/archive/1.0.1.tar.gz";
|
||||
# inputs.nixpkgs.follows = "nixpkgs";
|
||||
# };
|
||||
|
||||
nix-index-database = {
|
||||
url = "github:nix-community/nix-index-database";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
rycee = {
|
||||
url = "sourcehut:~rycee/nur-expressions";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { nixpkgs, home-manager, kube, nix-index-database, ... }:
|
||||
let modules-for-system = pkgs: pkgs.stdenv.mkDerivation {
|
||||
outputs =
|
||||
{
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
nix-index-database,
|
||||
rycee,
|
||||
...
|
||||
}:
|
||||
let
|
||||
pkgs-for-system = (
|
||||
system:
|
||||
import nixpkgs {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
}
|
||||
);
|
||||
modules-for-system =
|
||||
pkgs:
|
||||
pkgs.stdenv.mkDerivation {
|
||||
name = "home-manager-modules";
|
||||
src = pkgs.lib.fileset.toSource {
|
||||
root = ./.;
|
||||
@@ -40,9 +63,121 @@
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
homeConfigurations.redbook =
|
||||
let pkgs = import nixpkgs { system = "aarch64-darwin"; config.allowUnfree = true; };
|
||||
let
|
||||
pkgs = pkgs-for-system "aarch64-darwin";
|
||||
modules = modules-for-system pkgs;
|
||||
in
|
||||
home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
|
||||
modules = [
|
||||
nix-index-database.homeModules.default
|
||||
rycee.hmModules.emacs-init
|
||||
"${modules}"
|
||||
]
|
||||
++ [
|
||||
{
|
||||
home.stateVersion = "22.05";
|
||||
home.username = "jfrikker";
|
||||
home.homeDirectory = "/Users/jfrikker";
|
||||
home.packages = [ pkgs.pinentry_mac ];
|
||||
jfrikker.enable = true;
|
||||
jfrikker.desktop.enable = true;
|
||||
jfrikker.redbook.enable = true;
|
||||
}
|
||||
];
|
||||
};
|
||||
homeConfigurations.home =
|
||||
let
|
||||
pkgs = pkgs-for-system "x86_64-linux";
|
||||
modules = modules-for-system pkgs;
|
||||
in
|
||||
home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
|
||||
modules = [
|
||||
nix-index-database.homeModules.default
|
||||
rycee.hmModules.emacs-init
|
||||
"${modules}"
|
||||
]
|
||||
++ [
|
||||
{
|
||||
home.stateVersion = "22.05";
|
||||
home.username = "jfrikker";
|
||||
home.homeDirectory = "/home/jfrikker";
|
||||
jfrikker.enable = true;
|
||||
}
|
||||
];
|
||||
};
|
||||
homeConfigurations.home-laptop =
|
||||
let
|
||||
pkgs = pkgs-for-system "x86_64-linux";
|
||||
modules = modules-for-system pkgs;
|
||||
in
|
||||
home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
|
||||
modules = [
|
||||
nix-index-database.homeModules.default
|
||||
rycee.hmModules.emacs-init
|
||||
"${modules}"
|
||||
]
|
||||
++ [
|
||||
{
|
||||
home.stateVersion = "22.05";
|
||||
home.username = "jfrikker";
|
||||
home.homeDirectory = "/home/jfrikker";
|
||||
# home.packages = [ pkgs.pinentry ];
|
||||
jfrikker.enable = true;
|
||||
jfrikker.desktop.enable = true;
|
||||
|
||||
programs.ghostty = {
|
||||
enable = true;
|
||||
settings = {
|
||||
font-family = "Iosevka Term Extended";
|
||||
font-size = 10;
|
||||
};
|
||||
};
|
||||
|
||||
programs.foot = {
|
||||
enable = true;
|
||||
settings = {
|
||||
main = {
|
||||
font = "Iosevka Term:size=10:width=expanded";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
home.pointerCursor = {
|
||||
enable = true;
|
||||
package = pkgs.vanilla-dmz;
|
||||
name = "Vanilla-DMZ";
|
||||
sway.enable = true;
|
||||
gtk.enable = true;
|
||||
};
|
||||
|
||||
wayland.windowManager.sway = {
|
||||
enable = true;
|
||||
config.modifier = "Mod4";
|
||||
# config.terminal = "${pkgs.ghostty}/bin/ghostty";
|
||||
config.input = {
|
||||
"1452:628:bcm5974" = {
|
||||
scroll_factor = "0.4";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs.emacs.package = pkgs.emacs-pgtk;
|
||||
}
|
||||
];
|
||||
|
||||
# extraSpecialArgs = { kube = kube.packages.x86_64-linux.default; };
|
||||
};
|
||||
homeConfigurations.msi-laptop =
|
||||
let pkgs = import nixpkgs { system = "x86_64-linux"; config.allowUnfree = true; };
|
||||
modules = modules-for-system pkgs;
|
||||
in home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
@@ -50,40 +185,47 @@
|
||||
modules =
|
||||
[
|
||||
nix-index-database.homeModules.default
|
||||
"${modules}/base.nix"
|
||||
"${modules}/desktop.nix"
|
||||
"${modules}/redbook.nix"
|
||||
"${modules}/redbook-desktop.nix"
|
||||
rycee.hmModules.emacs-init
|
||||
"${modules}"
|
||||
] ++
|
||||
[{
|
||||
home.stateVersion = "22.05";
|
||||
home.username = "jfrikker";
|
||||
home.homeDirectory = "/Users/jfrikker";
|
||||
home.packages = [ pkgs.pinentry_mac ];
|
||||
}];
|
||||
|
||||
extraSpecialArgs = { kube = kube.packages.aarch64-darwin.default; };
|
||||
};
|
||||
homeConfigurations.home =
|
||||
let pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
||||
modules = modules-for-system pkgs;
|
||||
in home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
|
||||
modules = [
|
||||
nix-index-database.homeModules.default
|
||||
] ++
|
||||
(pkgs.lib.filter
|
||||
(n: pkgs.lib.strings.hasSuffix ".nix" n)
|
||||
(pkgs.lib.filesystem.listFilesRecursive "${modules}/base")) ++
|
||||
[{
|
||||
home.stateVersion = "22.05";
|
||||
home.username = "jfrikker";
|
||||
home.homeDirectory = "/home/jfrikker";
|
||||
}];
|
||||
jfrikker.enable = true;
|
||||
jfrikker.desktop.enable = true;
|
||||
|
||||
extraSpecialArgs = { kube = kube.packages.x86_64-linux.default; };
|
||||
home.packages = [ pkgs.protonmail-desktop pkgs.proton-vpn ];
|
||||
|
||||
programs.ghostty = {
|
||||
enable = true;
|
||||
settings = {
|
||||
font-family = "Iosevka Term Extended";
|
||||
font-size = 10;
|
||||
};
|
||||
};
|
||||
|
||||
programs.foot = {
|
||||
enable = true;
|
||||
settings = {
|
||||
main = {
|
||||
font = "Iosevka Term:size=10:width=expanded";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
home.pointerCursor = {
|
||||
enable = true;
|
||||
package = pkgs.vanilla-dmz;
|
||||
name = "Vanilla-DMZ";
|
||||
sway.enable = true;
|
||||
gtk.enable = true;
|
||||
};
|
||||
|
||||
programs.emacs.package = pkgs.emacs-pgtk;
|
||||
}];
|
||||
};
|
||||
packages.x86_64-linux.default = modules-for-system nixpkgs.legacyPackages.x86_64-linux;
|
||||
packages.aarch64-darwin.default = modules-for-system nixpkgs.legacyPackages.aarch64-darwin;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user