Skip to content

Commit

Permalink
Disable flake inputs currently not actively in use
Browse files Browse the repository at this point in the history
And move the oneapi test into the intel folder
  • Loading branch information
arunoruto committed Nov 9, 2024
1 parent 129cd6f commit 4b00400
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 336 deletions.
302 changes: 10 additions & 292 deletions flake.lock

Large diffs are not rendered by default.

44 changes: 19 additions & 25 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,43 +29,37 @@
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
nur.url = "github:nix-community/NUR";
# nur.url = "github:nix-community/NUR";
# Home Manager
home-manager = {
url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs";
};
# DEs
nixos-cosmic = {
url = "github:lilyinstarlight/nixos-cosmic";
inputs.nixpkgs.follows = "nixpkgs-unstable";
# inputs.nixpkgs.follows = "nixpkgs";
};
plasma-manager = {
url = "github:nix-community/plasma-manager";
inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager";
};
# nixvim = {
# # url = "github:nix-community/nixvim";
# # inputs.nixpkgs.follows = "nixpkgs-unstable";
# url = "github:nix-community/nixvim/nixos-24.05";
# inputs.nixpkgs.follows = "nixpkgs";
# nixos-cosmic = {
# url = "github:lilyinstarlight/nixos-cosmic";
# inputs.nixpkgs.follows = "nixpkgs-unstable";
# # inputs.nixpkgs.follows = "nixpkgs";
# };
# plasma-manager = {
# url = "github:nix-community/plasma-manager";
# inputs = {
# nixpkgs.follows = "nixpkgs";
# home-manager.follows = "home-manager";
# };
# };
# neorg-overlay.url = "github:nvim-neorg/nixpkgs-neorg-overlay";
# nil.url = "github:oxalica/nil";
# nixvim-flake.url = "github:arunoruto/nvim.nix";
# Styling
stylix = {
# url = "github:danth/stylix";
url = "github:danth/stylix/release-24.05";
inputs.nixpkgs.follows = "nixpkgs";
};
ags.url = "github:Aylur/ags";
poetry2nix = {
url = "github:nix-community/poetry2nix";
inputs.nixpkgs.follows = "nixpkgs";
};
# ags.url = "github:Aylur/ags";
# poetry2nix = {
# url = "github:nix-community/poetry2nix";
# inputs.nixpkgs.follows = "nixpkgs";
# };

# Private
secrets = {
Expand Down Expand Up @@ -125,7 +119,7 @@
username = hostname-users."${hostname}";
};
modules = [
inputs.nur.nixosModules.nur
# inputs.nur.nixosModules.nur
inputs.nixos-facter-modules.nixosModules.facter
{
users.users.root.openssh.authorizedKeys.keys = [
Expand Down Expand Up @@ -164,7 +158,7 @@
];
};
modules = [
inputs.nur.hmModules.nur
# inputs.nur.hmModules.nur
# ./modules/home-manager/home.nix
./homes/${user}
inputs.stylix.homeManagerModules.stylix
Expand Down
4 changes: 2 additions & 2 deletions modules/home-manager/pc/desktop/bars/default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ lib, ... }:
{
imports = [
./ags
# ./ags
./eww
./waybar
];

bars = {
ags.enable = lib.mkDefault false;
# ags.enable = lib.mkDefault false;
eww.enable = lib.mkDefault true;
waybar.enable = lib.mkDefault false;
};
Expand Down
2 changes: 1 addition & 1 deletion modules/home-manager/server/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ in
dust
glow
hexyl
hugo
# hugo
marksman
miller
ncdu
Expand Down
13 changes: 4 additions & 9 deletions modules/nixos/desktop/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,19 @@
}:
{
imports = [
./cosmic.nix
# ./cosmic.nix
./gnome.nix
./hyprland.nix
./kde.nix
# ./kde.nix
./sway.nix
];

options.desktop-environment.enable = lib.mkEnableOption "Enable desktop environment and window manager support";

config = lib.mkIf config.desktop-environment.enable {
# gnome.enable = lib.mkForce false;
# kde.enable = lib.mkForce false;
# sway.enable = lib.mkForce false;
# hyprland.enable = lib.mkForce false;

cosmic.enable = lib.mkDefault false;
# cosmic.enable = lib.mkDefault false;
gnome.enable = lib.mkDefault true;
kde.enable = lib.mkDefault false;
# kde.enable = lib.mkDefault false;
sway.enable = lib.mkDefault true;
hyprland.enable = lib.mkDefault true;

Expand Down
2 changes: 1 addition & 1 deletion modules/nixos/environment/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
./ld.nix

./amd
./intel.nix
./intel
./nvidia
];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,17 @@
...
}:
{
imports = [
./oneapi.nix
];

options = {
intel.enable = lib.mkEnableOption "Setup intel tools";
};

config = lib.mkIf config.intel.enable {
oneapi.enable = lib.mkDefault false;

environment.systemPackages = with pkgs; [
intel-gpu-tools
];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
...
}:
{
options = {
oneapi.enable = lib.mkEnableOption "Enable OneAPI for Intel hardware";
};
options.oneapi.enable = lib.mkEnableOption "Enable OneAPI for Intel hardware";

config = lib.mkIf config.oneapi.enable {
environment.systemPackages = [
Expand Down
3 changes: 0 additions & 3 deletions modules/nixos/services/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

./davmail.nix
./flatpak.nix
./oneapi.nix
./ssh.nix
./tlp.nix
./ppd.nix
Expand All @@ -23,8 +22,6 @@

davmail.enable = lib.mkDefault false;
flatpak.enable = lib.mkDefault config.xdg.portal.enable;
oneapi.enable = lib.mkDefault false;
# oneapi.enable = lib.mkDefault true;
ssh.enable = lib.mkDefault true;
tlp.enable = lib.mkDefault false;
ppd.enable = lib.mkDefault false;
Expand Down

0 comments on commit 4b00400

Please sign in to comment.