From 86ecc40a8158348b16d7e704638e220c1b804335 Mon Sep 17 00:00:00 2001 From: Skullheadx Date: Sat, 13 Jun 2026 22:59:45 -0400 Subject: [PATCH] use fira code nerf font --- flake.lock | 78 +++++++++++++++++++++--------------------- flake.nix | 89 +++++++++++++++++++++++------------------------- linux-common.nix | 25 ++++++++++++-- 3 files changed, 104 insertions(+), 88 deletions(-) diff --git a/flake.lock b/flake.lock index 41d3041..a3fd1ff 100644 --- a/flake.lock +++ b/flake.lock @@ -80,17 +80,17 @@ ] }, "locked": { - "lastModified": 1777640804, - "narHash": "sha256-B2cgtaXJ1I9TZEudkKVUJXceWLUPwSTxvnKGd6wBDqE=", - "owner": "Skullheadx", - "repo": "dmenu", - "rev": "b0703d2fea4db925c06a7e7205d9d078ed258cb5", - "type": "github" + "lastModified": 1781402344, + "narHash": "sha256-vhY6GC5xLZtx0tdJendPRq72LrsBYJcEJ7zrc4MYOHw=", + "ref": "refs/heads/master", + "rev": "91e229306f4e847fa70d1d004b48c24723a8bfb6", + "revCount": 629, + "type": "git", + "url": "git://git.skullheadx.com/dmenu.git" }, "original": { - "owner": "Skullheadx", - "repo": "dmenu", - "type": "github" + "type": "git", + "url": "git://git.skullheadx.com/dmenu.git" } }, "my-dwm": { @@ -100,17 +100,17 @@ ] }, "locked": { - "lastModified": 1777645065, - "narHash": "sha256-4BsyPY7OvKn6k4VdlSv1WZRT9hY+yIG6utMbGj7I8E0=", - "owner": "Skullheadx", - "repo": "dwm", - "rev": "cac4d17833bbc027bbeb2b3a7f62e74f6be29e55", - "type": "github" + "lastModified": 1781402267, + "narHash": "sha256-hAr/RzrOHXhavNUrpGCkHsnDDdy7eiNY9tMo5kVg7a8=", + "ref": "refs/heads/master", + "rev": "06e55b0ac5b05f7d50af0bc95e3ab60be1b7892c", + "revCount": 1746, + "type": "git", + "url": "git://git.skullheadx.com/dwm.git" }, "original": { - "owner": "Skullheadx", - "repo": "dwm", - "type": "github" + "type": "git", + "url": "git://git.skullheadx.com/dwm.git" } }, "my-slstatus": { @@ -122,15 +122,15 @@ "locked": { "lastModified": 1777653948, "narHash": "sha256-oJ4BGbTjsaD39xcI9V9ICsKz9oCRHpsxqxL4ZL8NJjw=", - "owner": "Skullheadx", - "repo": "slstatus", + "ref": "refs/heads/master", "rev": "07e311ed5966079fbff18da4089279a77b60831b", - "type": "github" + "revCount": 624, + "type": "git", + "url": "git://git.skullheadx.com/slstatus.git" }, "original": { - "owner": "Skullheadx", - "repo": "slstatus", - "type": "github" + "type": "git", + "url": "git://git.skullheadx.com/slstatus.git" } }, "my-st": { @@ -140,17 +140,17 @@ ] }, "locked": { - "lastModified": 1777451110, - "narHash": "sha256-FpsWzl+IhHxCU5nKOP15uivszsG9/tOC9mSnVjh9mw8=", - "owner": "Skullheadx", - "repo": "st", - "rev": "2209942d9b31a35ceb1f7fb9d76ad4753c0beeac", - "type": "github" + "lastModified": 1781403572, + "narHash": "sha256-ffX9W4Aouilh+bErk3A31rEJWq88caP+ddR0JYzfDMM=", + "ref": "refs/heads/master", + "rev": "152d350c2e341ba7960da2117372af62426bfb24", + "revCount": 1192, + "type": "git", + "url": "git://git.skullheadx.com/st.git" }, "original": { - "owner": "Skullheadx", - "repo": "st", - "type": "github" + "type": "git", + "url": "git://git.skullheadx.com/st.git" } }, "my-surf": { @@ -162,15 +162,15 @@ "locked": { "lastModified": 1777933639, "narHash": "sha256-BMZmBTKFy8iab051rmXBHUZcfaav/c4GR9rpgdCR6XM=", - "owner": "Skullheadx", - "repo": "surf", + "ref": "refs/heads/surf-webkit2", "rev": "a9203494a3895f95a0207dabf7c587e60dab45c8", - "type": "github" + "revCount": 620, + "type": "git", + "url": "git://git.skullheadx.com/surf.git" }, "original": { - "owner": "Skullheadx", - "repo": "surf", - "type": "github" + "type": "git", + "url": "git://git.skullheadx.com/surf.git" } }, "ndg": { diff --git a/flake.nix b/flake.nix index 2afe7ca..9d42340 100644 --- a/flake.nix +++ b/flake.nix @@ -9,27 +9,27 @@ }; my-slstatus = { - url = "github:Skullheadx/slstatus"; + url = "git://git.skullheadx.com/slstatus.git"; inputs.nixpkgs.follows = "nixpkgs"; }; my-surf = { - url = "github:Skullheadx/surf"; + url = "git://git.skullheadx.com/surf.git"; inputs.nixpkgs.follows = "nixpkgs"; }; my-dwm = { - url = "github:Skullheadx/dwm"; + url = "git://git.skullheadx.com/dwm.git"; inputs.nixpkgs.follows = "nixpkgs"; }; my-st = { - url = "github:Skullheadx/st"; + url = "git://git.skullheadx.com/st.git"; inputs.nixpkgs.follows = "nixpkgs"; }; my-dmenu = { - url = "github:Skullheadx/dmenu"; + url = "git://git.skullheadx.com/dmenu.git"; inputs.nixpkgs.follows = "nixpkgs"; }; nvf = { @@ -37,46 +37,43 @@ inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = - { - self, - nixpkgs, - hjem, - my-slstatus, - my-surf, - my-dwm, - my-st, - my-dmenu, - nvf, - }@inputs: - let - system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; - customNeovim = nvf.lib.neovimConfiguration { - inherit pkgs; - modules = [ ./nvf/nvf.nix ]; - }; - in - { - nixosConfigurations.nepsis = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs customNeovim; }; - modules = [ - hjem.nixosModules.default - ./linux-common.nix - ./hosts/nepsis/configuration.nix - ./overlays.nix - ]; - }; - nixosConfigurations.icon = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs customNeovim; }; - modules = [ - hjem.nixosModules.default - ./linux-common.nix - ./hosts/icon/configuration.nix - ./overlays.nix - ]; - }; - - packages.${system}.my-neovim = customNeovim.neovim; + outputs = { + self, + nixpkgs, + hjem, + my-slstatus, + my-surf, + my-dwm, + my-st, + my-dmenu, + nvf, + } @ inputs: let + system = "x86_64-linux"; + pkgs = nixpkgs.legacyPackages.${system}; + customNeovim = nvf.lib.neovimConfiguration { + inherit pkgs; + modules = [./nvf/nvf.nix]; + }; + in { + nixosConfigurations.nepsis = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs customNeovim;}; + modules = [ + hjem.nixosModules.default + ./linux-common.nix + ./hosts/nepsis/configuration.nix + ./overlays.nix + ]; + }; + nixosConfigurations.icon = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs customNeovim;}; + modules = [ + hjem.nixosModules.default + ./linux-common.nix + ./hosts/icon/configuration.nix + ./overlays.nix + ]; }; + + packages.${system}.my-neovim = customNeovim.neovim; + }; } diff --git a/linux-common.nix b/linux-common.nix index 27e4464..5148a96 100644 --- a/linux-common.nix +++ b/linux-common.nix @@ -3,8 +3,7 @@ pkgs, inputs, ... -}: -{ +}: { imports = [ ./sh.nix ]; @@ -12,7 +11,7 @@ # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - boot.supportedFilesystems = [ "exfat" ]; + boot.supportedFilesystems = ["exfat"]; # Use latest kernel. boot.kernelPackages = pkgs.linuxPackages_latest; @@ -45,6 +44,26 @@ gcc ]; + fonts = { + fontDir.enable = true; + fontconfig = { + enable = true; + defaultFonts = { + monospace = ["Fira Code Nerd Font"]; + sansSerif = ["Fira Sans"]; + }; + hinting = { + autohint = false; + enable = true; + style = "slight"; + }; + }; + packages = with pkgs; [ + fira-code + nerd-fonts.fira-code + ]; + }; + programs.git = { enable = true; config = { -- 2.54.0