Compare commits

...

4 commits

Author SHA1 Message Date
1a6da08c20 Yay, comments! 2024-06-07 02:16:31 -04:00
d5d9d71e65 Documentation edits are my passion. 2024-06-05 21:10:42 -04:00
c95fdb92b0 Add extra buildable rom-properties entries to main packages.
This should allow testing for using Ninja to build, adding GNOME Tracker to the build, or both.
2024-06-04 21:49:22 -04:00
dccffdbc7d Move around commented nixosConfigurations.nixps block. 2024-06-04 21:47:21 -04:00
3 changed files with 52 additions and 42 deletions

View file

@ -133,46 +133,7 @@
} }
]; ];
}; };
/*
nixps = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./system/xps/configuration.nix
# ./system/xps/users.nix
home-manager.nixosModules.home-manager
{
system.configurationRevision = self.shortRev or self.dirtyShortRev or "dirty";
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users = {
whovian = {
imports = [
./home/home.nix
agenix.homeManagerModules.default
nix-index-database.hmModules.nix-index
];
};
};
# Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
extraSpecialArgs = {
system = "x86_64-linux";
inherit xil;
inherit nixpkgs;
pkgs = import nixpkgs {
system = "x86_64-linux";
config.allowUnfree = true;
};
inherit agenix;
};
};
}
];
};
*/
isoimage = nixpkgs.lib.nixosSystem { isoimage = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
@ -195,6 +156,47 @@
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix" "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix"
]; ];
}; };
/*
nixps = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./system/xps/configuration.nix
# ./system/xps/users.nix
home-manager.nixosModules.home-manager
{
system.configurationRevision = self.shortRev or self.dirtyShortRev or "dirty";
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users = {
whovian = {
imports = [
./home/home.nix
agenix.homeManagerModules.default
nix-index-database.hmModules.nix-index
];
};
};
# Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
extraSpecialArgs = {
system = "x86_64-linux";
inherit xil;
inherit nixpkgs;
pkgs = import nixpkgs {
system = "x86_64-linux";
config.allowUnfree = true;
};
inherit agenix;
};
};
}
];
};
*/
}; };
packages.x86_64-linux = { packages.x86_64-linux = {
@ -204,6 +206,9 @@
ps3dec = pkgs.callPackage ./home/packages/ps3dec/package.nix {}; ps3dec = pkgs.callPackage ./home/packages/ps3dec/package.nix {};
sabretools = pkgs.callPackage ./home/packages/sabretools/package.nix {}; sabretools = pkgs.callPackage ./home/packages/sabretools/package.nix {};
rom-properties = pkgs.callPackage ./home/packages/rom-properties/package.nix {}; rom-properties = pkgs.callPackage ./home/packages/rom-properties/package.nix {};
rom-properties_ninja = pkgs.callPackage ./home/packages/rom-properties/package.nix { useNinja = true; };
rom-properties_gtracker = pkgs.callPackage ./home/packages/rom-properties/package.nix { useTracker = true; };
rom-properties_ninja_gtracker = pkgs.callPackage ./home/packages/rom-properties/package.nix { useNinja = true; useTracker = true; };
new_rclone = pkgs.rclone.overrideAttrs ( new_rclone = pkgs.rclone.overrideAttrs (
oldAttrs: { oldAttrs: {
patches = [ ./home/packages/new_rclone/patches/rclone_8ffe3e462cbf5688c37c54009db09d8dcb486860.diff ]; patches = [ ./home/packages/new_rclone/patches/rclone_8ffe3e462cbf5688c37c54009db09d8dcb486860.diff ];

View file

@ -88,8 +88,6 @@ in
}; };
}; };
# The home.packages option allows you to install Nix packages into your # The home.packages option allows you to install Nix packages into your
# environment. # environment.
@ -145,7 +143,7 @@ in
pkgs.rclone pkgs.rclone
# Replaced with my_packages.new_rclone which is a patched build. # Replaced with my_packages.new_rclone which is a patched build.
pkgs.screen pkgs.screen
# Replaced with System `programs.screen.enable` # Replaced with System-set "programs.screen.enable"
pkgs.terminator pkgs.terminator
# Not needed on WSL, even though I'd like it on WSL sometimes. # Not needed on WSL, even though I'd like it on WSL sometimes.
pkgs.yt-dlp pkgs.yt-dlp

View file

@ -30,7 +30,14 @@
[/modules/programs/zsh.nix] [/modules/programs/zsh.nix]
https://github.com/nix-community/home-manager/issues/3521#issuecomment-1367197995 https://github.com/nix-community/home-manager/issues/3521#issuecomment-1367197995
[Issue #3521] [Issue #3521]
06 June 2024:
Appears to be handled by "programs.zsh.enableCompletion" being enabled.
https://github.com/NixOS/nixpkgs/blob/49f6869f71fb2724674ccc18670bbde70843d43f/nixos/modules/programs/zsh/zsh.nix#L305
I appear to have "programs.zsh.enableCompletion" disabled for some reason?
Need to look into this again at some point, I suppose.
*/ */
environment.pathsToLink = [ environment.pathsToLink = [
"/share/zsh" "/share/zsh"
]; ];