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

Upgrade to 23.11

Browse source 
- reduce sleep power drain on nixos-pulse, still not working perfectly sadly
This commit is contained in:
Tristan D. 2023-11-28 14:42:03 +01:00
parent d71e942e57
commit 52687e4541
Signed by: tristan
SSH key fingerprint: SHA256:U7y6eMb7CQDaTHv9XoX6/BaQnPqyxxKc+Xnfcefi6rY
5 changed files with 56 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
flake.lock generated
View file

@ -31,11 +31,11 @@
]
},
"locked": {
"lastModified": 1701051730,
"narHash": "sha256-4N3Fm36LSbNQwJkWcem3xzZ4klb39IaKdKeu6Xr2opM=",
"lastModified": 1701106761,
"narHash": "sha256-hEjYEdzc7Y1tJbYs8nT+svxH/VdmeJLjWR8oX46IMp8=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "14bfb2ab205d5040420b4daf90a69f9e169fdb2a",
"rev": "ff495a3172537a9a5d05fadd0699daf5deb48dc0",
"type": "github"
},
"original": {
@ -60,22 +60,6 @@
"type": "github"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
@ -138,16 +122,16 @@
]
},
"locked": {
"lastModified": 1700392168,
"narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=",
"lastModified": 1700814205,
"narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e",
"rev": "aeb2232d7a32530d3448318790534d196bf9427a",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-23.05",
"ref": "release-23.11",
"repo": "home-manager",
"type": "github"
}
@ -232,16 +216,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1700989516,
"narHash": "sha256-oKbmPa2wpTHh9XB3+zIx97uMZGNnp97GPliKKG2/plo=",
"lastModified": 1701058557,
"narHash": "sha256-fux7HlrnoNs93MN0kET4AfiYwg/expoasndRCFeDRyk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d2e4de209881b38392933fabf303cde3454b0b4c",
"rev": "070b5cf9f70bc7ef2dfd739a1f7d6c563fe64bd1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.05",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
@ -278,29 +262,13 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1679318992,
"narHash": "sha256-uoj5Oy6hruIHuxzfQZtcalObe5kPrX9v+ClUMFEOzmE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e2c97799da5f5cd87adfa5017fba971771e123ef",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 1701074228,
"narHash": "sha256-uCgX8pNMzAp7zKAUAA509U1WNRMV/iL+wEWynnUY12o=",
"lastModified": 1701118487,
"narHash": "sha256-CW3H8DVLJ/QEsoRGi1tRj75T2LsZZKRjvcIczh5g61M=",
"owner": "nix-community",
"repo": "NUR",
"rev": "7a780b49e43f5318aa23956cbe5ab7478a9793d1",
"rev": "2aac3f35b161d93b786369d97f1eb956a0f6be11",
"type": "github"
},
"original": {
@ -372,8 +340,7 @@
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur",
"plasma-manager": "plasma-manager",
"tuxedo-nixos": "tuxedo-nixos"
"plasma-manager": "plasma-manager"
}
},
"systems": {
@ -390,25 +357,6 @@
"repo": "default",
"type": "github"
}
},
"tuxedo-nixos": {
"inputs": {
"flake-compat": "flake-compat_2",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1698750271,
"narHash": "sha256-Bb8PUO9lOVjLWmzSHQ/ymG/+pyRy4PdQ3xt9urAPtpU=",
"owner": "blitz",
"repo": "tuxedo-nixos",
"rev": "fda17eb3acef01c7ad1536749ceb107b9ef7bd2d",
"type": "github"
},
"original": {
"owner": "blitz",
"repo": "tuxedo-nixos",
"type": "github"
}
}
},
"root": "root",

8
flake.nix
View file

@ -11,13 +11,10 @@
url = "github:NixOS/nixpkgs/nixos-unstable";
};
nixpkgs = {
url = "github:NixOS/nixpkgs/nixos-23.05";
};
tuxedo-nixos = {
url = "github:blitz/tuxedo-nixos";
url = "github:NixOS/nixpkgs/nixos-23.11";
};
home-manager = {
url = "github:nix-community/home-manager/release-23.05";
url = "github:nix-community/home-manager/release-23.11";
inputs.nixpkgs.follows = "nixpkgs";
};
emacs-overlay = {
@ -102,7 +99,6 @@
nix-index-database.nixosModules.nix-index
nur.nixosModules.nur
inputs.nix-ld.nixosModules.nix-ld
inputs.tuxedo-nixos.nixosModules.default
];
args = {
inherit self;

2
os-mods/amdgpu/default.nix
View file

@ -16,7 +16,7 @@
services.xserver.videoDrivers = [ "amdgpu" ];
systemd.tmpfiles.rules = [
"L+ /opt/rocm/hip - - - - ${pkgs.hip}"
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
];
hardware.opengl = {
driSupport = true;

2
os-mods/desktop/default.nix
View file

@ -8,7 +8,7 @@
# fonts
fonts.fontDir.enable = true;
fonts.fonts = with pkgs; [
fonts.packages = with pkgs; [
emacs-all-the-icons-fonts
corefonts
vistafonts

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

@ -20,12 +20,22 @@
system.stateVersion = "23.05";
boot = {
kernelPackages = pkgs.linuxPackages_zen;
kernelPackages = pkgs.linuxPackages_latest;
kernelPatches = [
{
name = "lexar";
patch = ./lexar.patch;
}
# {
# name = "lexar";
# patch = ./lexar.patch;
# }
];
kernelParams = [
"pcie_aspm=force"
"pcie_aspm.policy=powersupersave"
"amd_pstate.shared_mem=1"
"amd_pstate=passive"
"initcall_blacklist=acpi_cpufreq_init"
"initcall_blacklist=hsmp_plt_init"
# "gpiolib_acpi.ignore_interrupt=AMDI0030:00@9"
"rtc_cmos.use_acpi_alarm=1"
];
loader = {
systemd-boot = {
@ -109,6 +119,20 @@
systemd = {
services = {
tailord = {
enable = true;
description = "Tuxedo Tailor hardware control service";
after = [ "systemd-logind.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "dbus";
BusName = "com.tux.Tailor";
ExecStart = "${pkgs.unstable-os.tuxedo-rs}/bin/tailord";
Environment = "RUST_BACKTRACE=1";
Restart = "on-failure";
};
};
# This manually configures the automatically created network-adresses service to be more flexible
# regarding booting without the the device being available on boot
# It prevents slow timeouts & errors on boot while preserving Plug & Play ability
@ -130,21 +154,23 @@
services.udev.extraRules = ''
ACTION=="add", KERNEL=="enp5s0f4u1u1c2", TAG+="systemd", ENV{SYSTEMD_WANTS}="network-addresses-enp5s0f4u1u1c2.service"
ACTION=="remove", KERNEL=="enp5s0f4u1u1c2", RUN+="${pkgs.systemd}/bin/systemctl stop network-addresses-enp5s0f4u1u1c2.service"
SUBSYSTEM=="pci", ATTR{power/control}="auto"
'';
# energy saving stuff
powerManagement.powertop.enable = true;
environment.systemPackages = with pkgs.unstable-os; [ android-tools android-udev-rules ];
environment.systemPackages = with pkgs.unstable-os; [ android-tools android-udev-rules tuxedo-rs tailor-gui ryzenadj ];
services.dbus.packages = [ pkgs.unstable-os.tuxedo-rs ];
hardware = {
enableRedistributableFirmware = true;
i2c.enable = true;
tuxedo-control-center = {
enable = true;
package = inputs.tuxedo-nixos.packages.${system}.default;
};
tuxedo-keyboard.enable = true;
cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
cpu.amd.updateMicrocode = true;
};
zramSwap.enable = true;