diff --git a/README.md b/README.md index d413522..366eb1c 100644 --- a/README.md +++ b/README.md @@ -1,36 +1,36 @@ # nixos-macbook NixOS config for my Macbook Pro (2011) -``` +- Flakes +- No home manager - ▗▄▄▄ ▗▄▄▄▄ ▄▄▄▖ user@macbook + +``` + ▗▄▄▄ ▗▄▄▄▄ ▄▄▄▖ tootbrute@macbook ▜███▙ ▜███▙ ▟███▛ ------------- - ▜███▙ ▜███▙▟███▛ OS: NixOS 24.05.5385.1719f27dd95f (Uakari) x86_64 + ▜███▙ ▜███▙▟███▛ OS: NixOS 24.11 (Vicuna) x86_64 ▜███▙ ▜██████▛ Host: MacBookPro7,1 (1.0) - ▟█████████████████▙ ▜████▛ ▟▙ Kernel: Linux 6.6.52 - ▟███████████████████▙ ▜███▙ ▟██▙ Uptime: 50 mins - ▄▄▄▄▖ ▜███▙ ▟███▛ Shell: bash 5.2.32 - ▟███▛ ▜██▛ ▟███▛ Display (Unknown 15.6"): 1280x800 @ 60Hz - ▟███▛ ▜▛ ▟███▛ DE: Gnome 46.2 -▟███████████▛ ▟██████████▙ WM: Mutter (Wayland) -▜██████████▛ ▟███████████▛ WM Theme: Adwaita - ▟███▛ ▟▙ ▟███▛ Theme: Adwaita [GTK2/3/4] - ▟███▛ ▟██▙ ▟███▛ Icons: Adwaita [GTK2/3/4] - ▟███▛ ▜███▙ ▝▀▀▀▀ Font: Cantarell (11pt) [GTK2/3/4] - ▜██▛ ▜███▙ ▜██████████████████▛ Cursor: Adwaita (24px) - ▜▛ ▟████▙ ▜████████████████▛ Terminal: GNOME Console 46.0 - ▟██████▙ ▜███▙ Terminal Font: Source Code Pro (10pt) - ▟███▛▜███▙ ▜███▙ CPU: Intel(R) Core(TM)2 Duo P8600 (2) @ 2.39 GHz - ▟███▛ ▜███▙ ▜███▙ GPU: NVIDIA GeForce 320M [Discrete] - ▝▀▀▀ ▀▀▀▀▘ ▀▀▀▘ Memory: 1.93 GiB / 5.54 GiB (35%) + ▟█████████████████▙ ▜████▛ ▟▙ Kernel: Linux 6.6.92 + ▟███████████████████▙ ▜███▙ ▟██▙ Uptime: 3 hours, 6 mins + ▄▄▄▄▖ ▜███▙ ▟███▛ Packages: 23 (flatpak) + ▟███▛ ▜██▛ ▟███▛ Shell: bash 5.2.37 + ▟███▛ ▜▛ ▟███▛ Display (Unknown 15.6"): 1280x800 @ 60 Hz in 16" +▟███████████▛ ▟██████████▙ DE: GNOME 47.2 +▜██████████▛ ▟███████████▛ WM: Mutter (Wayland) + ▟███▛ ▟▙ ▟███▛ WM Theme: Adwaita + ▟███▛ ▟██▙ ▟███▛ Theme: Adwaita [GTK2/3/4] + ▟███▛ ▜███▙ ▝▀▀▀▀ Icons: Adwaita [GTK2/3/4] + ▜██▛ ▜███▙ ▜██████████████████▛ Font: Cantarell (11pt) [GTK2/3/4] + ▜▛ ▟████▙ ▜████████████████▛ Cursor: Adwaita (24px) + ▟██████▙ ▜███▙ Terminal: GNOME Console 47.1 + ▟███▛▜███▙ ▜███▙ Terminal Font: Source Code Pro (10pt) + ▟███▛ ▜███▙ ▜███▙ CPU: Intel(R) Core(TM)2 Duo P8600 (2) @ 2.39 GHz + ▝▀▀▀ ▀▀▀▀▘ ▀▀▀▘ GPU: NVIDIA GeForce 320M [Discrete] + Memory: 1.08 GiB / 5.54 GiB (19%) Swap: 0 B / 8.78 GiB (0%) - Disk (/): 10.06 GiB / 219.00 GiB (5%) - ext4 - Local IP (wlp2s0): 192.168.15.132/24 * - Battery: 0% [AC Connected] + Disk (/): 49.34 GiB / 219.00 GiB (23%) - ext4 + Local IP (wlp2s0): 192.168.15.132/24 + Battery (bq20z451): 0% [AC Connected] Locale: en_US.UTF-8 - ████████████████████████ - ████████████████████████ - - ``` diff --git a/old-configuration.nix b/old-configuration.nix deleted file mode 100644 index 1cf211e..0000000 --- a/old-configuration.nix +++ /dev/null @@ -1,253 +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 -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, ...}: - -{ - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ./gnome.nix - ]; - - # Nix flakes support - nix.settings.experimental-features = [ "nix-command" "flakes"]; - - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.grub.configurationLimit = 10; - - boot.initrd.luks.devices."luks-4060c1c6-89ef-4d17-9ef1-0d86c907a48f".device = "/dev/disk/by-uuid/4060c1c6-89ef-4d17-9ef1-0d86c907a48f"; - networking.hostName = "macbook"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Clear /tmp during boot - boot.tmp.cleanOnBoot = true; - - # Housekeeping: Garbage collection - nix.gc.automatic = true; - nix.optimise.automatic = true; - - # Increase buffer size - nix.settings.download-buffer-size = "4G"; - - # Disable sudo password for the wheel group - security.sudo.wheelNeedsPassword = false; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Enable networking - networking.networkmanager.enable = true; - -# Nvidia card -# Enable OpenGL - hardware.opengl = { - enable = true; - }; - - # Load nvidia driver for Xorg and Wayland -# services.xserver.videoDrivers = ["nvidia"]; - - - #marked broken in 25.05 - # error: Package ‘nvidia-x11-340.108-6.12.30’ in /nix/store/030zwnyrng6gx425qdzmvdi9aqasi27m-nixos-25.05/nixos/pkgs/os-specific/linux/nvidia-x11/generic.nix:320 is marked as broken, refusing to evaluate. -/* - hardware.nvidia = { - - # Modesetting is required. - modesetting.enable = true; - - # Nvidia power management. Experimental, and can cause sleep/suspend to fail. - # Enable this if you have graphical corruption issues or application crashes after waking - # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead - # of just the bare essentials. - powerManagement.enable = false; - - # Fine-grained power management. Turns off GPU when not in use. - # Experimental and only works on modern Nvidia GPUs (Turing or newer). - #powerManagement.finegrained = false; - - # Use the NVidia open source kernel module (not to be confused with the - # independent third-party "nouveau" open source driver). - # Support is limited to the Turing and later architectures. Full list of - # supported GPUs is at: - # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus - # Only available from driver 515.43.04+ - # Currently alpha-quality/buggy, so false is currently the recommended setting. - open = false; - - # Enable the Nvidia settings menu, - # accessible via `nvidia-settings`. - nvidiaSettings = true; - - # Optionally, you may need to select the appropriate driver version for your specific GPU. - package = config.boot.kernelPackages.nvidiaPackages.legacy_340; - }; -*/ - - # Set your time zone. - time.timeZone = "Asia/Taipei"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_US.UTF-8"; - LC_IDENTIFICATION = "en_US.UTF-8"; - LC_MEASUREMENT = "en_US.UTF-8"; - LC_MONETARY = "en_US.UTF-8"; - LC_NAME = "en_US.UTF-8"; - LC_NUMERIC = "en_US.UTF-8"; - LC_PAPER = "en_US.UTF-8"; - LC_TELEPHONE = "en_US.UTF-8"; - LC_TIME = "en_US.UTF-8"; - }; - - i18n.inputMethod.enabled = "fcitx5"; - i18n.inputMethod.fcitx5.addons = with pkgs; [ - fcitx5-chewing - fcitx5-chinese-addons - #fcitx5-mcbopomofo - #fcitx5-pinyin-zhwiki - #fcitx5-pinyin-moegirl - fcitx5-table-other - fcitx5-table-extra - fcitx5-gtk - fcitx5-rime - ]; - - # Enable the X11 windowing system. - services.xserver.enable = true; - - # Enable the GNOME Desktop Environment. - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; - # remove xterm - services.xserver.excludePackages = [ pkgs.xterm ]; - services.xserver.desktopManager.xterm.enable = false; - - # Configure keymap in X11 - services.xserver.xkb = { - layout = "us"; - variant = ""; - }; - - # Enable CUPS to print documents. - services.printing.enable = true; - - # Enable sound with pipewire. - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - # If you want to use JACK applications, uncomment this - #jack.enable = true; - - # use the example session manager (no others are packaged yet so this is enabled by default, - # no need to redefine it in your config for now) - #media-session.enable = true; - }; - - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.elias = { - isNormalUser = true; - description = "elias"; - extraGroups = [ "networkmanager" "wheel" ]; - packages = with pkgs; [ - # thunderbird - ]; - }; - - # Enable automatic login for the user. - services.displayManager.autoLogin.enable = true; - services.displayManager.autoLogin.user = "elias"; - - # Workaround for GNOME autologin: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229 - systemd.services."getty@tty1".enable = false; - systemd.services."autovt@tty1".enable = false; - - # Install firefox. - programs.firefox.enable = true; - - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - nixpkgs.config.nvidia.acceptLicense = 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 - fastfetch - curl - keepassxc - git - htop - nextcloud-client - libreoffice-fresh - hunspell #dictionary for libreoffice - hunspellDicts.en_CA - hunspellDicts.en_US - ]; - - # Fonts - fonts.packages = with pkgs; [ - corefonts - vistafonts - noto-fonts - noto-fonts-cjk - noto-fonts-emoji - liberation_ttf - fira-code - fira-code-symbols - mplus-outline-fonts.githubRelease - dina-font - proggyfonts - ]; - - fonts.fontDir.enable = true; - - # 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; - - # Tailscale - services.tailscale.enable = true; - - # Flatpak - services.flatpak.enable = true; - - # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [ 22 ]; - # 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 = "24.05"; # Did you read the comment? - -} diff --git a/old-rebuild.sh b/old-rebuild.sh deleted file mode 100755 index cb7a843..0000000 --- a/old-rebuild.sh +++ /dev/null @@ -1,2 +0,0 @@ -sudo nixos-rebuild switch -I nixos-config=/home/elias/nixos-config/configuration.nix -