ahuston-0/nix-dotfiles
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Merge pull request 'update flake lock, disable extra stylix inputs, fix homemodule for nix index database' (#131) from update_flake_lock_action into main
Some checks failed
Check flake.lock / Check health of `flake.lock` (push) Successful in 9m27s
Details
Check Nix flake / Perform Nix flake checks (push) Successful in 16m5s
Details
Update flakes / update_lockfile (push) Failing after 26s
Details

Browse Source 
Reviewed-on: #131
This commit is contained in:
ahuston-0
2025-08-01 00:58:33 -04:00
parent 5a54f8e153 b829225998
commit ef9cff8e52
10 changed files with 92 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
flake.lock generated
View File

@@ -37,11 +37,11 @@
"base16-helix": { "base16-helix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748408240, "lastModified": 1752979451,
"narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-helix", "repo": "base16-helix",
"rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -75,11 +75,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1752206617, "lastModified": 1753761817,
"narHash": "sha256-/Pu0pBOI3hsg3eIK6AsQ6kwvONqE2b1b/zOz06ePJKE=", "narHash": "sha256-FE908x/ihUlr5yn1f+PTMyOjcwotGUodzn7Ej6zZf5U=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "680d0ba892443d95ad1afdc523686573111e6c1a", "rev": "b657cfddb78408e9b53b4a8aaeaac71fc7ea182e",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@@ -124,11 +124,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1751413152, "lastModified": 1753121425,
"narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -239,11 +239,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752202894, "lastModified": 1753983724,
"narHash": "sha256-knafgng4gCjZIUMyAEWjxxdols6n/swkYnbWr+oF+1w=", "narHash": "sha256-2vlAOJv4lBrE+P1uOGhZ1symyjXTRdn/mz0tZ6faQcg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "fab659b346c0d4252208434c3c4b3983a4b38fec", "rev": "7035020a507ed616e2b20c61491ae3eaa8e5462c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -282,11 +282,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752069516, "lastModified": 1753252360,
"narHash": "sha256-dyzDJvt8IVgHJVmpnw1mueHHSLYnChW1XMkwz9WUBZ8=", "narHash": "sha256-PFAJoEqQWMlo1J+yZb+4HixmhbRVmmNl58e/AkLYDDI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "34d0c01910552b873a07c96921ef70e32bf369a2", "rev": "6839b23345b71db17cd408373de4f5605bf589b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -335,11 +335,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751774635, "lastModified": 1753589988,
"narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=", "narHash": "sha256-y1JlcMB2dKFkrr6g+Ucmj8L//IY09BtSKTH/A7OU7mU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "85686025ba6d18df31cc651a91d5adef63378978", "rev": "f0736b09c43028fd726fb70c3eb3d1f0795454cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -415,11 +415,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1752048960, "lastModified": 1753122741,
"narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -438,11 +438,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752190421, "lastModified": 1753565224,
"narHash": "sha256-IXOsH31wgX1DXW1H1WMTBBMqz5Qhw2je6ObmzGK7z+w=", "narHash": "sha256-xycwDrS8FLIMxXVOgVWL5BpdcjifW1Oyd4tNdwmHsOU=",
"owner": "SuperSandro2000", "owner": "SuperSandro2000",
"repo": "nixos-modules", "repo": "nixos-modules",
"rev": "17972ee0700a8e647e3fe74aa15315b5ccad4f06", "rev": "23dce122ef5ae6e949991547d40b27cb83290a7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -453,11 +453,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1752206449, "lastModified": 1753991760,
"narHash": "sha256-NVAbC/s4CupABWGXF8M9mDiVw/n0YCftxwc1KatVjDk=", "narHash": "sha256-J0DcjBUF5MX7CV3TRCGGYsw0eQrlx8RcC90HVJIYjG0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1bd4d0d4a678d48b63eb18f457d74df2fcee6c69", "rev": "61bc81f4f56844cddfebd9c88cbac6dd07694b2f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -578,11 +578,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752201818, "lastModified": 1754016903,
"narHash": "sha256-d8KczaVT8WFEZdWg//tMAbv8EDyn2YTWcJvSY8gqKBU=", "narHash": "sha256-mRB5OOx7H5kFwW8Qtc/7dO3qHsBQtZ/eYQEj93/Noo8=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "bd8f8329780b348fedcd37b53dbbee48c08c496d", "rev": "ddd488184f01603b712ddbb6dc9fe0b8447eb7fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -598,11 +598,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751606940, "lastModified": 1752544651,
"narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=", "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d", "rev": "2c8def626f54708a9c38a5861866660395bb3461",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -632,11 +632,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1752231632, "lastModified": 1753978157,
"narHash": "sha256-ZuFQ62qagCV5GHSbwnpLk92HxKlNjG7w4wbkT1OrhUA=", "narHash": "sha256-sVy8hb71VawSOIsLv/hMGzpvbbWszdP9aSKI5Drbt6Q=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "0150050d6eed373b04fd85e08bd2ae7b5cc8d3b2", "rev": "ded4f29a023e0f14506ec16b0e32d129e56341cc",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View File

@@ -127,8 +127,6 @@
stylix = { stylix = {
url = "github:danth/stylix"; url = "github:danth/stylix";
inputs = { inputs = {
flake-compat.follows = "flake-compat";
home-manager.follows = "home-manager";
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
}; };
}; };
@@ -181,7 +179,7 @@
modules = [ modules = [
inputs.stylix.homeModules.stylix inputs.stylix.homeModules.stylix
inputs.sops-nix.homeManagerModules.sops inputs.sops-nix.homeManagerModules.sops
inputs.nix-index-database.hmModules.nix-index inputs.nix-index-database.homeModules.nix-index
{ {
nixpkgs.config = { nixpkgs.config = {
allowUnfree = true; allowUnfree = true;

29
lib/systems.nix
View File

@@ -169,21 +169,20 @@ rec {
system system
; ;
}; };
modules = modules = [
[ inputs.nixos-modules.nixosModule
inputs.nixos-modules.nixosModule inputs.nix-index-database.nixosModules.nix-index
inputs.nix-index-database.nixosModules.nix-index (genHostName hostname)
(genHostName hostname) (configPath + "/hardware.nix")
(configPath + "/hardware.nix") (configPath + "/configuration.nix")
(configPath + "/configuration.nix") ]
] ++ modules
++ modules ++ (lib.adev.fileList (src + "/modules"))
++ (lib.adev.fileList (src + "/modules")) ++ genWrapper sops genSops args
++ genWrapper sops genSops args ++ genWrapper home genHome args
++ genWrapper home genHome args ++ genWrapper true genUsers args
++ genWrapper true genUsers args #++ genWrapper lix ({ ... }: [ inputs.lix-module.nixosModules.default ]) args
#++ genWrapper lix ({ ... }: [ inputs.lix-module.nixosModules.default ]) args ++ genWrapper (system != "x86_64-linux") genNonX86 args;
++ genWrapper (system != "x86_64-linux") genNonX86 args;
}; };
# a convenience function for automatically generating NixOS systems by reading a directory via constructSystem # a convenience function for automatically generating NixOS systems by reading a directory via constructSystem

11
modules/autopull.nix
View File

@@ -59,11 +59,12 @@ in
repos = lib.filterAttrs (_: { enable, ... }: enable) cfg.repo; repos = lib.filterAttrs (_: { enable, ... }: enable) cfg.repo;
in in
lib.mkIf cfg.enable { lib.mkIf cfg.enable {
environment.systemPackages = environment.systemPackages = [
[ pkgs.git ] pkgs.git
++ lib.optionals (lib.any (ssh-key: ssh-key != "") (lib.adev.mapGetAttr "ssh-key" repos)) [ ]
pkgs.openssh ++ lib.optionals (lib.any (ssh-key: ssh-key != "") (lib.adev.mapGetAttr "ssh-key" repos)) [
]; pkgs.openssh
];
systemd.services = lib.mapAttrs' ( systemd.services = lib.mapAttrs' (
_: _:

9
modules/boot.nix
View File

@@ -35,10 +35,11 @@ in
config.boot = lib.mkIf cfg.default { config.boot = lib.mkIf cfg.default {
supportedFilesystems = [ cfg.filesystem ]; supportedFilesystems = [ cfg.filesystem ];
tmp.useTmpfs = true; tmp.useTmpfs = true;
kernelParams = kernelParams = [
[ "nordrand" ] "nordrand"
++ lib.optional (cfg.cpuType == "amd") "kvm-amd" ]
++ lib.optional cfg.fullDiskEncryption "ip=<ip-addr>::<ip-gateway>:<netmask>"; ++ lib.optional (cfg.cpuType == "amd") "kvm-amd"
++ lib.optional cfg.fullDiskEncryption "ip=<ip-addr>::<ip-gateway>:<netmask>";
initrd = { initrd = {
kernelModules = lib.mkIf cfg.amdGPU [ "amdgpu" ]; kernelModules = lib.mkIf cfg.amdGPU [ "amdgpu" ];
network = lib.mkIf cfg.fullDiskEncryption { network = lib.mkIf cfg.fullDiskEncryption {

1
systems/artemision/programs.nix
View File

@@ -53,7 +53,6 @@
# nbt explorer? # nbt explorer?
ncdu ncdu
nemo-with-extensions nemo-with-extensions
neofetch
neovim neovim
nix-init nix-init
nix-output-monitor nix-output-monitor

2
systems/palatine-hill/configuration.nix
View File

@@ -53,7 +53,7 @@
vaapiVdpau vaapiVdpau
libvdpau-va-gl libvdpau-va-gl
intel-compute-runtime intel-compute-runtime
intel-media-sdk vpl-gpu-rt # replaces intel-media-sdk
]; ];
}; };
}; };

1
systems/selinunte/programs.nix
View File

@@ -52,7 +52,6 @@
# nbt explorer? # nbt explorer?
ncdu ncdu
nemo-with-extensions nemo-with-extensions
neofetch
neovim neovim
nix-init nix-init
nix-output-monitor nix-output-monitor

27
users/alice/home.nix
View File

@@ -7,18 +7,17 @@
}: }:
{ {
imports = imports = [
[ ./home/zsh.nix
./home/zsh.nix ./home/git.nix
./home/git.nix ]
] ++ lib.optionals (!machineConfig.server) [
++ lib.optionals (!machineConfig.server) [ ./home/gammastep.nix
./home/gammastep.nix ./home/doom
./home/doom ./home/hypr
./home/hypr ./home/waybar.nix
./home/waybar.nix ./non-server.nix
./non-server.nix ];
];
home = { home = {
# # Adds the 'hello' command to your environment. It prints a friendly # # Adds the 'hello' command to your environment. It prints a friendly
@@ -55,7 +54,6 @@
file file
sqlite sqlite
ncdu ncdu
neofetch
onefetch onefetch
hyfetch hyfetch
smartmontools smartmontools
@@ -149,6 +147,9 @@
}; };
}; };
}; };
fastfetch = {
enable = true;
};
}; };
services.ssh-agent.enable = true; services.ssh-agent.enable = true;