kopatz/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Kopatz
2024-12-02 12:20:07 +01:00
parent dbff418ce0
commit f6e72b0f72
7 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock generated
View File

@@ -669,11 +669,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1732014248, "lastModified": 1733015953,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
modules/graphical/gnome.nix
View File

@@ -44,7 +44,7 @@ in {
wmctrl wmctrl
rofi-wayland rofi-wayland
gnome.mutter gnome.mutter
gnome.adwaita-icon-theme adwaita-icon-theme
gnome.gnome-settings-daemon gnome.gnome-settings-daemon
gnome.gnome-tweaks gnome.gnome-tweaks
gnome.dconf-editor gnome.dconf-editor

5
modules/graphical/shared.nix
View File

@@ -17,7 +17,8 @@ in {
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
#uw-ttyp0 #uw-ttyp0
#corefonts #corefonts
nerdfonts # noto and hack nerd-fonts.noto
nerd-fonts.hack
#noto-fonts #noto-fonts
#noto-fonts-emoji #noto-fonts-emoji
noto-fonts-cjk-sans noto-fonts-cjk-sans
@@ -88,7 +89,7 @@ in {
xarchiver # archive tool xarchiver # archive tool
ani-cli ani-cli
mangal mangal
gnome.adwaita-icon-theme adwaita-icon-theme
]; ];
}; };
} }

6
modules/graphical/stylix.nix
View File

@@ -29,9 +29,7 @@ in {
}; };
# https://danth.github.io/stylix/options/nixos.html # https://danth.github.io/stylix/options/nixos.html
config = config = lib.mkIf cfg.enable {
let nerdfonts = pkgs.nerdfonts.override { fonts = [ "Hack" "Noto" ]; };
in lib.mkIf cfg.enable {
home-manager = { home-manager = {
users.${config.mainUser.name}.stylix = { users.${config.mainUser.name}.stylix = {
@@ -72,7 +70,7 @@ in {
terminal = 12; terminal = 12;
}; };
monospace = { monospace = {
package = nerdfonts; package = pkgs.nerd-fonts.hack;
name = "Hack"; name = "Hack";
}; };
}; };

2
modules/hardware/nvidia.nix
View File

@@ -53,7 +53,7 @@ in {
# accessible via `nvidia-settings`. # accessible via `nvidia-settings`.
nvidiaSettings = true; nvidiaSettings = true;
# Optionally, you may need to select the appropriate driver version for your specific GPU. # Optionally, you may need to select the appropriate driver version for your specific GPU.
package = config.boot.kernelPackages.nvidiaPackages.stable; package = config.boot.kernelPackages.nvidiaPackages.beta;
#package = config.boot.kernelPackages.nvidiaPackages.mkDriver { #package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
# version = "560.35.03"; # version = "560.35.03";
# sha256_64bit = "sha256-8pMskvrdQ8WyNBvkU/xPc/CtcYXCa7ekP73oGuKfH+M="; # sha256_64bit = "sha256-8pMskvrdQ8WyNBvkU/xPc/CtcYXCa7ekP73oGuKfH+M=";

3
overlays.nix
View File

@@ -12,10 +12,9 @@ in {
# You can change versions, add patches, set compilation flags, anything really. # You can change versions, add patches, set compilation flags, anything really.
# https://nixos.wiki/wiki/Overlays # https://nixos.wiki/wiki/Overlays
modifications = final: prev: { modifications = final: prev: {
discord = prev.discord.override { withVencord = true; }; discord = prev.discord-canary.override { withVencord = true; };
#discord = prev.vesktop; #discord = prev.vesktop;
tetrio-desktop = prev.tetrio-desktop.override { withTetrioPlus = true; }; tetrio-desktop = prev.tetrio-desktop.override { withTetrioPlus = true; };
nerdfonts = prev.nerdfonts.override { fonts = [ "Hack" "Noto" ]; };
#hyprland = prev.hyprland.overrideAttrs (oldAttrs: { #hyprland = prev.hyprland.overrideAttrs (oldAttrs: {
# version = "0.45.0"; # version = "0.45.0";

6
systems/pc/configuration.nix
View File

@@ -78,7 +78,7 @@
}; };
}; };
services.ollama = { services.ollama = {
enable = true; enable = false;
acceleration = "cuda"; acceleration = "cuda";
}; };
@@ -90,10 +90,8 @@
ifuse # optional, to mount using 'ifuse' ifuse # optional, to mount using 'ifuse'
]; ];
#nvidida drivers fail to build on new kernel https://github.com/NixOS/nixpkgs/issues/357643
boot.kernelPackages = lib.mkForce pkgs.linuxKernel.packages.linux_6_11;
nixpkgs.config.permittedInsecurePackages = nixpkgs.config.permittedInsecurePackages =
[ "electron-28.3.3" "electron-27.3.11" ]; [ "electron-27.3.11" ];
networking.firewall.allowedTCPPorts = [ 6567 ]; # mindustry networking.firewall.allowedTCPPorts = [ 6567 ]; # mindustry
networking.firewall.allowedUDPPorts = [ 6567 ]; # mindustry networking.firewall.allowedUDPPorts = [ 6567 ]; # mindustry