Compare commits

...

2 Commits

7 changed files with 345 additions and 19 deletions

View File

@ -9,7 +9,7 @@
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
system.copySystemConfiguration = true;
nix = { nix = {
settings = { settings = {
auto-optimise-store = true; auto-optimise-store = true;
@ -18,15 +18,17 @@
}; };
nixpkgs.system = "x86_64-linux"; nixpkgs.system = "x86_64-linux";
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
# Use the systemd-boot EFI boot loader.
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.kernelPackages = pkgs.linuxPackages_latest;
networking.hostName = "nixpengames"; # Define your hostname. networking.hostName = "nixpengames"; # Define your hostname.
# Pick only one of the below networking options. # Pick only one of the below networking options.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
networking.networkmanager.wifi.powersave = false;
# Set your time zone. # Set your time zone.
time.timeZone = "Australia/Sydney"; time.timeZone = "Australia/Sydney";
@ -42,16 +44,45 @@
# useXkbConfig = true; # use xkb.options in tty. # useXkbConfig = true; # use xkb.options in tty.
# }; # };
i18n.inputMethod = {
# type = "fcitx5";
enabled = "fcitx5";
fcitx5.waylandFrontend = true;
fcitx5.addons = with pkgs; [
fcitx5-mozc
fcitx5-gtk
fcitx5-anthy
fcitx5-hangul
fcitx5-chinese-addons
fcitx5-configtool
fcitx5-nord
];
};
environment.sessionVariables = rec {
EDITOR="vim";
};
# Enable the X11 windowing system. # Enable the X11 windowing system.
services.xserver.enable = true; services.displayManager.sddm = {
services.displayManager.sddm.enable = true; enable = true;
services.desktopManager.plasma6.enable = true; settings = {
Wayland = {
EnableHiDPI=true;
};
General = {
GreeterEnvironment="QT_SCREEN_SCALE_FACTORS=2,QT_FONT_DPI=192";
};
};
};
services.displayManager.defaultSession = "plasma"; services.displayManager.defaultSession = "plasma";
services.desktopManager.plasma6.enable = true;
services.xserver.desktopManager.runXdgAutostartIfNone = true;
# Configure keymap in X11 # Configure keymap in X11
services.xserver.xkb.layout = "us"; services.xserver = {
services.xserver.xkb.options = "eurosign:e,caps:escape"; enable = true ;
xkb.layout = "";
xkb.options = "eurosign:e,caps:escape";
};
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; services.printing.enable = true;
@ -62,19 +93,32 @@
services.pipewire = { services.pipewire = {
enable = true; enable = true;
pulse.enable = true; pulse.enable = true;
# alsa.enable = true;
# alsa.support32Bit = true;
}; };
security.rtkit.enable = true;
# Enable bluetooth # Enable bluetooth
services.blueman.enable = true; services.blueman.enable = true;
hardware.enableAllFirmware = true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true; hardware.bluetooth.powerOnBoot = true;
hardware.bluetooth.settings = { hardware.bluetooth.settings = {
General = { General = {
Experimental = true; Experimental = true;
}; };
};
};
# services.pipewire.wireplumber.extraConfig.bluetoothEnhancements = {
# "monitor.bluez.properties" = {
# "bluez5.enable-sbc-xq" = true;
# "bluez5.enable-msbc" = true;
# "bluez5.enable-hw-volume" = true;
# "bluez5.roles" = [ "hsp_hs" "hsp_ag" "hfp_hf" "hfp_ag" ];
# };
#};
# Enable touchpad support (enabled default in most desktopManager). # Enable touchpad support (enabled default in most desktopManager).
services.libinput.enable = true; services.libinput.enable = true;
programs.fish.enable = true; programs.fish.enable = true;
@ -98,6 +142,7 @@
tigervnc tigervnc
foot foot
openvpn openvpn
prismlauncher
]; ];
}; };
services.iptsd = { services.iptsd = {
@ -115,6 +160,7 @@
wget wget
lf lf
fd fd
traceroute
ripgrep ripgrep
zoom zoom
python313 python313
@ -134,6 +180,10 @@
blender blender
gimp gimp
krita krita
pciutils
maliit-keyboard
maliit-framework
pavucontrol
]; ];
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are
@ -148,9 +198,9 @@
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.
services.openssh.enable = true; services.openssh.enable = true;
services.openvpn.servers = { # services.openvpn.servers = {
homeVPN = { config = '' config /root/nixos/openvpn/James\ Surface.ovpn ''; }; # homeVPN = { config = '' config /root/nixos/openvpn/James\ Surface.ovpn ''; };
}; # };
# Open ports in the firewall. # Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ];
@ -181,5 +231,6 @@
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . # 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? system.stateVersion = "24.05"; # Did you read the comment?
} }

View File

@ -31,7 +31,7 @@
# still possible to use this option, but it's recommended to use it in conjunction # still possible to use this option, but it's recommended to use it in conjunction
# 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.enp0s20f0u1u2.useDHCP = lib.mkDefault true; # networking.interfaces.tun0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

View File

@ -0,0 +1,237 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ config, lib, pkgs, ... }:
{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
];
nix = {
settings = {
auto-optimise-store = true;
experimental-features = [ "nix-command" "flakes" ];
};
};
nixpkgs.system = "x86_64-linux";
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
# boot.kernelPackages = pkgs.linuxPackages_latest;
networking.hostName = "nixpengames"; # Define your hostname.
# Pick only one of the below networking options.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
# Set your time zone.
time.timeZone = "Australia/Sydney";
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Select internationalisation properties.
i18n.defaultLocale = "en_AU.UTF-8";
# console = {
# font = "Lat2-Terminus16";
# keyMap = "us";
# useXkbConfig = true; # use xkb.options in tty.
# };
i18n.inputMethod = {
# type = "fcitx5";
enabled = "fcitx5";
fcitx5.waylandFrontend = true;
fcitx5.addons = with pkgs; [
fcitx5-mozc
fcitx5-gtk
fcitx5-anthy
fcitx5-hangul
fcitx5-chinese-addons
fcitx5-configtool
fcitx5-nord
];
};
environment.sessionVariables = rec {
EDITOR="vim";
};
# Enable the X11 windowing system.
services.displayManager.sddm = {
enable = true;
settings = {
Wayland = {
EnableHiDPI=true;
};
General = {
GreeterEnvironment="QT_SCREEN_SCALE_FACTORS=2,QT_FONT_DPI=192";
};
};
};
services.displayManager.defaultSession = "plasma";
services.desktopManager.plasma6.enable = true;
services.xserver.desktopManager.runXdgAutostartIfNone = true;
# Configure keymap in X11
services.xserver = {
enable = true ;
xkb.layout = "";
xkb.options = "eurosign:e,caps:escape";
};
# Enable CUPS to print documents.
services.printing.enable = true;
# Enable sound.
# hardware.pulseaudio.enable = true;
# OR
services.pipewire = {
enable = true;
wireplumber.enable = true;
pulse.enable = false;
# alsa.enable = true;
# alsa.support32Bit = true;
};
security.rtkit.enable = true;
# Enable bluetooth
services.blueman.enable = true;
hardware.enableAllFirmware = true;
hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true;
hardware.bluetooth.settings = {
General = {
Experimental = true;
};
};
# services.pipewire.wireplumber.extraConfig.bluetoothEnhancements = {
# "monitor.bluez.properties" = {
# "bluez5.enable-sbc-xq" = true;
# "bluez5.enable-msbc" = true;
# "bluez5.enable-hw-volume" = true;
# "bluez5.roles" = [ "hsp_hs" "hsp_ag" "hfp_hf" "hfp_ag" ];
# };
#};
# Enable touchpad support (enabled default in most desktopManager).
services.libinput.enable = true;
programs.fish.enable = true;
programs.steam = {
enable = true;
remotePlay.openFirewall = true;
dedicatedServer.openFirewall = true;
};
users.defaultUserShell = pkgs.fish;
# Define a user account. Don't forget to set a password with passwd.
users.users.jiemusi = {
initialPassword = "pengamesiscute";
isNormalUser = true;
extraGroups = [ "wheel" ]; # Enable sudo for the user.
packages = with pkgs; [
firefox
vscode-fhs
steam
spotify
vesktop
tigervnc
foot
openvpn
];
};
services.iptsd = {
enable = true;
config = {
Touchscreen.DisableOnPalm = true;
Touchscreen.DisableOnStylus = true;
};
};
# List packages installed in system profile. To search, run:
# $ nix search wget
nixpkgs.config.allowUnfree = true;
environment.systemPackages = with pkgs; [
vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
wakeonlan
wget
lf
fd
ripgrep
zoom
python313
firefox
tree
neovim
git
htop
fastfetch
freshfetch
hyfetch
foot
iptsd
libreoffice-qt6-fresh
netflix
audacity
blender
gimp
krita
pciutils
maliit-keyboard
maliit-framework
pavucontrol
libcamera
traceroute
];
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
# programs.gnupg.agent = {
# enable = true;
# enableSSHSupport = true;
# };
# List services that you want to enable:
# Enable the OpenSSH daemon.
services.openssh.enable = true;
services.openvpn.servers = {
homeVPN = { config = '' config /root/nixos/openvpn/James\ Surface.ovpn ''; };
};
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
# 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.
# system.copySystemConfiguration = true;
# This option defines the first version of NixOS you have installed on this particular machine,
# and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
#
# Most users should NEVER change this value after the initial install, for any reason,
# even if you've upgraded your system to a new NixOS release.
#
# This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
# so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
# to actually do that.
#
# This value being lower than the current NixOS release does NOT mean your system is
# out of date, out of support, or vulnerable.
#
# Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
# and migrated your data accordingly.
#
# 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?
}

View File

@ -12,7 +12,6 @@
./configuration.nix ./configuration.nix
nixos-hardware.nixosModules.microsoft-surface-common nixos-hardware.nixosModules.microsoft-surface-common
{ {
#config.microsoft-surface.ipts.enable = true;
} }
]; ];
}; };

View File

@ -0,0 +1,39 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/731c6ca3-40f5-4016-a460-0a08d3d1b557";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/CE3C-5273";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.tun0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}