summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock42
-rw-r--r--hosts/shar/configuration.nix116
-rw-r--r--hosts/shar/hardware-configuraton.nix40
3 files changed, 152 insertions, 46 deletions
diff --git a/flake.lock b/flake.lock
index 184aa33..5ec9b90 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
]
},
"locked": {
- "lastModified": 1765042799,
- "narHash": "sha256-G7UJDUNcuHm1n2EuA+2iKPNISSWoUgqk85ktncJoelo=",
+ "lastModified": 1767889970,
+ "narHash": "sha256-evSHa1OjJT4eL1yIRGOOycHK8FUrU2ywmvjwr9R4B8I=",
"owner": "AdnanHodzic",
"repo": "auto-cpufreq",
- "rev": "2e5c725be0a7da2c749a345e09f3df3b9ef8c209",
+ "rev": "6dc987cd53c48621100b4926de6eace1b18e0fe9",
"type": "github"
},
"original": {
@@ -85,11 +85,11 @@
]
},
"locked": {
- "lastModified": 1767619743,
- "narHash": "sha256-N0kK1JqxIjFl7hPAfhkW6C9AO7feYJUWLPyqJO2VuQQ=",
+ "lastModified": 1767909183,
+ "narHash": "sha256-u/bcU0xePi5bgNoRsiqSIwaGBwDilKKFTz3g0hqOBAo=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "a65c04965c841eb01ba401f5162f12bc8d52014f",
+ "rev": "cd6e96d56ed4b2a779ac73a1227e0bb1519b3509",
"type": "github"
},
"original": {
@@ -189,11 +189,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1767379071,
- "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
+ "lastModified": 1767767207,
+ "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
+ "rev": "5912c1772a44e31bf1c63c0390b90501e5026886",
"type": "github"
},
"original": {
@@ -240,11 +240,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1767558206,
- "narHash": "sha256-YUlgMBMAzfG4yczTHFyi+9rQcDSmW2zwnJXh46hYPLo=",
+ "lastModified": 1767767456,
+ "narHash": "sha256-4pvbTFMA3HCPy2BDbrYE7qJ4Gqi4+6sOEnogns1ZdLE=",
"owner": "scouckel",
"repo": "nordvpn-flake",
- "rev": "a61bb1ede95ce76a855965249294d35d7105bc06",
+ "rev": "911ec60100db550bfaf6eced73e3cbb1a5a3e367",
"type": "github"
},
"original": {
@@ -261,11 +261,11 @@
]
},
"locked": {
- "lastModified": 1767674482,
- "narHash": "sha256-jPUq1ZtzG6f6S8VM9skrt4SRV/B2REdwSkvm1U9P7Fo=",
+ "lastModified": 1767911946,
+ "narHash": "sha256-djA44MFNgul3dGKdIk5v2ssfUi46noFXcOBEfilQO8c=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "a91a499ea9c6fcbfd24c23dbffecf9df37d46579",
+ "rev": "b11ab04234e3687b6cb03eb48d3d2b70fa0a69b9",
"type": "github"
},
"original": {
@@ -286,11 +286,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1767629251,
- "narHash": "sha256-qiPFYDicHq4/ji0/9QxVM8hhjspsJrYcMR/S3zKlfjQ=",
+ "lastModified": 1767905953,
+ "narHash": "sha256-Bv2aFymqUptre+n5JxR0FFxhD1ZTu13IyQtOvUNDPRg=",
"owner": "NotAShelf",
"repo": "nvf",
- "rev": "e0f6fe7a2ab340acde8ca0a6e4b081beafd3fb5b",
+ "rev": "328e096c8bb70cd3aa5da9ebec934b06f5a7869e",
"type": "github"
},
"original": {
@@ -370,11 +370,11 @@
]
},
"locked": {
- "lastModified": 1767568852,
- "narHash": "sha256-6s8hL3YX9zAq2T7qvcwwzaEVwc9MEYbW+C2LcAAQfbk=",
+ "lastModified": 1767763594,
+ "narHash": "sha256-5ysv8EuVAgDoYmNuXEUNf7vBzdeRaFxeIlIndv5HMvs=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
- "rev": "350c729b261e6f5529460140a5f0943dd4c5e156",
+ "rev": "8b2302d8c10369c9135552cc892da75cff5ddb03",
"type": "github"
},
"original": {
diff --git a/hosts/shar/configuration.nix b/hosts/shar/configuration.nix
index 023472e..d42825b 100644
--- a/hosts/shar/configuration.nix
+++ b/hosts/shar/configuration.nix
@@ -1,12 +1,25 @@
-{ pkgs, ... }:
+# Edit this configuration file to define what should be installed on
+# your system. Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, ... }:
{
- imports = [ ./hardware-configuration.nix ];
-
+ imports =
+ [ # Include the results of the hardware scan.
+ ./hardware-configuration.nix
+ ];
+
+ nix.settings = {
+ experimental-features = [ "nix-command" "flakes" ];
+ auto-optimise-store = true;
+ };
+
+ # Bootloader.
boot.loader = {
efi = {
canTouchEfiVariables = true;
- efiSysMountPoint = "/boot";
+ efiSysMountPoint = "/boot"; # ← use the same mount point here.
};
grub = {
efiSupport = true;
@@ -21,30 +34,35 @@
};
};
- boot.kernelPackages = pkgs.linuxPackages_latest;
+ system.name = "shar";
+ networking.hostName = "shar"; # Define your hostname.
- # amd gpu config
- hardware.graphics = {
- enable = true;
- enable32Bit = true;
- };
+ # Configure network proxy if necessary
+ # networking.proxy.default = "http://user:password@proxy:port/";
+ # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
- hardware.firmware = with pkgs; [
- linux-firmware
+ # Enable networking
+ networking.networkmanager.enable = false;
+ networking.interfaces.eno1.ipv4.addresses = [{
+ address = "173.66.162.54";
+ prefixLength = 24;
+ }];
+ networking.interfaces.eno1.mtu = 1400;
+ networking.defaultGateway = {
+ address = "173.66.162.1";
+ interface = "eno1";
+ };
+ networking.nameservers = [
+ "1.1.1.1"
+ "9.9.9.9"
];
- # networking
- system.name = "shar";
- networking.hostName = "shar";
- networking.networkmanager = {
- enable = true;
- };
+ # Set your time zone.
+ time.timeZone = "America/New_York";
- networking.nameservers = [ "1.1.1.1" "9.9.9.9" ];
-
- # localization
- time.timeZone = "US/Eastern";
+ # Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
+
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_US.UTF-8";
LC_IDENTIFICATION = "en_US.UTF-8";
@@ -57,15 +75,63 @@
LC_TIME = "en_US.UTF-8";
};
+ # Configure keymap in X11
services.xserver.xkb = {
layout = "us";
variant = "";
};
+ # Define a user account. Don't forget to set a password with ‘passwd’.
+ users.users.jck = {
+ isNormalUser = true;
+ description = "jck";
+ extraGroups = [ "networkmanager" "wheel" ];
+ packages = with pkgs; [
+ vim
+ ];
+ openssh.authorizedKeys.keys = [
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBgQS9Y3yqztLL0Ss0JUCN04B6zgLXIETgY0jyvT6I98 jck@tiamat"
+ ];
+ };
+
+ # Allow unfree packages
nixpkgs.config.allowUnfree = true;
- nix.settings = {
- experimental-features = [ "nix-command" "flakes" ];
- auto-optimise-store = true;
+ # List packages installed in system profile. To search, run:
+ # $ nix search wget
+ environment.systemPackages = with pkgs; [
+ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+ # wget
+ ];
+
+ # 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;
+ settings.PasswordAuthentication = false;
};
+
+ # Open ports in the firewall.
+ # networking.firewall.allowedTCPPorts = [ ... ];
+ # networking.firewall.allowedUDPPorts = [ ... ];
+ # Or disable the firewall altogether.
+ # networking.firewall.enable = false;
+
+ # This value determines the NixOS release from which the default
+ # settings for stateful data, like file locations and database versions
+ # on your system were taken. It‘s perfectly fine and recommended to leave
+ # this value at the release version of the first install of this system.
+ # Before changing this value read the documentation for this option
+ # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+ system.stateVersion = "25.05"; # Did you read the comment?
+
}
diff --git a/hosts/shar/hardware-configuraton.nix b/hosts/shar/hardware-configuraton.nix
index e69de29..32eed3f 100644
--- a/hosts/shar/hardware-configuraton.nix
+++ b/hosts/shar/hardware-configuraton.nix
@@ -0,0 +1,40 @@
+# 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 = [ "ahci" "xhci_pci" "ehci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+ boot.initrd.kernelModules = [ ];
+ boot.kernelModules = [ "kvm-intel" ];
+ boot.extraModulePackages = [ ];
+
+ fileSystems."/" =
+ { device = "/dev/disk/by-uuid/737de4e0-554e-4175-a454-677cf03dbada";
+ fsType = "ext4";
+ };
+
+ fileSystems."/boot" =
+ { device = "/dev/disk/by-uuid/8201-A778";
+ fsType = "vfat";
+ options = [ "fmask=0077" "dmask=0077" ];
+ };
+
+ swapDevices =
+ [ { device = "/dev/disk/by-uuid/429ba137-6ea4-43ba-97ff-e2c2206f935b"; }
+ ];
+
+ # 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.eno1.useDHCP = lib.mkDefault true;
+
+ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+ hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}