Skip to content

Commit

Permalink
Fixes to work with latest flake update
Browse files Browse the repository at this point in the history
- Pin kernel to 6.10.11 for ryzennova, due to NixOS/nixpkgs#344167
- Fix eza icon options, made it set to "auto" instead of true
- Removed qtbase, breaks Plasma 6.2.1 theming
- Remove python nose as it was deprecated and remove from nixpkgs
- Add space to transient prompt for oh-my-posh
- Switch from base xwaylandvideobridge to kdePackages.xwaylandvideobridge
- Remove gpg scdaemon settings as it seems to break Yubikey support
  • Loading branch information
NovaViper committed Oct 18, 2024
1 parent 84712b1 commit 2fa6d7a
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 13 deletions.
20 changes: 18 additions & 2 deletions hosts/ryzennova/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,24 @@ in
../../modules/linux/graphical
];

# Make NixOS use the latest Linux Kernel
boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
# Make NixOS use the Xanmod kernel (pinned to 6.10.11), see https://github.com/NixOS/nixpkgs/issues/344167
#boot.kernelPackages = pkgs.linuxKernel.packages.linux_xanmod;
boot.kernelPackages = pkgs.linuxPackagesFor (
pkgs.linux_xanmod_latest.override {
argsOverride = rec {
modDirVersion = "${version}-${suffix}";
suffix = "xanmod1";
version = "6.10.11";

src = pkgs.fetchFromGitHub {
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
hash = "sha256-FDWFpiN0VvzdXcS3nZHm1HFgASazNX5+pL/8UJ3hkI8=";
};
};
}
);

nixpkgs.config.cudaSupport = outputs.lib.mkForce true;

Expand Down
2 changes: 1 addition & 1 deletion modules/users/desktop/displayManager/wayland.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ in

home.packages = with pkgs; [
#xorg.xeyes
xwaylandvideobridge
kdePackages.xwaylandvideobridge
libsForQt5.qt5.qtwayland
qt6.qtwayland
];
Expand Down
1 change: 0 additions & 1 deletion modules/users/desktop/plasma6.nix
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@
qtimageformats
packagekit-qt
sddm-kcm # Add KCM for sddm
qtbase
]);
};
}
2 changes: 1 addition & 1 deletion modules/users/development/python.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ outputs.lib.mkModule config "python" {
packages = with pkgs; [
# :lang python, debugger, formatter
(python312.withPackages
(ps: with ps; [debugpy pyflakes isort pytest black pip pipx nose]))
(ps: with ps; [debugpy pyflakes isort pytest black pip pipx]))
pyright
pipenv
];
Expand Down
2 changes: 1 addition & 1 deletion modules/users/oh-my-posh.nix
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ in
"{{if gt .Code 0}}1{{end}}"
"{{if eq .Code 0}}10{{end}}"
];
template = "{{.Var.PromptChar}}";
template = "{{.Var.PromptChar}} ";
};
};
};
Expand Down
6 changes: 0 additions & 6 deletions modules/users/yubikey.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
...
}:
outputs.lib.mkModule config "yubikey" {
# Make Yubikeys work with gnupg
programs.gpg.scdaemonSettings = {
reader-port = "Yubico Yubi";
disable-ccid = true;
};

home.shellAliases = {
# Make gpg switch Yubikey
gpg-switch-yubikey = ''gpg-connect-agent "scd serialno" "learn --force" /bye'';
Expand Down
2 changes: 1 addition & 1 deletion modules/users/zsh.nix
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ with outputs.lib;
eza = {
enable = true;
git = true;
icons = true;
icons = "auto";
extraOptions = ["--color=always" "--group-directories-first" "--classify"];
};

Expand Down

0 comments on commit 2fa6d7a

Please sign in to comment.