diff --git a/flake.lock b/flake.lock index fddc66a..d55da37 100644 --- a/flake.lock +++ b/flake.lock @@ -274,22 +274,6 @@ } }, "nixpkgs-stable": { - "locked": { - "lastModified": 1696039360, - "narHash": "sha256-g7nIUV4uq1TOVeVIDEZLb005suTWCUjSY0zYOlSBsyE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "32dcb45f66c0487e92db8303a798ebc548cadedc", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { "locked": { "lastModified": 1694908564, "narHash": "sha256-ducA98AuWWJu5oUElIzN24Q22WlO8bOfixGzBgzYdVc=", @@ -440,7 +424,6 @@ "helix": "helix", "home-manager": "home-manager", "hyprland": "hyprland", - "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix", "ssbm": "ssbm" @@ -490,7 +473,7 @@ "sops-nix": { "inputs": { "nixpkgs": "nixpkgs_6", - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { "lastModified": 1695284550, diff --git a/flake.nix b/flake.nix index 942db43..dd0f6aa 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,5 @@ { inputs = { - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager.url = "github:nix-community/home-manager/master"; helix.url = "github:helix-editor/helix/75c0a5ceb32d8a503915a93ccc1b64c8ad1cba8b"; @@ -21,7 +20,6 @@ outputs = { self, - nixpkgs-stable, nixpkgs-unstable, home-manager, ... @@ -36,7 +34,7 @@ "x86_64-darwin" ]; - forAllSystems = nixpkgs-stable.lib.genAttrs systems; + forAllSystems = nixpkgs-unstable.lib.genAttrs systems; color-schemes = (import ./lib/colors.nix inputs).schemes; colors = color-schemes.catppuccin-mocha-sapphire; diff --git a/modules/home-manager/foxtrot.nix b/modules/home-manager/foxtrot.nix index e32aa73..0e41629 100644 --- a/modules/home-manager/foxtrot.nix +++ b/modules/home-manager/foxtrot.nix @@ -3,4 +3,15 @@ sway sway-laptop ]; + + wayland.windowManager.sway = { + config = { + output = { + "BOE 0x0BCA Unknown" = { + mode = "2256x1504@60Hz"; + scale = "1.25"; + }; + }; + }; + }; } diff --git a/nixos/foxtrot/default.nix b/nixos/foxtrot/default.nix index 5299257..297bbc0 100644 --- a/nixos/foxtrot/default.nix +++ b/nixos/foxtrot/default.nix @@ -25,6 +25,8 @@ inputs.hardware.nixosModules.common-pc-laptop-ssd ]; + nixpkgs.overlays = [outputs.overlays.modifications]; + # TODO: hibernation? does sleep suffice? # TODO: perform a hardware scan @@ -34,13 +36,28 @@ systemd-boot.enable = true; }; # kernelParams = ["boot.shell_on_fail"]; - kernelPackages = pkgs.linuxPackages_latest; initrd.availableKernelModules = ["xhci_pci" "nvme" "ahci"]; }; hardware.bluetooth.enable = true; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; services.printing.enable = true; + boot.supportedFilesystems = + pkgs.lib.mkForce ["btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs"]; + + boot.kernelPackages = pkgs.linuxPackagesFor ( + pkgs.linux_6_5.override { + argsOverride = { + src = pkgs.fetchurl { + url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.5.7.tar.xz"; + sha256 = "sha256-DQnqRIAFyc/lOD5Mcqhys5GIuSj4xE4UawOxt4Ufu4w="; + }; + version = "6.5.7"; + modDirVersion = "6.5.7"; + }; + } + ); + networking = { firewall = { enable = true; diff --git a/overlays/default.nix b/overlays/default.nix index af56138..23f8d20 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -6,9 +6,16 @@ # You can change versions, add patches, set compilation flags, anything really. # https://nixos.wiki/wiki/Overlays modifications = final: prev: { - # example = prev.example.overrideAttrs (oldAttrs: rec { - # ... - # }); + final = { + linux_6_5 = { + patches = []; + kernelPatches = []; + }; + }; + linux_6_5 = prev.linux_6_5.override { + patches = []; + kernelPatches = []; + }; }; # When applied, the unstable nixpkgs set (declared in the flake inputs) will