diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..308bc47 --- /dev/null +++ b/TODO.md @@ -0,0 +1,6 @@ +# TODO + - [ ] Look into funny schedulers + - [ ] Look into why nix auto update fails + - [ ] Look into the "ignoring duplicate names" errors + - [ ] Center tuigreet + - [ ] \ No newline at end of file diff --git a/flake.lock b/flake.lock index 0b3581e..79d74cf 100644 --- a/flake.lock +++ b/flake.lock @@ -103,11 +103,11 @@ ] }, "locked": { - "lastModified": 1765059149, - "narHash": "sha256-n6BiVAdPVN74XPjYM3PGNQCg9gF7oQI+ioRvdOfgUqs=", + "lastModified": 1765105806, + "narHash": "sha256-drH4w3MzlQXDtseWX82n3nkuXAuDN/uJdTP5KOc2Tlo=", "owner": "nix-community", "repo": "NUR", - "rev": "a3a3e78202ab054dc9bedcf406437645ab3f68f4", + "rev": "902c2223fc433b82d7149a33e1bb729fdba1a898", "type": "github" }, "original": { @@ -124,11 +124,11 @@ ] }, "locked": { - "lastModified": 1765059149, - "narHash": "sha256-n6BiVAdPVN74XPjYM3PGNQCg9gF7oQI+ioRvdOfgUqs=", + "lastModified": 1765105806, + "narHash": "sha256-drH4w3MzlQXDtseWX82n3nkuXAuDN/uJdTP5KOc2Tlo=", "owner": "nix-community", "repo": "NUR", - "rev": "a3a3e78202ab054dc9bedcf406437645ab3f68f4", + "rev": "902c2223fc433b82d7149a33e1bb729fdba1a898", "type": "github" }, "original": { diff --git a/home/wm/sway.nix b/home/wm/sway.nix index e6ea2f1..f4de21e 100644 --- a/home/wm/sway.nix +++ b/home/wm/sway.nix @@ -255,7 +255,7 @@ # System - "Mod4+space" = ''exec ${notify} -t 2000 "$(xonsh ~/.nixos_config/util/get_xkb.xonsh)"''; + "Mod4+space" = ''exec ${notify} -t 2000 "$(xonsh ~/.nixos_config/util/get_xkb.xsh)"''; #Screenshot region "${key_mod}+Shift+s" = "exec grimshot savecopy area"; "Print" = "exec grimshot savecopy output"; diff --git a/hosts/common/base.nix b/hosts/common/base.nix index 6a6f575..9f32480 100644 --- a/hosts/common/base.nix +++ b/hosts/common/base.nix @@ -1,6 +1,9 @@ { config, pkgs, pkgs-unstable, lib, ... }: { - boot.kernel.sysctl = { - "net.ipv4.ip_unprivileged_port_start" = 0; + boot = { + kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; + kernel.sysctl = { + "net.ipv4.ip_unprivileged_port_start" = 0; + }; }; system.stateVersion = "24.05"; system.autoUpgrade = { diff --git a/hosts/tower/configuration.nix b/hosts/tower/configuration.nix index 5d6d63a..b995757 100644 --- a/hosts/tower/configuration.nix +++ b/hosts/tower/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, pkgs-unstable, ... }: { imports = @@ -8,23 +8,26 @@ enable = true; }; time.hardwareClockInLocalTime = true; - boot.initrd.enable = true; - boot.loader = { - efi.canTouchEfiVariables = true; - systemd-boot = { - enable = true; - windows = { - "nvme0n1p1" = { - title = "Windows"; - efiDeviceHandle = "FS0"; - sortKey = "1"; - }; - }; #end windows - edk2-uefi-shell = { + boot = { + initrd.enable = true; + kernelPackages = pkgs-unstable.linuxPackages_latest; + loader = { + efi.canTouchEfiVariables = true; + systemd-boot = { enable = true; - sortKey = "0"; - }; # end edk2-uefi-shell - }; # end loader.systemd-boot + windows = { + "nvme0n1p1" = { + title = "Windows"; + efiDeviceHandle = "FS0"; + sortKey = "1"; + }; + }; #end windows + edk2-uefi-shell = { + enable = true; + sortKey = "0"; + }; # end edk2-uefi-shell + }; # end systemd-boot + }; # end loader }; # end boot hardware = { graphics.enable = true; @@ -37,7 +40,7 @@ powerManagement.finegrained = false; open = true; nvidiaSettings = true; - package = config.boot.kernelPackages.nvidiaPackages.stable; + package = config.boot.kernelPackages.nvidiaPackages.beta; }; # end nvidia }; # end hardware services = { diff --git a/util/get_upstream_kernel.xsh b/util/get_upstream_kernel.xsh new file mode 100644 index 0000000..a5d3212 --- /dev/null +++ b/util/get_upstream_kernel.xsh @@ -0,0 +1,6 @@ +import json + +jazoon = $(curl -s https://www.kernel.org/releases.json) + +kernel_mainline = json.loads(jazoon)["releases"][0]["version"] +print(kernel_mainline) \ No newline at end of file diff --git a/util/get_xkb.xonsh b/util/get_xkb.xsh similarity index 100% rename from util/get_xkb.xonsh rename to util/get_xkb.xsh