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

26
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
]; ];
}; };
@ -96,9 +92,9 @@
home-manager.backupFileExtension = "backup"; home-manager.backupFileExtension = "backup";
home-manager.users.youwen = { home-manager.users.youwen = {
imports = [ imports = [
./users/youwen/common ./users/youwen/common
./users/youwen/linux/laptop ./users/youwen/linux/laptop
./users/youwen/linux/packages/aarch-64 ./users/youwen/linux/packages/aarch-64
inputs.catppuccin.homeManagerModules.catppuccin inputs.catppuccin.homeManagerModules.catppuccin
]; ];

17
hosts/nixos/default.nix
View file

@ -13,23 +13,16 @@
boot.loader = { boot.loader = {
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
timeout = 15; timeout = 15;
# 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.
systemd-boot = { systemd-boot = {
enable = true; enable = false;
consoleMode = "auto"; 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;
boot.lanzaboote = { boot.lanzaboote = {
enable = true; enable = true;
pkiBundle = "/etc/secureboot"; pkiBundle = "/etc/secureboot";

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
];
} }

28
users/youwen/linux/hyprland/common.nix
View file

@ -20,19 +20,19 @@
"$mod, T, exec, kitty" "$mod, T, exec, kitty"
"$mod, E, exec, dolphin" "$mod, E, exec, dolphin"
"$mod, R, exec, pavucontrol" "$mod, R, exec, pavucontrol"
# Window actions # Window actions
"$mod, Q, killactive" "$mod, Q, killactive"
"$mod, W, togglefloating" "$mod, W, togglefloating"
"$mod, J, togglesplit" "$mod, J, togglesplit"
"$mod, Return, fullscreen" "$mod, Return, fullscreen"
# Move around # Move around
"$mod, $Left, movefocus, l" "$mod, $Left, movefocus, l"
"$mod, $Right, movefocus, r" "$mod, $Right, movefocus, r"
"$mod, $Up, movefocus, u" "$mod, $Up, movefocus, u"
"$mod, $Down, movefocus, d" "$mod, $Down, movefocus, d"
"$mod, 1, workspace, 1" "$mod, 1, workspace, 1"
"$mod, 2, workspace, 2" "$mod, 2, workspace, 2"
"$mod, 3, workspace, 3" "$mod, 3, workspace, 3"
@ -43,28 +43,28 @@
"$mod, 8, workspace, 8" "$mod, 8, workspace, 8"
"$mod, 9, workspace, 9" "$mod, 9, workspace, 9"
"$mod, 0, workspace, 10" "$mod, 0, workspace, 10"
"$mod, S, togglespecialworkspace" "$mod, S, togglespecialworkspace"
# Move windows around # Move windows around
"$mod+Shift+Ctrl, $Left, movewindow, l" "$mod+Shift+Ctrl, $Left, movewindow, l"
"$mod+Shift+Ctrl, $Right, movewindow, r" "$mod+Shift+Ctrl, $Right, movewindow, r"
"$mod+Shift+Ctrl, $Up, movewindow, u" "$mod+Shift+Ctrl, $Up, movewindow, u"
"$mod+Shift+Ctrl, $Down, movewindow, d" "$mod+Shift+Ctrl, $Down, movewindow, d"
"$mod+Ctrl+Alt, $Right, movetoworkspace, r+1" "$mod+Ctrl+Alt, $Right, movetoworkspace, r+1"
"$mod+Ctrl+Alt, $Left, movetoworkspace, r-1" "$mod+Ctrl+Alt, $Left, movetoworkspace, r-1"
"$mod+Ctrl, $Right, workspace, r+1" "$mod+Ctrl, $Right, workspace, r+1"
"$mod+Ctrl, $Left, workspace, r-1" "$mod+Ctrl, $Left, workspace, r-1"
"$mod+Alt, S, movetoworkspacesilent, special" "$mod+Alt, S, movetoworkspacesilent, special"
# Utilities # Utilities
"$mod, Space, exec, pkill -x rofi || rofi -show drun" # Run rofi "$mod, Space, exec, pkill -x rofi || rofi -show drun" # Run rofi
''$mod, P, exec, grim -g "$(slurp)" - | swappy -f -'' # Screenshot ''$mod, P, exec, grim -g "$(slurp)" - | swappy -f -'' # Screenshot
"$mod, Backspace, exec, wlogout" # Screenshot "$mod, Backspace, exec, wlogout" # Screenshot
]; ];
bindm = [ bindm = [
@ -93,7 +93,7 @@
"opacity 0.80 0.80,class:^(qt5ct)$" "opacity 0.80 0.80,class:^(qt5ct)$"
"opacity 0.80 0.80,class:^(qt6ct)$" "opacity 0.80 0.80,class:^(qt6ct)$"
"opacity 0.80 0.80,class:^(kvantummanager)$" "opacity 0.80 0.80,class:^(kvantummanager)$"
"opacity 0.90 0.90,class:^(com.github.rafostar.Clapper)$ # Clapper-Gtk" "opacity 0.90 0.90,class:^(com.github.rafostar.Clapper)$ # Clapper-Gtk"
"opacity 0.80 0.80,class:^(com.github.tchx84.Flatseal)$ # Flatseal-Gtk" "opacity 0.80 0.80,class:^(com.github.tchx84.Flatseal)$ # Flatseal-Gtk"
"opacity 0.80 0.80,class:^(hu.kramo.Cartridges)$ # Cartridges-Gtk" "opacity 0.80 0.80,class:^(hu.kramo.Cartridges)$ # Cartridges-Gtk"
@ -110,13 +110,13 @@
"opacity 0.80 0.80,class:^(io.gitlab.theevilskeleton.Upscaler)$ # Upscaler-Gtk" "opacity 0.80 0.80,class:^(io.gitlab.theevilskeleton.Upscaler)$ # Upscaler-Gtk"
"opacity 0.80 0.80,class:^(com.github.unrud.VideoDownloader)$ # VideoDownloader-Gtk" "opacity 0.80 0.80,class:^(com.github.unrud.VideoDownloader)$ # VideoDownloader-Gtk"
"opacity 0.80 0.80,class:^(lutris)$ # Lutris game launcher" "opacity 0.80 0.80,class:^(lutris)$ # Lutris game launcher"
"opacity 0.80 0.70,class:^(pavucontrol)$" "opacity 0.80 0.70,class:^(pavucontrol)$"
"opacity 0.80 0.70,class:^(blueman-manager)$" "opacity 0.80 0.70,class:^(blueman-manager)$"
"opacity 0.80 0.70,class:^(nm-applet)$" "opacity 0.80 0.70,class:^(nm-applet)$"
"opacity 0.80 0.70,class:^(nm-connection-editor)$" "opacity 0.80 0.70,class:^(nm-connection-editor)$"
"opacity 0.80 0.70,class:^(org.kde.polkit-kde-authentication-agent-1)$" "opacity 0.80 0.70,class:^(org.kde.polkit-kde-authentication-agent-1)$"
"float,class:^(org.kde.dolphin)$,title:^(Progress Dialog — Dolphin)$" "float,class:^(org.kde.dolphin)$,title:^(Progress Dialog — Dolphin)$"
"float,class:^(org.kde.dolphin)$,title:^(Copying — Dolphin)$" "float,class:^(org.kde.dolphin)$,title:^(Copying — Dolphin)$"
"float,title:^(Picture-in-Picture)$" "float,title:^(Picture-in-Picture)$"

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 ];
} }

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

@ -1,49 +1,50 @@
pkgs: with pkgs; [ pkgs:
neofetch with pkgs; [
neofetch
# archives # archives
zip zip
xz xz
unzip unzip
p7zip p7zip
# utils # utils
nurl # helps fetch git data for nixpkgs nurl # helps fetch git data for nixpkgs
# nix related # nix related
# #
# it provides the command `nom` works just like `nix` # it provides the command `nom` works just like `nix`
# with more details log output # with more details log output
nix-output-monitor nix-output-monitor
# system tools # system tools
pciutils # lspci pciutils # lspci
usbutils # lsusb usbutils # lsusb
# desktop utils # desktop utils
wl-clipboard wl-clipboard
grim grim
slurp slurp
swappy swappy
pavucontrol pavucontrol
swww swww
waypaper waypaper
# desktop apps # desktop apps
dolphin dolphin
thunderbird thunderbird
vesktop vesktop
signal-desktop signal-desktop
# dev tools # dev tools
nodePackages_latest.pnpm nodePackages_latest.pnpm
rustfmt rustfmt
rust-analyzer rust-analyzer
# desktop ricing # desktop ricing
bibata-cursors bibata-cursors
libsForQt5.qtstyleplugin-kvantum libsForQt5.qtstyleplugin-kvantum
libsForQt5.qt5ct libsForQt5.qt5ct
papirus-icon-theme papirus-icon-theme
libsForQt5.qt5ct libsForQt5.qt5ct
] ]

16
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 {
spotify home.packages = ((createCommon pkgs) ++ (with pkgs; [
bitwarden-desktop spotify
modrinth-app bitwarden-desktop
lutris modrinth-app
wine lutris
]); 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;