fix: build successfully on desktop

This commit is contained in:
Youwen Wu 2024-08-07 07:58:36 -07:00
parent ff235895de
commit 4cc4dc2c37
12 changed files with 97 additions and 103 deletions

View file

@ -48,17 +48,14 @@
system = "x86_64-linux";
modules = [
./hosts/nixos
./modules/nixos/gaming.nix
./modules/nixos/audio.nix
./modules/nixos/networking.nix
./modules/common/fonts.nix
./modules/nixos/gaming
./modules/nixos/audio
./modules/nixos/networking
./modules/common/fonts
catppuccin.nixosModules.catppuccin
lix-module.nixosModules.default
lanzaboote.nixosModules.lanzaboote
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
@ -66,11 +63,10 @@
home-manager.backupFileExtension = "backup";
home-manager.users.youwen = {
imports = [
# ./users/youwen/linux/linux-home.nix
./users/youwen/linux/desktop.nix
./users/youwen/linux/programs.nix
./users/youwen/common/core.nix
./users/youwen/linux/catppuccin.nix
./users/youwen/linux/desktop
./users/youwen/linux/packages/x86_64
./users/youwen/linux/programs
./users/youwen/common
inputs.catppuccin.homeManagerModules.catppuccin
];
};

View file

@ -13,22 +13,15 @@
boot.loader = {
efi.canTouchEfiVariables = true;
timeout = 15;
systemd-boot = {
enable = true;
consoleMode = "auto";
};
};
environment.systemPackages = [
# For debugging and troubleshooting Secure Boot.
pkgs.sbctl
];
# Lanzaboote currently replaces the systemd-boot module.
# This setting is usually set to true in configuration.nix
# generated at installation time. So we force it to false
# for now.
boot.loader.systemd-boot.enable = lib.mkForce false;
systemd-boot = {
enable = false;
consoleMode = "auto";
};
};
boot.lanzaboote = {
enable = true;

View file

@ -1,3 +1 @@
{
imports = [ ./core.nix ];
}
{ imports = [ ./core.nix ]; }

View file

@ -1,4 +1,10 @@
{
imports = [ ../theming ../home.nix ../programs ../hyprland/desktop ../waybar/desktop ];
imports = [
../theming
../home.nix
../programs
../hyprland/desktop
../waybar/desktop
];
}

View file

@ -1,3 +1 @@
{
imports = [ ../common.nix ./desktop-only.nix ];
}
{ imports = [ ../common.nix ./desktop-only.nix ]; }

View file

@ -1,3 +1 @@
{
imports = [ ../common.nix ./laptop-only.nix ];
}
{ imports = [ ../common.nix ./laptop-only.nix ]; }

View file

@ -1,4 +1,5 @@
{
imports = [ ../theming ../home.nix ../programs ../hyprland/laptop ../waybar/laptop ];
imports =
[ ../theming ../home.nix ../programs ../hyprland/laptop ../waybar/laptop ];
}

View file

@ -1,4 +1,5 @@
pkgs: with pkgs; [
pkgs:
with pkgs; [
neofetch
# archives

View file

@ -1,10 +1,12 @@
{ pkgs, ... }:
let createCommon = import ../common-packages.nix;
in { home.packages = ((createCommon pkgs) ++ with pkgs; [
in {
home.packages = ((createCommon pkgs) ++ (with pkgs; [
spotify
bitwarden-desktop
modrinth-app
lutris
wine
]);
sbctl
]));
}

View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{ pkgs, ... }: {
imports = [ ./catppuccin.nix ];
gtk = {

View file

@ -9,8 +9,10 @@
# width = 1000;
reload-style-on-change = true;
margin = "5px 0px 0px 0px";
modules-left = [ "hyprland/window" "hyprland/workspaces" "network" "clock" ];
modules-right = [ "group/hardware" "backlight" "group/adjustable" "custom/weather" ];
modules-left =
[ "hyprland/window" "hyprland/workspaces" "network" "clock" ];
modules-right =
[ "group/hardware" "backlight" "group/adjustable" "custom/weather" ];
# modules-center = [ "network" "group/hardware" "clock" ];
"hyprland/workspaces" = {
active-only = false;