actually fix flake

This commit is contained in:
mjallen18
2025-03-19 20:35:18 -05:00
parent 8845631385
commit b670f3a652
6 changed files with 53 additions and 8 deletions

36
flake.lock generated
View File

@@ -924,6 +924,22 @@
} }
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": {
"lastModified": 1742268799,
"narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "da044451c6a70518db5b730fe277b70f494188f1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1730741070, "lastModified": 1730741070,
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
@@ -939,6 +955,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1742288794,
"narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1742288794, "lastModified": 1742288794,
@@ -1111,7 +1143,7 @@
"steamdeck-lanzaboote", "steamdeck-lanzaboote",
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1731363552, "lastModified": 1731363552,
@@ -1146,6 +1178,8 @@
"nas-nixpkgs": "nas-nixpkgs", "nas-nixpkgs": "nas-nixpkgs",
"nas-sops-nix": "nas-sops-nix", "nas-sops-nix": "nas-sops-nix",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixpkgs-stable": "nixpkgs-stable_3",
"nixpkgs-unstable": "nixpkgs-unstable",
"pi4-home-manager": "pi4-home-manager", "pi4-home-manager": "pi4-home-manager",
"pi4-impermanence": "pi4-impermanence", "pi4-impermanence": "pi4-impermanence",
"pi4-nixos-hardware": "pi4-nixos-hardware", "pi4-nixos-hardware": "pi4-nixos-hardware",

View File

@@ -178,7 +178,6 @@
# Nix hardware # Nix hardware
steamdeck-nixos-hardware = { steamdeck-nixos-hardware = {
url = "github:NixOS/nixos-hardware/master"; url = "github:NixOS/nixos-hardware/master";
inputs.nixpkgs.follows = "steamdeck-nixpkgs";
}; };
# steam rom manager # steam rom manager
@@ -197,6 +196,18 @@
url = "github:LnL7/nix-darwin"; url = "github:LnL7/nix-darwin";
inputs.nixpkgs.follows = "desktop-nixpkgs"; inputs.nixpkgs.follows = "desktop-nixpkgs";
}; };
#####################################################
# Common #
#####################################################
nixpkgs-unstable = {
url = "github:NixOS/nixpkgs/nixos-unstable";
};
nixpkgs-stable = {
url = "github:NixOS/nixpkgs/nixos-24.11";
};
}; };
outputs = outputs =
@@ -242,7 +253,11 @@
steamdeck-steam-rom-manager, steamdeck-steam-rom-manager,
# MacBook # MacBook
nix-darwin nix-darwin,
# Common
nixpkgs-unstable,
nixpkgs-stable,
}@inputs: }@inputs:
let let
inherit (self) outputs; inherit (self) outputs;

View File

@@ -104,6 +104,7 @@ in
enable = lib.mkDefault true; enable = lib.mkDefault true;
enableSSHSupport = lib.mkDefault true; enableSSHSupport = lib.mkDefault true;
}; };
command-not-found.enable = lib.mkForce false;
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

View File

@@ -56,8 +56,6 @@ in
aliases = gitAliases; aliases = gitAliases;
}; };
programs.command-not-found.enable = true;
home.packages = with pkgs; [ home.packages = with pkgs; [
age age
fastfetch fastfetch

View File

@@ -65,8 +65,6 @@ in
}; };
}; };
programs.command-not-found.enable = true;
home.packages = with pkgs; [ home.packages = with pkgs; [
apple-cursor apple-cursor
colloid-icon-theme colloid-icon-theme

View File

@@ -25,7 +25,6 @@ in
home.stateVersion = "23.11"; home.stateVersion = "23.11";
programs = { programs = {
command-not-found.enable = true;
home-manager.enable = true; home-manager.enable = true;
zsh = { zsh = {