mirror of
https://github.com/youwen5/nixos.git
synced 2024-11-24 17:53:51 -08:00
update: migrate to nixos-unstable
also fixes broken easyeffects build by pinning to 24.05 (uakari)
This commit is contained in:
parent
5fa8e27709
commit
7d3b8a6dc5
5 changed files with 43 additions and 15 deletions
34
flake.lock
34
flake.lock
|
@ -120,16 +120,15 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1720042825,
|
||||
"narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
|
||||
"lastModified": 1722462338,
|
||||
"narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
|
||||
"rev": "6e090576c4824b16e8759ebca3958c5b09659ee8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-24.05",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
@ -163,16 +162,16 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1720553833,
|
||||
"narHash": "sha256-IXMiHQMtdShDXcBW95ctA+m5Oq2kLxnBt7WlMxvDQXA=",
|
||||
"lastModified": 1722185531,
|
||||
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "249fbde2a178a2ea2638b65b9ecebd531b338cf9",
|
||||
"rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-24.05",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
@ -225,7 +224,8 @@
|
|||
"catppuccin": "catppuccin",
|
||||
"home-manager": "home-manager",
|
||||
"lanzaboote": "lanzaboote",
|
||||
"nixpkgs": "nixpkgs"
|
||||
"nixpkgs": "nixpkgs",
|
||||
"stablepkgs": "stablepkgs"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
|
@ -253,6 +253,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"stablepkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1722221733,
|
||||
"narHash": "sha256-sga9SrrPb+pQJxG1ttJfMPheZvDOxApFfwXCFO0H9xw=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "12bf09802d77264e441f48e25459c10c93eada2e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-24.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
|
|
18
flake.nix
18
flake.nix
|
@ -2,11 +2,12 @@
|
|||
description = "System configuration flake.";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-24.05";
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||
catppuccin.url = "github:catppuccin/nix";
|
||||
# zimfw.url = "github:joedevivo/zimfw.nix";
|
||||
lanzaboote = {
|
||||
|
@ -17,8 +18,8 @@
|
|||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
{ self, nixpkgs, home-manager, catppuccin, lanzaboote, ... }@inputs: {
|
||||
outputs = { self, nixpkgs, home-manager, catppuccin, lanzaboote, stablepkgs
|
||||
, ... }@inputs: {
|
||||
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt;
|
||||
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = { inherit inputs; };
|
||||
|
@ -47,6 +48,15 @@
|
|||
};
|
||||
})
|
||||
|
||||
{
|
||||
nixpkgs.overlays = [
|
||||
(self: super: {
|
||||
easyeffects =
|
||||
stablepkgs.legacyPackages.${self.system}.easyeffects;
|
||||
})
|
||||
];
|
||||
}
|
||||
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
|
|
3
home.nix
3
home.nix
|
@ -18,7 +18,7 @@
|
|||
# home.file.".xxx".text = ''
|
||||
# xxx
|
||||
# '';
|
||||
|
||||
|
||||
home.file.".config/neofetch/config.conf".source = ./config/neofetch.conf;
|
||||
|
||||
# Packages that should be installed to the user profile.
|
||||
|
@ -85,6 +85,7 @@
|
|||
};
|
||||
|
||||
services.easyeffects.enable = true;
|
||||
services.easyeffects.package = pkgs.easyeffects;
|
||||
|
||||
programs.fzf = {
|
||||
enable = true;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
enable = true;
|
||||
settings = {
|
||||
exec-once = [ "waybar" "waypaper --restore" ];
|
||||
exec-once = [ "waypaper --restore" ];
|
||||
"$mod" = "SUPER";
|
||||
"$Left" = "Y";
|
||||
"$Right" = "O";
|
||||
|
|
|
@ -85,4 +85,5 @@
|
|||
};
|
||||
};
|
||||
style = ./waybar.css;
|
||||
systemd.enable = true;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue