From 4cc4dc2c3743e6601f7abc3f0de0da572725891e Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Wed, 7 Aug 2024 07:58:36 -0700 Subject: [PATCH] fix: build successfully on desktop --- flake.nix | 26 +++--- hosts/nixos/default.nix | 17 ++-- users/youwen/common/default.nix | 4 +- users/youwen/linux/desktop/default.nix | 8 +- users/youwen/linux/hyprland/common.nix | 28 +++---- .../youwen/linux/hyprland/desktop/default.nix | 4 +- .../youwen/linux/hyprland/laptop/default.nix | 4 +- users/youwen/linux/laptop/default.nix | 3 +- .../youwen/linux/packages/common-packages.nix | 81 ++++++++++--------- .../youwen/linux/packages/x86_64/default.nix | 16 ++-- users/youwen/linux/theming/default.nix | 3 +- users/youwen/linux/waybar/laptop/default.nix | 6 +- 12 files changed, 97 insertions(+), 103 deletions(-) diff --git a/flake.nix b/flake.nix index a8ed344..b8b0b77 100755 --- a/flake.nix +++ b/flake.nix @@ -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 ]; }; @@ -96,9 +92,9 @@ home-manager.backupFileExtension = "backup"; home-manager.users.youwen = { imports = [ - ./users/youwen/common - ./users/youwen/linux/laptop - ./users/youwen/linux/packages/aarch-64 + ./users/youwen/common + ./users/youwen/linux/laptop + ./users/youwen/linux/packages/aarch-64 inputs.catppuccin.homeManagerModules.catppuccin ]; diff --git a/hosts/nixos/default.nix b/hosts/nixos/default.nix index d89b862..d71d3e8 100755 --- a/hosts/nixos/default.nix +++ b/hosts/nixos/default.nix @@ -13,23 +13,16 @@ boot.loader = { efi.canTouchEfiVariables = true; 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 = { - enable = true; + enable = false; 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 = { enable = true; pkiBundle = "/etc/secureboot"; diff --git a/users/youwen/common/default.nix b/users/youwen/common/default.nix index 3f1ae7b..977e74b 100644 --- a/users/youwen/common/default.nix +++ b/users/youwen/common/default.nix @@ -1,3 +1 @@ -{ - imports = [ ./core.nix ]; -} +{ imports = [ ./core.nix ]; } diff --git a/users/youwen/linux/desktop/default.nix b/users/youwen/linux/desktop/default.nix index e082da2..0b05422 100644 --- a/users/youwen/linux/desktop/default.nix +++ b/users/youwen/linux/desktop/default.nix @@ -1,4 +1,10 @@ { - imports = [ ../theming ../home.nix ../programs ../hyprland/desktop ../waybar/desktop ]; + imports = [ + ../theming + ../home.nix + ../programs + ../hyprland/desktop + ../waybar/desktop + ]; } diff --git a/users/youwen/linux/hyprland/common.nix b/users/youwen/linux/hyprland/common.nix index 480ad9f..f039625 100644 --- a/users/youwen/linux/hyprland/common.nix +++ b/users/youwen/linux/hyprland/common.nix @@ -20,19 +20,19 @@ "$mod, T, exec, kitty" "$mod, E, exec, dolphin" "$mod, R, exec, pavucontrol" - + # Window actions "$mod, Q, killactive" "$mod, W, togglefloating" "$mod, J, togglesplit" "$mod, Return, fullscreen" - + # Move around "$mod, $Left, movefocus, l" "$mod, $Right, movefocus, r" "$mod, $Up, movefocus, u" "$mod, $Down, movefocus, d" - + "$mod, 1, workspace, 1" "$mod, 2, workspace, 2" "$mod, 3, workspace, 3" @@ -43,28 +43,28 @@ "$mod, 8, workspace, 8" "$mod, 9, workspace, 9" "$mod, 0, workspace, 10" - + "$mod, S, togglespecialworkspace" - + # Move windows around "$mod+Shift+Ctrl, $Left, movewindow, l" "$mod+Shift+Ctrl, $Right, movewindow, r" "$mod+Shift+Ctrl, $Up, movewindow, u" "$mod+Shift+Ctrl, $Down, movewindow, d" - + "$mod+Ctrl+Alt, $Right, movetoworkspace, r+1" "$mod+Ctrl+Alt, $Left, movetoworkspace, r-1" - + "$mod+Ctrl, $Right, workspace, r+1" "$mod+Ctrl, $Left, workspace, r-1" - + "$mod+Alt, S, movetoworkspacesilent, special" - + # Utilities "$mod, Space, exec, pkill -x rofi || rofi -show drun" # Run rofi - + ''$mod, P, exec, grim -g "$(slurp)" - | swappy -f -'' # Screenshot - + "$mod, Backspace, exec, wlogout" # Screenshot ]; bindm = [ @@ -93,7 +93,7 @@ "opacity 0.80 0.80,class:^(qt5ct)$" "opacity 0.80 0.80,class:^(qt6ct)$" "opacity 0.80 0.80,class:^(kvantummanager)$" - + "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:^(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:^(com.github.unrud.VideoDownloader)$ # VideoDownloader-Gtk" "opacity 0.80 0.80,class:^(lutris)$ # Lutris game launcher" - + "opacity 0.80 0.70,class:^(pavucontrol)$" "opacity 0.80 0.70,class:^(blueman-manager)$" "opacity 0.80 0.70,class:^(nm-applet)$" "opacity 0.80 0.70,class:^(nm-connection-editor)$" "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:^(Copying — Dolphin)$" "float,title:^(Picture-in-Picture)$" diff --git a/users/youwen/linux/hyprland/desktop/default.nix b/users/youwen/linux/hyprland/desktop/default.nix index e73aa12..f328200 100644 --- a/users/youwen/linux/hyprland/desktop/default.nix +++ b/users/youwen/linux/hyprland/desktop/default.nix @@ -1,3 +1 @@ -{ - imports = [ ../common.nix ./desktop-only.nix ]; -} +{ imports = [ ../common.nix ./desktop-only.nix ]; } diff --git a/users/youwen/linux/hyprland/laptop/default.nix b/users/youwen/linux/hyprland/laptop/default.nix index 2cf459b..9f7a1da 100644 --- a/users/youwen/linux/hyprland/laptop/default.nix +++ b/users/youwen/linux/hyprland/laptop/default.nix @@ -1,3 +1 @@ -{ - imports = [ ../common.nix ./laptop-only.nix ]; -} +{ imports = [ ../common.nix ./laptop-only.nix ]; } diff --git a/users/youwen/linux/laptop/default.nix b/users/youwen/linux/laptop/default.nix index ef8616c..039c1b3 100644 --- a/users/youwen/linux/laptop/default.nix +++ b/users/youwen/linux/laptop/default.nix @@ -1,4 +1,5 @@ { - imports = [ ../theming ../home.nix ../programs ../hyprland/laptop ../waybar/laptop ]; + imports = + [ ../theming ../home.nix ../programs ../hyprland/laptop ../waybar/laptop ]; } diff --git a/users/youwen/linux/packages/common-packages.nix b/users/youwen/linux/packages/common-packages.nix index 909218b..e53e64a 100644 --- a/users/youwen/linux/packages/common-packages.nix +++ b/users/youwen/linux/packages/common-packages.nix @@ -1,49 +1,50 @@ -pkgs: with pkgs; [ - neofetch +pkgs: +with pkgs; [ + neofetch - # archives - zip - xz - unzip - p7zip + # archives + zip + xz + unzip + p7zip - # utils - nurl # helps fetch git data for nixpkgs + # utils + nurl # helps fetch git data for nixpkgs - # nix related - # - # it provides the command `nom` works just like `nix` - # with more details log output - nix-output-monitor + # nix related + # + # it provides the command `nom` works just like `nix` + # with more details log output + nix-output-monitor - # system tools - pciutils # lspci - usbutils # lsusb + # system tools + pciutils # lspci + usbutils # lsusb - # desktop utils - wl-clipboard - grim - slurp - swappy - pavucontrol - swww - waypaper + # desktop utils + wl-clipboard + grim + slurp + swappy + pavucontrol + swww + waypaper - # desktop apps - dolphin - thunderbird - vesktop - signal-desktop + # desktop apps + dolphin + thunderbird + vesktop + signal-desktop - # dev tools - nodePackages_latest.pnpm - rustfmt - rust-analyzer + # dev tools + nodePackages_latest.pnpm + rustfmt + rust-analyzer - # desktop ricing - bibata-cursors - libsForQt5.qtstyleplugin-kvantum - libsForQt5.qt5ct - papirus-icon-theme - libsForQt5.qt5ct + # desktop ricing + bibata-cursors + libsForQt5.qtstyleplugin-kvantum + libsForQt5.qt5ct + papirus-icon-theme + libsForQt5.qt5ct ] diff --git a/users/youwen/linux/packages/x86_64/default.nix b/users/youwen/linux/packages/x86_64/default.nix index 0b5a666..303ea45 100644 --- a/users/youwen/linux/packages/x86_64/default.nix +++ b/users/youwen/linux/packages/x86_64/default.nix @@ -1,10 +1,12 @@ { pkgs, ... }: let createCommon = import ../common-packages.nix; -in { home.packages = ((createCommon pkgs) ++ with pkgs; [ - spotify - bitwarden-desktop - modrinth-app - lutris - wine -]); +in { + home.packages = ((createCommon pkgs) ++ (with pkgs; [ + spotify + bitwarden-desktop + modrinth-app + lutris + wine + sbctl + ])); } diff --git a/users/youwen/linux/theming/default.nix b/users/youwen/linux/theming/default.nix index 5b4c81d..287bf8c 100644 --- a/users/youwen/linux/theming/default.nix +++ b/users/youwen/linux/theming/default.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{ pkgs, ... }: { imports = [ ./catppuccin.nix ]; gtk = { diff --git a/users/youwen/linux/waybar/laptop/default.nix b/users/youwen/linux/waybar/laptop/default.nix index 8081790..5e2d71c 100644 --- a/users/youwen/linux/waybar/laptop/default.nix +++ b/users/youwen/linux/waybar/laptop/default.nix @@ -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;