The fox is trotting

This commit is contained in:
Daniel Flanagan 2023-10-17 23:37:05 -05:00
parent 28de029076
commit fa9478a427
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
5 changed files with 41 additions and 25 deletions

View file

@ -274,22 +274,6 @@
} }
}, },
"nixpkgs-stable": { "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": { "locked": {
"lastModified": 1694908564, "lastModified": 1694908564,
"narHash": "sha256-ducA98AuWWJu5oUElIzN24Q22WlO8bOfixGzBgzYdVc=", "narHash": "sha256-ducA98AuWWJu5oUElIzN24Q22WlO8bOfixGzBgzYdVc=",
@ -440,7 +424,6 @@
"helix": "helix", "helix": "helix",
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"ssbm": "ssbm" "ssbm": "ssbm"
@ -490,7 +473,7 @@
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_6",
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1695284550, "lastModified": 1695284550,

View file

@ -1,6 +1,5 @@
{ {
inputs = { inputs = {
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager/master"; home-manager.url = "github:nix-community/home-manager/master";
helix.url = "github:helix-editor/helix/75c0a5ceb32d8a503915a93ccc1b64c8ad1cba8b"; helix.url = "github:helix-editor/helix/75c0a5ceb32d8a503915a93ccc1b64c8ad1cba8b";
@ -21,7 +20,6 @@
outputs = { outputs = {
self, self,
nixpkgs-stable,
nixpkgs-unstable, nixpkgs-unstable,
home-manager, home-manager,
... ...
@ -36,7 +34,7 @@
"x86_64-darwin" "x86_64-darwin"
]; ];
forAllSystems = nixpkgs-stable.lib.genAttrs systems; forAllSystems = nixpkgs-unstable.lib.genAttrs systems;
color-schemes = (import ./lib/colors.nix inputs).schemes; color-schemes = (import ./lib/colors.nix inputs).schemes;
colors = color-schemes.catppuccin-mocha-sapphire; colors = color-schemes.catppuccin-mocha-sapphire;

View file

@ -3,4 +3,15 @@
sway sway
sway-laptop sway-laptop
]; ];
wayland.windowManager.sway = {
config = {
output = {
"BOE 0x0BCA Unknown" = {
mode = "2256x1504@60Hz";
scale = "1.25";
};
};
};
};
} }

View file

@ -25,6 +25,8 @@
inputs.hardware.nixosModules.common-pc-laptop-ssd inputs.hardware.nixosModules.common-pc-laptop-ssd
]; ];
nixpkgs.overlays = [outputs.overlays.modifications];
# TODO: hibernation? does sleep suffice? # TODO: hibernation? does sleep suffice?
# TODO: perform a hardware scan # TODO: perform a hardware scan
@ -34,13 +36,28 @@
systemd-boot.enable = true; systemd-boot.enable = true;
}; };
# kernelParams = ["boot.shell_on_fail"]; # kernelParams = ["boot.shell_on_fail"];
kernelPackages = pkgs.linuxPackages_latest;
initrd.availableKernelModules = ["xhci_pci" "nvme" "ahci"]; initrd.availableKernelModules = ["xhci_pci" "nvme" "ahci"];
}; };
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
services.printing.enable = true; 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 = { networking = {
firewall = { firewall = {
enable = true; enable = true;

View file

@ -6,9 +6,16 @@
# You can change versions, add patches, set compilation flags, anything really. # You can change versions, add patches, set compilation flags, anything really.
# https://nixos.wiki/wiki/Overlays # https://nixos.wiki/wiki/Overlays
modifications = final: prev: { 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 # When applied, the unstable nixpkgs set (declared in the flake inputs) will