lyes/nixfiles
1
0
Fork 0
Code Issues Pull requests Activity Actions

Switching to Framework 16

Browse source
This commit is contained in:
Lyes Saadi 2025-02-18 00:48:54 +01:00
parent 9b294fd648
commit 365845ea63
No known key found for this signature in database
GPG key ID: AD5FCAF65343CE7E
9 changed files with 153 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

57
flake.lock generated
View file

@ -1,5 +1,25 @@
{ {
"nodes": { "nodes": {
"disko": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1739791827,
"narHash": "sha256-l6ooDEtfzet9qRQxlb5A+H6eY7VPpdiGMwqX0nqD1xM=",
"owner": "nix-community",
"repo": "disko",
"rev": "af4a580628e98302bb922c01e1169ce08d7bee57",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "disko",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -7,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736373539, "lastModified": 1739757849,
"narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -23,11 +43,11 @@
}, },
"nix-flatpak": { "nix-flatpak": {
"locked": { "locked": {
"lastModified": 1734128415, "lastModified": 1739444422,
"narHash": "sha256-HLwdVNxpuTsLlM3tCkpbQU6yCehdgf3kOS1G2SDlkzY=", "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=",
"owner": "gmodena", "owner": "gmodena",
"repo": "nix-flatpak", "repo": "nix-flatpak",
"rev": "8bdc2540da516006d07b04019eb57ae0781a04b3", "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -39,11 +59,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1738471961, "lastModified": 1739798439,
"narHash": "sha256-cgXDFrplNGs7bCVzXhRofjD8oJYqqXGcmUzXjHmip6Y=", "narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "537286c3c59b40311e5418a180b38034661d2536", "rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -55,11 +75,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1738277201, "lastModified": 1739758141,
"narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=", "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554", "rev": "c618e28f70257593de75a7044438efc1c1fc0791",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -71,11 +91,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1738410390, "lastModified": 1739736696,
"narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3a228057f5b619feb3186e986dbe76278d707b6e", "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -103,6 +123,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"disko": "disko",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
@ -116,11 +137,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1738466371, "lastModified": 1739667343,
"narHash": "sha256-JYmciiqozFHCvx1fPo7XRVNrhMxbtN4lr7yJkwO4OvY=", "narHash": "sha256-fNEz+Yd0t9jXz27qKRMAEBradTwYBeBLOECx+ydG25s=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "55bf8e2936758fc026fb5585fa0965822079097a", "rev": "8c7f6ca49f87b4e114f775a4dad956ceb6df4220",
"type": "github" "type": "github"
}, },
"original": { "original": {

14
flake.nix
View file

@ -9,28 +9,32 @@
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nix-flatpak.url = "github:gmodena/nix-flatpak/latest"; nix-flatpak.url = "github:gmodena/nix-flatpak/latest";
zen-browser.url = "github:0xc000022070/zen-browser-flake"; zen-browser.url = "github:0xc000022070/zen-browser-flake";
disko.url = "github:nix-community/disko";
disko.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, nix-flatpak, ... }@attrs: { outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, nix-flatpak, disko, ... }@attrs: {
nixosConfigurations = { nixosConfigurations = {
lyes-pc = nixpkgs.lib.nixosSystem { lyes-pc = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = attrs; specialArgs = attrs;
modules = [ modules = [
./hosts/lyes-pc ./hosts/lyes-pc
./hosts/lyes-pc/disko-config.nix
./users/lyes ./users/lyes
./modules ./modules
./modules/desktop ./modules/desktop
./modules/gaming ./modules/gaming
./modules/nvidia # ./modules/nvidia
./modules/specialisations/old-kernel.nix # ./modules/specialisations/old-kernel.nix
./modules/specialisations/gaming.nix # ./modules/specialisations/gaming.nix
./modules/sway ./modules/sway
nix-flatpak.nixosModules.nix-flatpak nix-flatpak.nixosModules.nix-flatpak
nixos-hardware.nixosModules.lenovo-thinkpad-x1-extreme-gen4 nixos-hardware.nixosModules.framework-16-7040-amd
disko.nixosModules.disko
]; ];
}; };

66
hosts/lyes-pc/default.nix
View file

@ -6,7 +6,10 @@
]; ];
# Networking # Networking
networking.hostName = "lyes-pc"; networking = {
hostName = "lyes-pc";
hostId = "ed183b8f";
};
# Kernel # Kernel
# boot.kernelPackages = pkgs.linuxPackages_latest; # boot.kernelPackages = pkgs.linuxPackages_latest;
@ -14,14 +17,8 @@
# Boot # Boot
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.systemd-boot.configurationLimit = 10; boot.loader.systemd-boot.configurationLimit = 10;
boot.loader.efi.canTouchEfiVariables = true; # boot.loader.efi.canTouchEfiVariables = true;
boot.loader.systemd-boot.extraEntries = { # boot.kernelParams = [ "quiet" ];
"fedora.conf" = ''
title Fedora
efi /EFI/fedora/grubx64.efi
'';
};
boot.kernelParams = [ "quiet" ];
# Reboot Timeout # Reboot Timeout
systemd.extraConfig = '' systemd.extraConfig = ''
@ -31,13 +28,6 @@
# Swap # Swap
zramSwap.enable = true; zramSwap.enable = true;
# Filesystem
fileSystems = {
"/".options = [ "compress=zstd:1" ];
"/home".options = [ "compress=zstd:1" ];
"/nix".options = [ "compress=zstd:1" "noatime" ];
};
# Optimisation # Optimisation
# nixpkgs.hostPlatform = { # nixpkgs.hostPlatform = {
@ -81,28 +71,28 @@
# }; # };
# Disabling failing test # Disabling failing test
nixpkgs.overlays = [ (final: prev: { # nixpkgs.overlays = [ (final: prev: {
# orc = prev.orc.overrideAttrs (_: { doCheck = false; }); # # orc = prev.orc.overrideAttrs (_: { doCheck = false; });
# gsl = prev.gsl.overrideAttrs (_: { doCheck = false; }); # # gsl = prev.gsl.overrideAttrs (_: { doCheck = false; });
fprintd = prev.fprintd.overrideAttrs (super: { # fprintd = prev.fprintd.overrideAttrs (super: {
# doCheck = false; # # doCheck = false;
# buildInputs = super.buildInputs or [ ] ++ (with pkgs; [ libpam-wrapper (pkgs.python3.withPackages (python-pkgs: [ python-pkgs.pycairo python-pkgs.dbus-python python-pkgs.python-dbusmock ])) ]); # # buildInputs = super.buildInputs or [ ] ++ (with pkgs; [ libpam-wrapper (pkgs.python3.withPackages (python-pkgs: [ python-pkgs.pycairo python-pkgs.dbus-python python-pkgs.python-dbusmock ])) ]);
mesonCheckFlags = [ # mesonCheckFlags = [
# PAM related checks are timing out # # PAM related checks are timing out
"--no-suite" "fprintd" # "--no-suite" "fprintd"
]; # ];
}); # });
libsrtp = prev.libsrtp.overrideAttrs (_: { # libsrtp = prev.libsrtp.overrideAttrs (_: {
mesonFlags = [ # mesonFlags = [
"-Dcrypto-library=openssl" # "-Dcrypto-library=openssl"
"-Dcrypto-library-kdf=disabled" # "-Dcrypto-library-kdf=disabled"
"-Ddoc=disabled" # "-Ddoc=disabled"
"-Dtests=disabled" # "-Dtests=disabled"
]; # ];
}); # });
# # haskellPackages.crypton = pkgs.haskell.lib.overrideCabal prev.crypton (_: { doCheck = false; }); # # # haskellPackages.crypton = pkgs.haskell.lib.overrideCabal prev.crypton (_: { doCheck = false; });
# # haskellPackages.cryptonite = pkgs.haskell.lib.overrideCabal prev.cryptonite (_: { doCheck = false; }); # # # haskellPackages.cryptonite = pkgs.haskell.lib.overrideCabal prev.cryptonite (_: { doCheck = false; });
}) ]; # }) ];
# nixpkgs.config.packageOverrides = pkgs: { # nixpkgs.config.packageOverrides = pkgs: {
# haskellPackages = pkgs.haskellPackages.override { # haskellPackages = pkgs.haskellPackages.override {

71
hosts/lyes-pc/disko-config.nix Normal file
View file

@ -0,0 +1,71 @@
{ disks ? [ "/dev/nvme0n1" ], ... }: {
disko.devices = {
disk = {
main = {
type = "disk";
device = builtins.elemAt disks 0;
content = {
type = "gpt";
partitions = {
ESP = {
size = "1G";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [ "nofail" ];
};
};
zfs = {
size = "100%";
content = {
type = "zfs";
pool = "zroot";
};
};
};
};
};
};
zpool = {
zroot = {
type = "zpool";
rootFsOptions = {
mountpoint = "none";
compression = "zstd";
acltype = "posixacl";
xattr = "sa";
"com.sun:auto-snapshot" = "false";
};
options.ashift = "12";
datasets = {
"root" = {
type = "zfs_fs";
options = {
encryption = "aes-256-gcm";
keyformat = "passphrase";
keylocation = "prompt";
};
mountpoint = "/";
};
"root/home" = {
type = "zfs_fs";
options."com.sun:auto-snapshot" = "true";
mountpoint = "/home";
};
"root/var" = {
type = "zfs_fs";
mountpoint = "/var";
};
"root/nix" = {
type = "zfs_fs";
options.mountpoint = "/nix";
mountpoint = "/nix";
};
};
};
};
};
}

37
hosts/lyes-pc/hardware-configuration.nix
View file

@ -8,47 +8,18 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/2a1aab81-a8df-4781-8946-f00ac1d48db7";
fsType = "btrfs";
options = [ "subvol=nixos_root" ];
};
boot.initrd.luks.devices."luks-8d74423e-0529-46e3-87b9-b948c568a6c3".device = "/dev/disk/by-uuid/8d74423e-0529-46e3-87b9-b948c568a6c3";
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/2a1aab81-a8df-4781-8946-f00ac1d48db7";
fsType = "btrfs";
options = [ "subvol=home" ];
};
fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/2a1aab81-a8df-4781-8946-f00ac1d48db7";
fsType = "btrfs";
options = [ "subvol=nixos_nix" ];
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/94CB-9035";
fsType = "vfat";
};
swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction # still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp9s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
# high-resolution display
} }

2
modules/desktop/packages.nix
View file

@ -99,7 +99,7 @@ in {
git git
git-lfs git-lfs
vscode vscode
unstable.zed-editor # zed-editor
gcc gcc
rustup rustup
python3 python3

3
modules/sway/default.nix
View file

@ -13,9 +13,6 @@ in
base = true; base = true;
gtk = true; gtk = true;
}; };
extraOptions = [
"--unsupported-gpu"
];
extraSessionCommands = '' extraSessionCommands = ''
# SDL: # SDL:
export SDL_VIDEODRIVER=wayland export SDL_VIDEODRIVER=wayland

2
users/lyes/home.nix
View file

@ -7,7 +7,7 @@
userName = "Lyes Saadi"; userName = "Lyes Saadi";
userEmail = "dev@lyes.eu"; userEmail = "dev@lyes.eu";
signing = { signing = {
key = "17418538BAA17767"; key = "AD5FCAF65343CE7E";
signByDefault = true; signByDefault = true;
}; };
extraConfig = { extraConfig = {

16
users/lyes/packages.nix
View file

@ -7,21 +7,5 @@
starship starship
wl-clipboard wl-clipboard
sl sl
# Programming
git
git-lfs
vscode
unstable.zed-editor
gcc
rustup
python3
ocaml
ocamlPackages.ocaml-lsp
ocamlPackages.ocamlformat
opam
ledit
nodejs
nil
]; ];
} }