Compare commits

..

3 commits

5 changed files with 45 additions and 6 deletions

View file

@ -852,6 +852,21 @@
"type": "github" "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": { "nixos-m1": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_6", "flake-compat": "flake-compat_6",
@ -1195,6 +1210,7 @@
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"mpd-mpris": "mpd-mpris", "mpd-mpris": "mpd-mpris",
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nixos-hardware": "nixos-hardware",
"nixos-m1": "nixos-m1", "nixos-m1": "nixos-m1",
"nixpkgs": "nixpkgs_9", "nixpkgs": "nixpkgs_9",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",

View file

@ -4,6 +4,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nixos-hardware.url = "github:nixos/nixos-hardware";
darwin.url = "github:lnl7/nix-darwin/master"; darwin.url = "github:lnl7/nix-darwin/master";
darwin.inputs.nixpkgs.follows = "nixpkgs-unstable"; darwin.inputs.nixpkgs.follows = "nixpkgs-unstable";
home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.url = "github:nix-community/home-manager/release-24.05";
@ -168,6 +169,7 @@
modules = [ modules = [
(common-nixos nixpkgs) (common-nixos nixpkgs)
inputs.lanzaboote.nixosModules.lanzaboote inputs.lanzaboote.nixosModules.lanzaboote
inputs.nixos-hardware.nixosModules.framework-13-7040-amd
({ ... }: { ({ ... }: {
# Sets up secure boot # Sets up secure boot
boot.loader.systemd-boot.enable = lib.mkForce false; boot.loader.systemd-boot.enable = lib.mkForce false;

View file

@ -93,6 +93,18 @@ with lib;
## Hints ## Hints
"${cfg.cmd}+shift+p>n" = "kitten hints --type=linenum --linenum-action=tab kak {path} +{line}"; "${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}
'';
}; };
} }

View file

@ -5,7 +5,7 @@ with lib;
imports = [ ./mounting.nix ]; imports = [ ./mounting.nix ];
# Fonts # Fonts
config.fonts = { config.fonts = {
packages = with pkgs; [ packages = with pkgs; mkForce [
noto-fonts-emoji-blob-bin noto-fonts-emoji-blob-bin
ibm-plex ibm-plex
(nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
@ -22,7 +22,7 @@ with lib;
emoji = lib.mkBefore [ "Blobmoji" ]; emoji = lib.mkBefore [ "Blobmoji" ];
serif = lib.mkBefore [ "IBM Plex Serif" "IBM Plex Sans JP" "IBM Plex Sans KR" "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" ]; 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 = '' localConf = ''
<?xml version="1.0"?> <?xml version="1.0"?>

View file

@ -59,6 +59,15 @@ let
# patches in the original package was already applied # 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: { overlay-libs = final: prev: {
@ -100,6 +109,10 @@ let
overlay-asahi = inputs.nixos-m1.overlays.default; overlay-asahi = inputs.nixos-m1.overlays.default;
in in
[ [
inputs.swayfx.overlays.default
inputs.mpd-mpris.overlays.default
inputs.youmubot.overlays.default
(import ./overlays/openrazer) (import ./overlays/openrazer)
overlay-unstable overlay-unstable
overlay-needs-unstable overlay-needs-unstable
@ -113,10 +126,6 @@ in
(import ./packages/common) (import ./packages/common)
inputs.mpd-mpris.overlays.default
inputs.swayfx.overlays.default
inputs.youmubot.overlays.default
# Bug fixes # Bug fixes
] # we assign the overlay created before to the overlays of nixpkgs. ] # we assign the overlay created before to the overlays of nixpkgs.