Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

flake.lock: Update #15

Merged
merged 3 commits into from
Oct 2, 2023
Merged

flake.lock: Update #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c164c7
flake.lock: Update
github-actions[bot] Oct 2, 2023
b5933b5
fix: broken / disabled packages
khaneliman Oct 2, 2023
16aff5c
Remove dead code
khaneliman Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions modules/nixos/desktop/addons/qt/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,10 @@ in
accent = "Blue";
variant = "Macchiato";
})
# TODO: get qt5 and qt6 to work together properly with sddm and xdph
libsForQt5.qt5.qtgraphicaleffects
libsForQt5.qt5.qtquickcontrols2
libsForQt5.qt5.qtsvg
libsForQt5.qt5ct
libsForQt5.qtstyleplugin-kvantum
qt6Packages.qt6ct
qt6Packages.qtstyleplugin-kvantum
# qt6.full
# qt6.qtsvg
# qt6.qtquick3d
# qt6.qtwayland
]
++ lib.optional config.khanelinix.suites.wlroots.enable libsForQt5.qt5.qtwayland;
};
Expand Down
1 change: 0 additions & 1 deletion modules/nixos/suites/business/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ in
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [
libreoffice
teams
];

khanelinix = {
Expand Down
3 changes: 2 additions & 1 deletion modules/nixos/suites/development/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ in
environment.systemPackages = with pkgs; [
github-desktop
onefetch
qtcreator
# FIX: broken package
# qtcreator
neovide
vscode
] ++ lib.optionals cfg.nixEnable [
Expand Down
2 changes: 1 addition & 1 deletion overlays/yabai/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ channels, ... }: (_final: prev:
{ channels, ... }: (_final: _prev:
{
inherit (channels.nixpkgs-khanelinix) yabai;
})