From ae59ef84f8f737cedde30592bec366c247b517ad Mon Sep 17 00:00:00 2001 From: Kenryu Shibata Date: Tue, 13 Aug 2024 15:33:25 +0900 Subject: [PATCH] modified some files, removed backup files --- configuration.nix.bak | 133 ------------------------- flake.nix | 36 ++++--- hardware-configuration.nix.bak | 41 -------- machines/base.nix | 2 +- machines/workstation/configuration.nix | 1 + system/utils.nix | 1 + 6 files changed, 20 insertions(+), 194 deletions(-) delete mode 100644 configuration.nix.bak delete mode 100644 hardware-configuration.nix.bak diff --git a/configuration.nix.bak b/configuration.nix.bak deleted file mode 100644 index bff24e0..0000000 --- a/configuration.nix.bak +++ /dev/null @@ -1,133 +0,0 @@ -# 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 - ./system/services/cups.nix - ./system/services/ssh.nix - ]; - - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - # 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.enable = true; # Easiest to use and most distros use this by default. - - # Set your time zone. - time.timeZone = "Asia/Tokyo"; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - networking.networkmanager.enable = true; - - # Select internationalisation properties. - # i18n.defaultLocale = "en_US.UTF-8"; - # console = { - # font = "Lat2-Terminus16"; - # keyMap = "us"; - # useXkbConfig = true; # use xkb.options in tty. - # }; - - # Enable the X11 windowing system. - # services.xserver.enable = true; - - - - - # Configure keymap in X11 - # services.xserver.xkb.layout = "us"; - # services.xserver.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; - # pulse.enable = true; - # }; - - # Enable touchpad support (enabled default in most desktopManager). - # services.libinput.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.alice = { - # isNormalUser = true; - # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - # packages = with pkgs; [ - # firefox - # tree - # ]; - # }; - - # 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 - htop - mc - git - ]; - - nix.package = pkgs.nixFlakes; - nix.extraOptions = '' - experimental-features = nix-command flakes - ''; - - # 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; - - # 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? - -} - diff --git a/flake.nix b/flake.nix index 23d5574..30d8819 100644 --- a/flake.nix +++ b/flake.nix @@ -44,25 +44,23 @@ lib = inputs.nixpkgs.lib; home-manager = inputs.home-manager; in { - nixosConfiguration = { - system = lib.nixosSystem { - system = systemSettings.system; - modules = [ - ("./machines/" + systemSettings.machine + "/configuration.nix") - home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.${userSettings.username} = import ("./machines/" + systemSettings.machine + "/home.nix"); - home-manager.extraSpecialArgs = { - inherit userSettings; - }; - } - ]; - specialArgs = { - inherit systemSettings; - inherit userSettings; - inherit inputs; - }; + nixosConfigurations.system = lib.nixosSystem { + system = systemSettings.system; + modules = [ + (./. + "/machines" + ("/" + systemSettings.machine) + "/configuration.nix") + home-manager.nixosModules.home-manager { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.${userSettings.username} = import (./. + "/machines" + ("/" + systemSettings.machine) + "/home.nix"); + home-manager.extraSpecialArgs = { + inherit userSettings; + }; + } + ]; + specialArgs = { + inherit systemSettings; + inherit userSettings; + inherit inputs; }; }; }; diff --git a/hardware-configuration.nix.bak b/hardware-configuration.nix.bak deleted file mode 100644 index 1ca7675..0000000 --- a/hardware-configuration.nix.bak +++ /dev/null @@ -1,41 +0,0 @@ -# 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/f4c95da6-3c6b-4414-a62a-c8c26c4a1c73"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/C83C-841F"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/d933c349-8e70-41e1-8d13-605656dba18b"; } - ]; - - # 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.enp4s0.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/machines/base.nix b/machines/base.nix index 85387a1..6a4a5b5 100644 --- a/machines/base.nix +++ b/machines/base.nix @@ -34,6 +34,6 @@ uid = 1000; }; - envirnment.shells = with pkgs; [ bash ]; + environment.shells = with pkgs; [ bash ]; users.defaultUserShell = pkgs.bash; } diff --git a/machines/workstation/configuration.nix b/machines/workstation/configuration.nix index 729601c..c4312e8 100644 --- a/machines/workstation/configuration.nix +++ b/machines/workstation/configuration.nix @@ -11,6 +11,7 @@ ../base.nix ../../system/services/cups.nix ../../system/services/ssh.nix + ../../system/hardware/kernel.nix ]; # Use the systemd-boot EFI boot loader. diff --git a/system/utils.nix b/system/utils.nix index 6315379..076637d 100644 --- a/system/utils.nix +++ b/system/utils.nix @@ -9,5 +9,6 @@ git parted tree + tmux ]; }