Compare commits
3 commits
e7be048163
...
5f61631957
Author | SHA1 | Date | |
---|---|---|---|
Natsu Kagami | 5f61631957 | ||
Natsu Kagami | 54264260ed | ||
Natsu Kagami | 15a74c324f |
16
flake.lock
16
flake.lock
|
@ -852,6 +852,21 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1718806950,
|
||||
"narHash": "sha256-E+W/kbedZAiOuPtT+KQRposLaXGDLd7lyK7oL3IH/5U=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "acb4f0e9bfa8ca2d6fca5e692307b5c994e7dbda",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-m1": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_6",
|
||||
|
@ -1195,6 +1210,7 @@
|
|||
"lanzaboote": "lanzaboote",
|
||||
"mpd-mpris": "mpd-mpris",
|
||||
"nix-gaming": "nix-gaming",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixos-m1": "nixos-m1",
|
||||
"nixpkgs": "nixpkgs_9",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||
nixos-hardware.url = "github:nixos/nixos-hardware";
|
||||
darwin.url = "github:lnl7/nix-darwin/master";
|
||||
darwin.inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||
home-manager.url = "github:nix-community/home-manager/release-24.05";
|
||||
|
@ -168,6 +169,7 @@
|
|||
modules = [
|
||||
(common-nixos nixpkgs)
|
||||
inputs.lanzaboote.nixosModules.lanzaboote
|
||||
inputs.nixos-hardware.nixosModules.framework-13-7040-amd
|
||||
({ ... }: {
|
||||
# Sets up secure boot
|
||||
boot.loader.systemd-boot.enable = lib.mkForce false;
|
||||
|
|
|
@ -93,6 +93,18 @@ with lib;
|
|||
## Hints
|
||||
"${cfg.cmd}+shift+p>n" = "kitten hints --type=linenum --linenum-action=tab kak {path} +{line}";
|
||||
};
|
||||
|
||||
extraConfig =
|
||||
let
|
||||
# Nerd Fonts glyph map
|
||||
glyphMap = pkgs.fetchurl {
|
||||
url = "https://raw.githubusercontent.com/Sharparam/dotfiles/main/kitty/.config/kitty/font-nerd-symbols.conf";
|
||||
hash = "sha256-1OaDWLC3y8ASD2ttRWWgPEpRnfKXu6H6vS3cFVpzT0o=";
|
||||
};
|
||||
in
|
||||
''
|
||||
include ${glyphMap}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ with lib;
|
|||
imports = [ ./mounting.nix ];
|
||||
# Fonts
|
||||
config.fonts = {
|
||||
packages = with pkgs; [
|
||||
packages = with pkgs; mkForce [
|
||||
noto-fonts-emoji-blob-bin
|
||||
ibm-plex
|
||||
(nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
|
||||
|
@ -22,7 +22,7 @@ with lib;
|
|||
emoji = lib.mkBefore [ "Blobmoji" ];
|
||||
serif = lib.mkBefore [ "IBM Plex Serif" "IBM Plex Sans JP" "IBM Plex Sans KR" "Blobmoji" ];
|
||||
sansSerif = lib.mkBefore [ "IBM Plex Sans" "IBM Plex Sans JP" "IBM Plex Sans KR" "Blobmoji" ];
|
||||
monospace = lib.mkBefore [ "IBM Plex Mono" "Font Awesome 6 Free" "Blobmoji" "IBM Plex Sans JP" ];
|
||||
monospace = lib.mkBefore [ "IBM Plex Mono" "Font Awesome 6 Free" "Symbols Nerd Font" "Blobmoji" "IBM Plex Sans JP" ];
|
||||
};
|
||||
localConf = ''
|
||||
<?xml version="1.0"?>
|
||||
|
|
17
overlay.nix
17
overlay.nix
|
@ -59,6 +59,15 @@ let
|
|||
# patches in the original package was already applied
|
||||
];
|
||||
});
|
||||
|
||||
swayfx-unwrapped = prev.swayfx-unwrapped.overrideAttrs (attrs: {
|
||||
patches = (attrs.patches or [ ]) ++ [
|
||||
(final.fetchurl {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/WillPower3309/swayfx/pull/315.patch";
|
||||
hash = "sha256-zamOLHUjlzRs8PytPTAzEsdzgVtK+HVziHgrhwPcB+E=";
|
||||
})
|
||||
];
|
||||
});
|
||||
};
|
||||
|
||||
overlay-libs = final: prev: {
|
||||
|
@ -100,6 +109,10 @@ let
|
|||
overlay-asahi = inputs.nixos-m1.overlays.default;
|
||||
in
|
||||
[
|
||||
inputs.swayfx.overlays.default
|
||||
inputs.mpd-mpris.overlays.default
|
||||
inputs.youmubot.overlays.default
|
||||
|
||||
(import ./overlays/openrazer)
|
||||
overlay-unstable
|
||||
overlay-needs-unstable
|
||||
|
@ -113,10 +126,6 @@ in
|
|||
|
||||
(import ./packages/common)
|
||||
|
||||
inputs.mpd-mpris.overlays.default
|
||||
inputs.swayfx.overlays.default
|
||||
inputs.youmubot.overlays.default
|
||||
|
||||
# Bug fixes
|
||||
] # we assign the overlay created before to the overlays of nixpkgs.
|
||||
|
||||
|
|
Loading…
Reference in a new issue