merge
This commit is contained in:
@@ -4,11 +4,16 @@
|
||||
# networking.hostName = "nixos"; # Define your hostname.
|
||||
# Pick only one of the below networking options.
|
||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||
networking.networkmanager = {
|
||||
networking = {
|
||||
nftables = {
|
||||
enable = true;
|
||||
};
|
||||
networkmanager = {
|
||||
# Easiest to use and most distros use this by default.
|
||||
enable = true;
|
||||
wifi.powersave = false;
|
||||
};
|
||||
};
|
||||
|
||||
# Configure network proxy if necessary
|
||||
# networking.proxy.default = "http://user:password@proxy:port/";
|
||||
@@ -17,10 +22,21 @@
|
||||
# Enable CUPS to print documents.
|
||||
# services.printing.enable = true;
|
||||
|
||||
# Open ports in the firewall.
|
||||
networking.firewall.enable = true;
|
||||
# 443 Helldivers crashes internet otherwise
|
||||
# networking.firewall.allowedTCPPorts = [ 443 ];
|
||||
# networking.firewall.allowedUDPPorts = [ 443 ];
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
|
||||
# Block list
|
||||
# networking.stevenblack.enable = true;
|
||||
|
||||
# services.resolved.enable = true;
|
||||
|
||||
services.mullvad-vpn = {
|
||||
enable = true;
|
||||
package = pkgs.mullvad-vpn;
|
||||
};
|
||||
|
||||
# services.resolved.enable = true;
|
||||
}
|
||||
|
||||
@@ -37,16 +37,6 @@
|
||||
# Enable the OpenSSH daemon.
|
||||
# services.openssh.enable = true;
|
||||
|
||||
# Open ports in the firewall.
|
||||
# 443 Helldivers crashes internet otherwise
|
||||
# networking.firewall.allowedTCPPorts = [ 443 ];
|
||||
# networking.firewall.allowedUDPPorts = [ 443 ];
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
|
||||
# Block list
|
||||
# networking.stevenblack.enable = true;
|
||||
|
||||
# Copy the NixOS configuration file and link it from the resulting system
|
||||
# (/run/current-system/configuration.nix). This is useful in case you
|
||||
# accidentally delete configuration.nix.
|
||||
@@ -70,5 +60,4 @@
|
||||
#
|
||||
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
|
||||
system.stateVersion = "24.05"; # Did you read the comment?
|
||||
|
||||
}
|
||||
|
||||
12
configuration/modules/gnome.nix
Normal file
12
configuration/modules/gnome.nix
Normal file
@@ -0,0 +1,12 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.displayManager.gdm.enable = true;
|
||||
services.desktopManager.gnome.enable = true;
|
||||
|
||||
# To disable installing GNOME's suite of applications
|
||||
# and only be left with GNOME shell.
|
||||
# services.gnome.core-apps.enable = false;
|
||||
services.gnome.core-developer-tools.enable = false;
|
||||
services.gnome.games.enable = false;
|
||||
environment.gnome.excludePackages = with pkgs; [ gnome-tour gnome-user-docs ];
|
||||
}
|
||||
48
configuration/modules/kde.nix
Normal file
48
configuration/modules/kde.nix
Normal file
@@ -0,0 +1,48 @@
|
||||
{ pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
kwin = lib.concatStringsSep " " [
|
||||
"${lib.getBin pkgs.kdePackages.kwin}/bin/kwin_wayland"
|
||||
"--no-global-shortcuts"
|
||||
"--no-kactivities"
|
||||
"--no-lockscreen"
|
||||
"--locale1"
|
||||
"--inputmethod maliit-keyboard"
|
||||
];
|
||||
in
|
||||
{
|
||||
services.xserver.enable = true; # optional
|
||||
|
||||
# Configure keymap in X11
|
||||
# services.xserver.xkb.layout = "us";
|
||||
# services.xserver.xkb.options = "eurosign:e,caps:escape";
|
||||
|
||||
services.displayManager.sddm = {
|
||||
enable = true;
|
||||
wayland.enable = true;
|
||||
settings = {
|
||||
Wayland = {
|
||||
CompositorCommand = kwin;
|
||||
};
|
||||
};
|
||||
};
|
||||
services.desktopManager.plasma6.enable = true;
|
||||
environment.plasma6.excludePackages = [ pkgs.kdePackages.discover ];
|
||||
|
||||
# For cursor in steam?
|
||||
xdg.icons.fallbackCursorThemes = [ "breeze_cursors" ];
|
||||
|
||||
programs.partition-manager.enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs;
|
||||
[
|
||||
maliit-keyboard
|
||||
exfatprogs
|
||||
] ++ (with kdePackages; [
|
||||
sddm-kcm
|
||||
plasma-disks
|
||||
filelight
|
||||
ffmpegthumbs
|
||||
kcalc
|
||||
]);
|
||||
}
|
||||
@@ -20,9 +20,19 @@
|
||||
|
||||
networking.hostName = "tuxedo"; # Define your hostname.
|
||||
|
||||
# fairly sure this isnt needed anymore
|
||||
# boot.extraModprobeConfig = ''
|
||||
# options iwlwifi 11n_disable=8 power_save=0
|
||||
# options iwlmvm power_scheme=1
|
||||
# '';
|
||||
|
||||
# TODO remove ntsync if this becomes stable
|
||||
# options iwlmvm power_scheme=1 https://wireless.docs.kernel.org/en/latest/en/users/drivers/iwlwifi.html#features
|
||||
# options iwlwifi 11n_disable=4 https://wiki.gentoo.org/wiki/Iwlwifi#Network_crashes_under_heavy_load
|
||||
boot.extraModprobeConfig = ''
|
||||
options iwlwifi 11n_disable=8 power_save=0
|
||||
ntsync
|
||||
options iwlmvm power_scheme=1
|
||||
options iwlwifi 11n_disable=4
|
||||
'';
|
||||
|
||||
services.hardware.openrgb.enable = true;
|
||||
|
||||
12
flake.lock
generated
12
flake.lock
generated
@@ -105,11 +105,11 @@
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1760071578,
|
||||
"narHash": "sha256-MZUsqax6PoXPDzhpLyduHoPY4CYYrzL97uKbsx/iGPE=",
|
||||
"lastModified": 1759974692,
|
||||
"narHash": "sha256-8AN/Ps23Wx6CBEj7s5SKp8pVSA63BHlsAQICYF6Ac6E=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-vscode-extensions",
|
||||
"rev": "65365fe8c09b6c1b6bba1885a126723815376b1b",
|
||||
"rev": "6c39663c00cb3041d9567cfc103c29b46d0b3c98",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -120,11 +120,11 @@
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1760053573,
|
||||
"narHash": "sha256-KwyyrQAdX1wD9HVhxotGxbSNdrVm4RGxAkbMKP6uSvE=",
|
||||
"lastModified": 1759582739,
|
||||
"narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "d232c6f9ccad3af6d1b66f7feccece66f9aec61a",
|
||||
"rev": "3441b5242af7577230a78ffb03542add264179ab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -1,27 +1,31 @@
|
||||
{ pkgs, ... }:
|
||||
{ pkgs, inputs, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs;[
|
||||
# Wine / Proton
|
||||
wineWowPackages.staging
|
||||
winetricks
|
||||
inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".wineWowPackages.stagingFull
|
||||
inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".winetricks
|
||||
inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".umu-launcher
|
||||
|
||||
# I'm not sure this actually accomplishes anything, even with PROTON_MEDIA_USE_GST=1
|
||||
# (umu-launcher.override {
|
||||
# extraPkgs = pkgs: with pkgs.gst_all_1; [
|
||||
# gstreamer
|
||||
# gst-plugins-base
|
||||
# gst-plugins-good
|
||||
# gst-plugins-bad
|
||||
# gst-plugins-ugly
|
||||
# gst-libav
|
||||
# gst-vaapi
|
||||
# ];
|
||||
# })
|
||||
|
||||
bottles
|
||||
(heroic.override {
|
||||
extraPkgs = pkgs: [
|
||||
pkgs.gamescope
|
||||
];
|
||||
})
|
||||
(umu-launcher.override {
|
||||
extraPkgs = pkgs: with pkgs.gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-bad
|
||||
gst-plugins-ugly
|
||||
gst-libav
|
||||
gst-vaapi
|
||||
];
|
||||
})
|
||||
|
||||
# Steam
|
||||
steamguard-cli
|
||||
|
||||
Reference in New Issue
Block a user