tristan/nix
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Fix user-shell import

Browse source
This commit is contained in:
Tristan D. 2025-03-04 19:45:58 +01:00
parent b68de45043
commit 652675267a
Signed by: tristan
SSH key fingerprint: SHA256:9oFM1J63hYWJjCnLG6C0fxBS15rwNcWwdQNMOHYKJ/4
4 changed files with 12 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
home-mods/firefox/default.nix
View file

@ -2,8 +2,8 @@
, lib , lib
, pkgs , pkgs
, ... , ...
}@args: { } @ args: {
programs.firefox = (import ./_base.nix args); programs.firefox = import ./_base.nix args;
home.sessionVariables = { home.sessionVariables = {
BROWSER = "firefox"; BROWSER = "firefox";

4
home-mods/firefox/floorp.nix
View file

@ -2,8 +2,8 @@
, lib , lib
, pkgs , pkgs
, ... , ...
}@args: { } @ args: {
programs.floorp = (import ./_base.nix args); programs.floorp = import ./_base.nix args;
home.sessionVariables = { home.sessionVariables = {
BROWSER = "floorp"; BROWSER = "floorp";

9
systems/nixos-pulse/default.nix
View file

@ -5,7 +5,7 @@
, system , system
, inputs , inputs
, ... , ...
}@moduleArgs: { } @ moduleArgs: {
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
inputs.nixos-hardware.nixosModules.common-cpu-amd inputs.nixos-hardware.nixosModules.common-cpu-amd
@ -63,11 +63,10 @@
home-manager = { home-manager = {
useUserPackages = true; useUserPackages = true;
useGlobalPkgs = true; useGlobalPkgs = true;
users.tristand = import ../../users/admin-shell.nix { users.tristand = import ../../users/admin-shell.nix (moduleArgs
// {
username = "tristand"; username = "tristand";
});
inherit moduleArgs;
};
}; };
users.groups.nixremote = { }; users.groups.nixremote = { };

38
systems/rescue-iso/default.nix
View file

@ -20,40 +20,10 @@
# TODO Add authorized Keys # TODO Add authorized Keys
}; };
boot = boot = {
let kernelPackages = pkgs.linuxPackages_cachyos;
version = "6.12-rc1"; supportedFilesystems = lib.mkForce [ "bcachefs" "btrfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
# version = "6.12-rc3"; };
kernelPatches = pkgs.callPackage "${inputs.nixpkgs}/pkgs/os-specific/linux/kernel/patches.nix" { };
# ref = "6efbea77b390604a7be7364583e19cd2d6a1291b";
ref = "bc6d2d10418e1bfdb95b16f5dd4cca42d5dec766";
linux_mainline =
{ buildLinux
, fetchzip
, ...
} @ args:
buildLinux {
version = version;
src = fetchzip {
# url = "https://git.kernel.org/torvalds/t/linux-${ref}.tar.gz";
# hash = "";
url = "https://github.com/koverstreet/bcachefs/archive/${ref}.tar.gz";
hash = "sha256-tq0dXKVtW1R+Yenv7HG4Qqc1P49OzcJgICpoZLkA/K4=";
};
modDirVersion = lib.versions.pad 3 version;
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
extraMeta.branch = "master";
};
linuxMainlinePkg = pkgs.callPackage linux_mainline { };
linuxMainlinePkgs = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linuxMainlinePkg);
in
{
kernelPackages = linuxMainlinePkgs;
supportedFilesystems = lib.mkForce [ "bcachefs" "btrfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
};
users.users.root.openssh.authorizedKeys.keys = [ users.users.root.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4xz3EgIRiRb/gmnCSq17kHd4MLilf05zYOFZrwOIrA tristand@nixos-fw16" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4xz3EgIRiRb/gmnCSq17kHd4MLilf05zYOFZrwOIrA tristand@nixos-fw16"