From 34aefaa867755fbafb15f9b06a605b3a877595e2 Mon Sep 17 00:00:00 2001 From: lucy Date: Fri, 24 Jul 2026 21:56:40 +0200 Subject: [PATCH] create hw configs folder and remove iosevka --- configuration.nix | 37 ----------------- flake.lock | 92 ++++++++++++++++++++++--------------------- flake.nix | 1 + hw-configs/laptop.nix | 33 ++++++++++++++++ stylix.nix | 3 +- 5 files changed, 83 insertions(+), 83 deletions(-) create mode 100644 hw-configs/laptop.nix diff --git a/configuration.nix b/configuration.nix index 9cd1fc6..531818e 100644 --- a/configuration.nix +++ b/configuration.nix @@ -7,7 +7,6 @@ imports = [ ./stylix.nix ./nixvim/nixvim.nix - /etc/nixos/hardware-configuration.nix ]; boot.loader.systemd-boot = { @@ -116,42 +115,6 @@ noto-fonts noto-fonts-cjk-sans noto-fonts-color-emoji - (iosevka.override { - set = "Custom"; - privateBuildPlan = '' - [buildPlans.IosevkaCustom] - family = "Iosevka Custom" - spacing = "fontconfig-mono" - serifs = "slab" - noCvSs = true - exportGlyphNames = false - - [buildPlans.IosevkaCustom.variants] - inherits = "ss12" - - [buildPlans.IosevkaCustom.weights.Regular] - shape = 400 - menu = 400 - css = 400 - - [buildPlans.IosevkaCustom.weights.Bold] - shape = 700 - menu = 700 - css = 700 - - [buildPlans.IosevkaCustom.slopes.Upright] - angle = 0 - shape = "upright" - menu = "upright" - css = "normal" - - [buildPlans.IosevkaCustom.slopes.Italic] - angle = 9.4 - shape = "italic" - menu = "italic" - css = "italic" - ''; - }) nerd-fonts.symbols-only ]; users.users."lucy" = { diff --git a/flake.lock b/flake.lock index c9e272e..dcc6199 100644 --- a/flake.lock +++ b/flake.lock @@ -86,11 +86,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1779670703, - "narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=", + "lastModified": 1782007937, + "narHash": "sha256-PbnJr+eB+9Czol3ReI83dUgEhcn0sDK6TSy6ODTQm88=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9", + "rev": "981bd332015397fb1ca033fa982bd61635160c78", "type": "github" }, "original": { @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -230,18 +230,20 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1767737596, - "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", + "host": "gitlab.gnome.org", + "lastModified": 1776175984, + "narHash": "sha256-RJFlFW8GiMei6oqUGrMkGEvVqOH8U7Q8abc1yK4VKD8=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "github" + "rev": "e0fdc4c13250e9a9b8ea9594c83925274f4a5dca", + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", + "ref": "50.1", "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "github" + "type": "gitlab" } }, "home-manager": { @@ -251,11 +253,11 @@ ] }, "locked": { - "lastModified": 1784588016, - "narHash": "sha256-ouZe80aWEhMLVMkqICFDN+JUw+0FJtCr/bh+hHtRtMg=", + "lastModified": 1784913159, + "narHash": "sha256-JWq0BfjO4ktpH5USfQNQzdvHpIDT8fSKD5K7LvdMRFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "deeb6b7eb7e0c44ae1819c051ce175bd92a85100", + "rev": "079a3b5d1aa6a719920a51316253b7d6dd22738d", "type": "github" }, "original": { @@ -318,11 +320,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1784664390, - "narHash": "sha256-4BmnQXaymwv0Hp6abCyJ4FA6lhv/MJqACgiWx5Wg5MQ=", + "lastModified": 1784915044, + "narHash": "sha256-i/1GB/YbjXWYbSdh+nh/wCvvCU78mMkfuPmCNRAbJZE=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "61b997cc4fdea60a53213bb66298bfcdb408dcfc", + "rev": "f8de57863e0a4aad7e64c1ad00d56d5f925b9bf1", "type": "github" }, "original": { @@ -333,11 +335,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1784555310, - "narHash": "sha256-/FCliTPgiuV1owejZFNx3Ch9irdvkOfOFl+HHZ+DrtM=", + "lastModified": 1784783405, + "narHash": "sha256-4IHyyLgLBdKefkljdKod4IMn023pQiDXAWJA187cmdY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "421eebfd0ec7bccd4abe826ce62d7e6e83129493", + "rev": "7525d999cd850b9a488817abc89c75dc733acf17", "type": "github" }, "original": { @@ -364,11 +366,11 @@ }, "nixpkgs-nixcord": { "locked": { - "lastModified": 1784160687, - "narHash": "sha256-iYL/bixrb6FlHFu/gIuBYzq6c6lM5AAXsXNSWXtIgQc=", + "lastModified": 1784432872, + "narHash": "sha256-n3gKTBIV4ZA5VQpUakffBe3KGu4+mhPoA34rrqS0GkA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4382ed2b7a6839d4280a9b386db49cbc5907414d", + "rev": "fd1462031fdee08f65fd0b4c6b64e22239a77870", "type": "github" }, "original": { @@ -380,11 +382,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1783915482, - "narHash": "sha256-FmieJB8/OUvNxbkboi7+IGfIuSXY3nF/hZQm8kD0r50=", + "lastModified": 1784555310, + "narHash": "sha256-/FCliTPgiuV1owejZFNx3Ch9irdvkOfOFl+HHZ+DrtM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6cdc7fc76e8bf7fde9fa43a849fcaaa70e230dee", + "rev": "421eebfd0ec7bccd4abe826ce62d7e6e83129493", "type": "github" }, "original": { @@ -401,11 +403,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1784057377, - "narHash": "sha256-yycNej5//EsRbV10moBoh+/63vXEwZD1ZFEiRm6C9rQ=", + "lastModified": 1784814601, + "narHash": "sha256-T32JXjZ7kIbhBn8/Har171yGg6IBdl97cxAWameqZDE=", "owner": "nix-community", "repo": "nixvim", - "rev": "07180a087e4a00720dc0731cbcd8dec796974381", + "rev": "f316e949e0ed9df0e1e0bf645c6dce721d4e230e", "type": "github" }, "original": { @@ -426,11 +428,11 @@ ] }, "locked": { - "lastModified": 1780281641, - "narHash": "sha256-M/+hUKoKbHXpV0xGVfELbN1Ds1aoe3pL5p5/t46YhVo=", + "lastModified": 1783439237, + "narHash": "sha256-WUr8JF2v3n4Y30E5dxv4sAgNJXpVDBoCQNoQ/V4+n4o=", "owner": "nix-community", "repo": "NUR", - "rev": "30f9ae2f04174de63ba8bcf3580ca90843b28a01", + "rev": "b70bb66c7bcd162642f3a609bc16843c7059f503", "type": "github" }, "original": { @@ -514,11 +516,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1784059683, - "narHash": "sha256-q5MZrmKlg9A4ORx3EQcr7qkuidMU1gVZ+xJ3nCK+xgc=", + "lastModified": 1784676123, + "narHash": "sha256-ndyanKzw90yX2nUVFmTuYqXidUNymtMfgmIHyNdhht0=", "owner": "nix-community", "repo": "stylix", - "rev": "c8ccc31f3ea29dc3eb5b54945e5eb549529491d6", + "rev": "66714e5ce44269ecc58c20d9196da8dbe1b27a31", "type": "github" }, "original": { @@ -577,11 +579,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1777806186, - "narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=", + "lastModified": 1781968807, + "narHash": "sha256-yYO3Vw2M0y3TAUqt+9+Mj0zwP3XDTF5/PXcPhhFQ1ZM=", "owner": "tinted-theming", "repo": "schemes", - "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795", + "rev": "2ccef2f4b22e3cab5a9292811f7133a07eeba4a7", "type": "github" }, "original": { @@ -593,11 +595,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1778379944, - "narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=", + "lastModified": 1782012462, + "narHash": "sha256-2iDiD8DQLwS1lGuD9TS8WlvNyDoTs6krWntJbtB2zGo=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "fe0203a198690e71a5ff11e08812a4673de3678d", + "rev": "8c4e750f738a742bd73377ee41d3dadedebedef4", "type": "github" }, "original": { @@ -609,11 +611,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1778378178, - "narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=", + "lastModified": 1782009766, + "narHash": "sha256-VUhBjpGvWqHI7rWeyMYb/u87YJSXHKfVV6S+IelWeO8=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "9cd816033ff969415b190722cddf134e78a5665f", + "rev": "5e8350bcd354e3241ab681a265fa6ef060c40be1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8b7226f..91868ca 100644 --- a/flake.nix +++ b/flake.nix @@ -45,6 +45,7 @@ ./easyroam.nix ./configuration.nix ./nixvim/nixvim.nix + ./hw-configs/laptop.nix nix-easyroam.nixosModules.nix-easyroam stylix.nixosModules.stylix nixvim.nixosModules.nixvim diff --git a/hw-configs/laptop.nix b/hw-configs/laptop.nix new file mode 100644 index 0000000..31e056d --- /dev/null +++ b/hw-configs/laptop.nix @@ -0,0 +1,33 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/751981d7-36b5-4759-b0eb-7db70b5d7b8c"; + fsType = "xfs"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/65BD-721E"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/889d88f6-0a64-482a-88e1-7a091a019373"; } + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/stylix.nix b/stylix.nix index 879a77d..335295c 100644 --- a/stylix.nix +++ b/stylix.nix @@ -52,7 +52,8 @@ name = config.stylix.fonts.monospace.name; }; monospace = { - name = "Iosevka Custom"; + name = "Maple Mono"; + package = pkgs.maple-mono.truetype; }; emoji = {