youwen5/liminalOS
1
0
Fork 0
mirror of https://github.com/youwen5/nixos.git synced 2024-11-24 17:53:51 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: build successfully on desktop

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

20
flake.nix
View file

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

17
hosts/nixos/default.nix
View file

@ -13,22 +13,15 @@
boot.loader = { boot.loader = {
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
timeout = 15; 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. # Lanzaboote currently replaces the systemd-boot module.
# This setting is usually set to true in configuration.nix # This setting is usually set to true in configuration.nix
# generated at installation time. So we force it to false # generated at installation time. So we force it to false
# for now. # for now.
boot.loader.systemd-boot.enable = lib.mkForce false; systemd-boot = {
enable = false;
consoleMode = "auto";
};
};
boot.lanzaboote = { boot.lanzaboote = {
enable = true; enable = true;

4
users/youwen/common/default.nix
View file

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

8
users/youwen/linux/desktop/default.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
];
} }

4
users/youwen/linux/hyprland/desktop/default.nix
View file

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

4
users/youwen/linux/hyprland/laptop/default.nix
View file

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

3
users/youwen/linux/laptop/default.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 ];
} }

3
users/youwen/linux/packages/common-packages.nix
View file

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

6
users/youwen/linux/packages/x86_64/default.nix
View file

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

3
users/youwen/linux/theming/default.nix
View file

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

6
users/youwen/linux/waybar/laptop/default.nix
View file

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