This commit is contained in:
2025-07-18 03:33:13 -04:00
parent 3bfcfbb6a8
commit e0854cffc6
4 changed files with 60 additions and 50 deletions

51
flake.lock generated
View File

@@ -8,11 +8,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1745630506, "lastModified": 1750173260,
"narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "96e078c646b711aee04b82ba01aefbff87004ded", "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -51,11 +51,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1749521434, "lastModified": 1752805646,
"narHash": "sha256-iYuO2A6EeCk3yt7i+u5BbKpYUKBWZrWwEvyMzx7JL8o=", "narHash": "sha256-oa6HW3J/1Wil7BQGSL6qL08WNbKMnZk/1lTAo/klwwo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "a1fc4a1252cf8f730d39a6570d36b9b95b478cd5", "rev": "9d41880e6f1d613e4074ba4b39bdafbf0b5c7e09",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -92,11 +92,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745703610, "lastModified": 1752814804,
"narHash": "sha256-KgaGPlmjJItZ+Xf8mSoRmrsso+sf3K54n9oIP9Q17LY=", "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f5819a962489e037a57835f63ed6ff8dbc2d5fb", "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -121,13 +121,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-clisp": {
"locked": { "locked": {
"lastModified": 1749173751, "lastModified": 1736273097,
"narHash": "sha256-ENY3y3v6S9ZmLDDLI3LUT8MXmfXg/fSt2eA4GCnMVCE=", "narHash": "sha256-gRxxBFhbCMNK7h+jiH9mG4hT9ME3yLNB88RcY4YnQ8k=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ed29f002b6d6e5e7e32590deb065c34a31dc3e91", "rev": "da320e5472f021b96a883f71fc525ca0e4815273",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "da320e5472f021b96a883f71fc525ca0e4815273",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1751274312,
"narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -139,11 +155,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1745526057, "lastModified": 1752480373,
"narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -158,7 +174,8 @@
"agenix": "agenix", "agenix": "agenix",
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2",
"nixpkgs-clisp": "nixpkgs-clisp"
} }
}, },
"systems": { "systems": {

View File

@@ -13,6 +13,8 @@
url = "github:nix-community/emacs-overlay"; url = "github:nix-community/emacs-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixpkgs-clisp.url = "github:NixOS/nixpkgs/da320e5472f021b96a883f71fc525ca0e4815273";
}; };
outputs = { outputs = {
@@ -21,58 +23,46 @@
home-manager, home-manager,
agenix, agenix,
emacs-overlay, emacs-overlay,
nixpkgs-clisp,
} @ inputs: let } @ inputs: let
baseModule = { system = "x86_64-linux";
# imports = [ baseModule = {lib, ...}: {
# home-manager.nixosModules.default imports = [
# ]; home-manager.nixosModules.default
system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev; agenix.nixosModules.default
];
system.configurationRevision = lib.mkIf (self ? rev) self.rev;
nixpkgs.overlays = [ nixpkgs.overlays = [
inputs.emacs-overlay.overlay emacs-overlay.overlay
(final: _prev: {
clisp = nixpkgs-clisp.legacyPackages.${system}.clisp;
})
];
environment.systemPackages = [
agenix.packages.${system}.default
]; ];
}; };
in { in {
nixosConfigurations.thonkpad = nixpkgs.lib.nixosSystem { nixosConfigurations.thonkpad = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [ modules = [
baseModule baseModule
{
environment.systemPackages = [agenix.packages.x86_64-linux.default];
}
home-manager.nixosModules.default
agenix.nixosModules.default
# agenix.homeManagerModules.age
./hosts/thonkpad/configuration.nix ./hosts/thonkpad/configuration.nix
]; ];
}; };
nixosConfigurations.rq = nixpkgs.lib.nixosSystem { nixosConfigurations.rq = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [ modules = [
baseModule baseModule
{
environment.systemPackages = [agenix.packages.x86_64-linux.default];
}
home-manager.nixosModules.default
agenix.nixosModules.default
# agenix.homeManagerModules.age
./hosts/rq/configuration.nix ./hosts/rq/configuration.nix
]; ];
}; };
nixosConfigurations.yoga = nixpkgs.lib.nixosSystem { nixosConfigurations.yoga = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [ modules = [
baseModule baseModule
{
environment.systemPackages = [agenix.packages.x86_64-linux.default];
}
home-manager.nixosModules.default
agenix.nixosModules.default
# agenix.homeManagerModules.age
./hosts/yoga/configuration.nix ./hosts/yoga/configuration.nix
]; ];
}; };

View File

@@ -80,7 +80,7 @@ in {
simple-mtpfs simple-mtpfs
signal-desktop signal-desktop
slack slack
nodejs_23 nodejs_24
gnumake gnumake
choose # better awk and cut choose # better awk and cut
grc grc
@@ -102,9 +102,12 @@ in {
ldns ldns
cmatrix cmatrix
pipes-rs pipes-rs
gimp # gimp (doens't werk)
file file
feh feh
ncdu
clisp
# rocmPackages.llvm.clang-unwrapped
# direnv # direnv
# emacs # haha # emacs # haha

View File

@@ -17,7 +17,7 @@
noto-fonts-cjk-sans noto-fonts-cjk-sans
b612 b612
nerd-fonts.noto nerd-fonts.noto
nerd-fonts.mplus # nerd-fonts.mplus
nerd-fonts.jetbrains-mono nerd-fonts.jetbrains-mono
noto-fonts-color-emoji noto-fonts-color-emoji
]; ];