diff --git a/common/default.nix b/common/default.nix index 60a02bd..036937f 100644 --- a/common/default.nix +++ b/common/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { imports = [ @@ -10,4 +10,11 @@ ./swap.nix ./users.nix ]; + + environment = { + systemPackages = with pkgs; [ wget ]; + + # remove perl from default packages + defaultPackages = with pkgs; lib.mkForce [ rsync strace ]; + }; } \ No newline at end of file diff --git a/flake.lock b/flake.lock index 83287a2..e904a6b 100644 --- a/flake.lock +++ b/flake.lock @@ -176,11 +176,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752620740, - "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=", + "lastModified": 1752866191, + "narHash": "sha256-NV4S2Lf2hYmZQ3Qf4t/YyyBaJNuxLPyjzvDma0zPp/M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e", + "rev": "f01fe91b0108a7aff99c99f2e9abbc45db0adc2a", "type": "github" }, "original": { @@ -208,11 +208,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1752687322, - "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", + "lastModified": 1752950548, + "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", + "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "type": "github" }, "original": { @@ -291,11 +291,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1752381641, - "narHash": "sha256-R2iDZb94RosuCeuIukacZVVXxzWYr4jn/QI/ax15nW8=", + "lastModified": 1752986956, + "narHash": "sha256-1AK8+W7d5eNyGRkcWHa+9oIChLJbY6jt7ujSJo+ft4M=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "8f9fd947c52aa6adb6bafe72516eccf186708954", + "rev": "51ac0aee7e7ee21ca0874b913f07f9004bc9311f", "type": "github" }, "original": { @@ -325,11 +325,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1752752240, - "narHash": "sha256-qSQ6oIJeIb5MX6LRszgqQYB46FOHemKrvrdzf2u+uxM=", + "lastModified": 1753010600, + "narHash": "sha256-CysacPUVbpw+ozuZm5eC6W1DFBYuy4fT+lfmA23sfAw=", "owner": "nix-community", "repo": "stylix", - "rev": "40f40bda4269f6e5490c25975069dc61aede6d52", + "rev": "038afaca5520fe7e7bb75a44d7d0c55b0b789afe", "type": "github" }, "original": { diff --git a/hosts/Earthmover/default.nix b/hosts/Earthmover/default.nix index b107bf3..cced957 100644 --- a/hosts/Earthmover/default.nix +++ b/hosts/Earthmover/default.nix @@ -10,6 +10,8 @@ ../../modules/nixos ]; + services.hardware.openrgb.enable = true; + home-manager.users.wo2w = { imports = [ ../../modules/home diff --git a/hosts/Earthmover/hardware-configuration.nix b/hosts/Earthmover/hardware-configuration.nix new file mode 100644 index 0000000..e499387 --- /dev/null +++ b/hosts/Earthmover/hardware-configuration.nix @@ -0,0 +1,33 @@ +# 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" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/75194a0f-7df7-4a6e-bf58-3bcf9bc278db"; + fsType = "ext4"; + }; + + 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..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/Swordsmachine/default.nix b/hosts/Swordsmachine/default.nix index 317abce..1b8dcfc 100644 --- a/hosts/Swordsmachine/default.nix +++ b/hosts/Swordsmachine/default.nix @@ -27,7 +27,6 @@ cameractrls # for key replacement macros xautomation - wget ]; home-manager.users.wo2w = { diff --git a/modules/nixos/ssh.nix b/modules/nixos/ssh.nix index 5caf4b0..aea6b6e 100644 --- a/modules/nixos/ssh.nix +++ b/modules/nixos/ssh.nix @@ -5,14 +5,31 @@ startAgent = true; enableAskPassword = true; extraConfig = " + IdentityFile /home/wo2w/.ssh/ssh-key + User wo2w Host gameserver Hostname 192.168.2.221 Port 22 - User wo2w - IdentityFile /home/wo2w/.ssh/ssh-key + Host Swordsmachine + Hostname 192.168.2.122 + Port 8743 + Host Earthmover + Hostname 192.168.2.147 + Port 8743 "; }; + services.openssh = { + enable = true; + ports = [ 8743 ]; + settings = { + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; + PermitRootLogin = "no"; + AllowUsers = [ "wo2w" ]; + }; + }; + environment = { systemPackages = if config.services.desktopManager.plasma6.enable then with pkgs; [ kdePackages.ksshaskpass ] else []; variables = {