Merge branch 'zenix/master' into alpine/master

This commit is contained in:
Tristan 2025-01-18 00:25:15 +00:00
commit 2c406b36d3
38 changed files with 843 additions and 360 deletions

View file

@ -1,17 +1,20 @@
{
description = "A flake using my config";
inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable";
# nixpkgs.url = "nixpkgs/nixos-unstable";
musnix.url = "github:musnix/musnix";
nixpkgs.follows = "nixos-cosmic/nixpkgs";
nixpkgs-stable.url = "nixpkgs/nixos-24.05";
home-manager = {
url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager-cosmic.url = "github:tristanbeedell/home-manager/cosmic";
hm-cosmic.url = "github:tristanbeedell/hm-cosmic/master";
stylix.url = "github:danth/stylix";
sops-nix.url = "github:Mic92/sops-nix";
nixos-cosmic = {
url = "github:lilyinstarlight/nixos-cosmic";
inputs.nixpkgs.follows = "nixpkgs";
# inputs.nixpkgs.follows = "nixpkgs";
};
nixvim = {
url = "github:nix-community/nixvim";
@ -36,9 +39,12 @@
./nixos/programs/cosmic.nix
./nixos/programs/gamer.nix
./nixos/programs/personal.nix
./nixos/services/musnix.nix
./nixos/workstation.nix
./nixos/programs/hyprland.nix
];
home-modules = [
./home/programs/mpd.nix
./home/programs/graphical.nix
./home/programs/gamer.nix
./home/programs/personal/.
@ -48,13 +54,14 @@
FCS-Tristan-Nixbook = mkConf {
nixos-modules = [
./hardware/fcs-tristan-nixbook.nix
# (auto-login "Hyprland")
# ./nixos/programs/hyprland.nix
./nixos/workstation.nix
./nixos/modules/work.nix
./nixos/programs/cosmic.nix
./nixos/programs/libvertd.nix
./nixos/programs/hyprland.nix
];
home-modules = [
./home/programs/mpd.nix
./home/programs/work.nix
./home/programs/graphical.nix
];