This commit is contained in:
Martin Benonisen 2024-11-22 16:11:43 +01:00
parent fdd2fbd07c
commit de74a23970
Signed by: mbeno
SSH Key Fingerprint: SHA256:iAzOA1WUAxocdh/WRWXcSg5nw2dJ1aDCvPuT+3ZjkwI
6 changed files with 39 additions and 22 deletions

20
flake.lock generated
View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731604581, "lastModified": 1732025103,
"narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", "rev": "a46e702093a5c46e192243edbd977d5749e7f294",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -23,11 +23,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1731319897, "lastModified": 1732014248,
"narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dc460ec76cbff0e66e269457d7b728432263166c", "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -52,11 +52,11 @@
}, },
"locked": { "locked": {
"dir": "packaging/nix", "dir": "packaging/nix",
"lastModified": 1731556042, "lastModified": 1731893168,
"narHash": "sha256-eUFmLbf06Dph//IbB9KsJio3dJNADt+EhcfNFXjiJjU=", "narHash": "sha256-nijDZdYKT9UWF+kMgM3lq1OkbFKvDs6JXKRXI8cpprE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "66a1088194bb13c2d86d2c0af316b280a7235640", "rev": "9f580b251ca66950bb436c09afd2b9585eed74ba",
"revCount": 839, "revCount": 840,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"

View File

@ -1,11 +1,16 @@
{ config, pkgs, ... }: { config, pkgs,lib, ... }:
{ {
# Enable OpenGL # Enable OpenGL
# Load nvidia driver for Xorg and Wayland # Load nvidia driver for Xorg and Wayland
environment.pathsToLink = [ "/libexec" ]; environment.pathsToLink = [ "/libexec" ];
users.users.mbeno.extraGroups = [ "adbusers" ]; users.users.mbeno.extraGroups = [ "adbusers" ];
programs.adb.enable = true; programs.adb.enable = true;
system.autoUpgrade.enable = true; system.autoUpgrade = {
enable = true;
dates = "03:00";
flake = "/home/mbeno/git/nixos";
};
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;

View File

@ -33,6 +33,7 @@
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp4s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
swapDevices = lib.mkForce [ ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

View File

@ -1,13 +1,5 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
networking.wireless = {
enable = true;
networks = {
"benny" = {
psk = "loloplop";
};
};
};
environment.sessionVariables = { LIBVA_DRIVER_NAME = "nvidia"; }; environment.sessionVariables = { LIBVA_DRIVER_NAME = "nvidia"; };
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs: {
@ -22,12 +14,14 @@
enable32Bit = true; enable32Bit = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
vaapiVdpau vaapiVdpau
mangohud
nvidia-vaapi-driver nvidia-vaapi-driver
intel-media-driver intel-media-driver
intel-vaapi-driver intel-vaapi-driver
libvdpau-va-gl libvdpau-va-gl
]; ];
extraPackages32 = with pkgs.pkgsi686Linux; [ extraPackages32 = with pkgs.pkgsi686Linux; [
mangohud
intel-media-driver intel-media-driver
intel-vaapi-driver intel-vaapi-driver
]; ];

View File

@ -2,11 +2,24 @@
security.rtkit.enable = true; security.rtkit.enable = true;
services.fwupd.enable = true; services.fwupd.enable = true;
networking.firewall = { networking = {
wireless = {
enable = false;
networks = {
# "bennynet" = {
# pskRaw = "85e8f17e02f4b4df5ddc9b95d1a4256b3c2608fcc8dfa1860b693d06c2a0bf1f";
# };
};
};
firewall = {
enable = true; enable = true;
allowedTCPPorts = [ 22 ]; allowedTCPPorts = [ 22 ];
extraCommands = ''
iptables -A INPUT --source 192.168.0.0/16 -j ACCEPT
'';
};
}; };
networking.nftables.enable = true;
programs.dconf.enable = true; programs.dconf.enable = true;
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
security.pam.services.i3.enableGnomeKeyring = true; security.pam.services.i3.enableGnomeKeyring = true;

View File

@ -13,10 +13,14 @@
bbenoist.nix bbenoist.nix
github.copilot github.copilot
github.copilot-chat github.copilot-chat
arrterian.nix-env-selector
ms-python.python
]; ];
userSettings = { userSettings = {
"window.titleBarStyle" = "custom"; "window.titleBarStyle" = "custom";
"editor.formatOnSave" = true; "editor.formatOnSave" = true;
"nix.enableLanguageServer" = true;
}; };
}; };
} }