diff --git a/nixos/flake.nix b/nixos/flake.nix index 1c4e895..d21ce2d 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -3,6 +3,12 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; vscode-server.url = "github:nix-community/nixos-vscode-server"; + + # nix-darwin for macOS + # (follows nixpkgs so both use the same channel) + nix-darwin.url = "github:nix-darwin/nix-darwin/master"; + nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; + # for later # home-manager.url = "github:nix-community/home-manager"; # home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -12,18 +18,18 @@ nixpkgs, nixos-wsl, vscode-server, + nix-darwin, self, # home-manager, ... }: { nixosConfigurations = { - wsl = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ nixos-wsl.nixosModules.default vscode-server.nixosModules.default - ./hosts/wsl.nix # previously configuration.nix + ./hosts/wsl.nix ./tmux.nix ./neovim.nix ./fish.nix @@ -36,14 +42,27 @@ modules = [ nixos-wsl.nixosModules.default vscode-server.nixosModules.default - # ./hosts/macbookair.nix # previously configuration.nix + vscode-server.nixosModules.default + ./hosts/macbookair.nix + ./hardware-configuration.nix ./tmux.nix ./neovim.nix ./fish.nix # home-manager.nixosModules.default ]; }; + }; + # macOS (nix-darwin) configuration + darwinConfigurations."Daniel-Macbook-Air" = nix-darwin.lib.darwinSystem { + modules = [ + ./hosts/macos.nix + # TODO: nix-darwin lacks tmux options; move to Home Manager.x + # ./tmux.nix + # TODO: add neovim via homemanager, that should work the same for NixOS as Nix-Darwin + # ./neovim.nix # NOTE: Option only exists on NixOS. + ./fish.nix + ]; }; }; } diff --git a/nixos/hosts/macbookair.nix b/nixos/hosts/macbookair.nix new file mode 100644 index 0000000..4e8212e --- /dev/null +++ b/nixos/hosts/macbookair.nix @@ -0,0 +1,195 @@ +# 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, ... }: + +{ + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + boot.initrd.luks.devices."luks-04715655-635c-46ee-8100-1a5a4f3700a5".device = "/dev/disk/by-uuid/04715655-635c-46ee-8100-1a5a4f3700a5"; + networking.hostName = "nixos"; # Define your hostname. + # NOTE: You can not use networking.networkmanager with networking.wireless + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + nix.settings.experimental-features = [ "nix-command" "flakes" ]; # for vscode remote server + + # 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; + + # Set your time zone. + time.timeZone = "Europe/Copenhagen"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_DK.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "da_DK.UTF-8"; + LC_IDENTIFICATION = "da_DK.UTF-8"; + LC_MEASUREMENT = "da_DK.UTF-8"; + LC_MONETARY = "da_DK.UTF-8"; + LC_NAME = "da_DK.UTF-8"; + LC_NUMERIC = "da_DK.UTF-8"; + LC_PAPER = "da_DK.UTF-8"; + LC_TELEPHONE = "da_DK.UTF-8"; + LC_TIME = "da_DK.UTF-8"; + }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the KDE Plasma Desktop Environment. + services.displayManager.sddm.enable = true; + services.desktopManager.plasma6.enable = true; + + # Configure keymap in X11 + services.xserver = { + xkb.layout = "us"; + xkb.variant = ""; + }; + + programs.nix-ld.enable = true; + # TODO: move to home manager (?) + programs = { + direnv = { + enable = true; + enableFishIntegration = true; + nix-direnv.enable = true; + }; + }; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + services.pulseaudio.enable = false; + hardware.alsa.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.dth = { + isNormalUser = true; + description = "dth"; + extraGroups = [ "networkmanager" "wheel" ]; + # TODO: use home manager to define user packages + packages = with pkgs; [ + vlc # video player + # kate # editor + ripgrep # faster grep + nextcloud-client # private cloud + # digikam # photo / video management + # thunderbird # bloat + ]; + }; + + # Install firefox. + programs.firefox.enable = true; + + # install kde partition manager + programs.partition-manager.enable = true; + + # TODO: install gnome disk manager + # programs.gnome-disks.enable = true; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + nixpkgs.config.permittedInsecurePackages = [ + "broadcom-sta-6.30.223.271-57-6.12.40" + ]; + + boot.kernelModules = [ "wl" ]; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + + # tmux # activated in tmux.nix + # vim # using neovim in stead + # neovim # activated in neovim.nix + + git # version control + gh # github cli tool + + ripgrep # faster grep + busybox # useful programs e.g. tree, unzip etc + openssl # cryptography swiss army knife + xdg-utils # terminal desktop intergrations (i.e. allow terminal to open browser) + xclip # terminal clipboard integration (i.e. allow terminal to r/w clipboard) + + neofetch # system info + btop # resource monitor + wget # downloader + tldr # community driven manpage alternative + + ntfs3g # mount NTFS drives on linux + gptfdisk # formatting drives - like fdisk but better + # this stuff runs gparted + + # gimp # bloat image editing + # blender # bloat 3D modelling + # inkscape # bloat vector graphics / drawing + kdePackages.kdenlive # bloat video editor + + # desktop applications + thunderbird # email / calendar + telegram-desktop # instant messager + + cowsay + lolcat + + ]; + + # firefox smooth scrolling + environment.sessionVariables = { + MOZ_USE_XINPUT2 = "1"; + }; + + # 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; + + # 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 = "23.11"; # Did you read the comment? + +} diff --git a/nixos/hosts/macos.nix b/nixos/hosts/macos.nix new file mode 100644 index 0000000..f55869c --- /dev/null +++ b/nixos/hosts/macos.nix @@ -0,0 +1,74 @@ +{ config, lib, pkgs, ... }: + +{ + # Apple Silicon + nix-darwin basics + nixpkgs.hostPlatform = "aarch64-darwin"; + nix.enable = false; # Determinate manages Nix + + nixpkgs.config.allowUnfree = true; + + system.primaryUser = "danny"; + + # Shells & dev ergonomics + programs.fish.enable = true; + environment.shells = [ pkgs.fish ]; + # If you want fish as default shell, uncomment: + # users.defaultUserShell = pkgs.fish; + + programs.direnv.enable = true; + programs.direnv.nix-direnv.enable = true; + + # Networking (macOS-safe) + networking = { + # Set if you want a specific hostname in macOS UI as well: + hostName = "Daniel-Macbook-Air"; + knownNetworkServices = [ "Wi-Fi" "Thunderbolt Bridge" ]; + }; + + # macOS niceties + security.pam.services.sudo_local.touchIdAuth = true; + + system.defaults = { + # Keyboard + NSGlobalDomain = { + AppleShowAllExtensions = true; + ApplePressAndHoldEnabled = true; + "com.apple.mouse.tapBehavior" = 1; + "com.apple.sound.beep.volume" = 0.0; + "com.apple.sound.beep.feedback" = 0; + }; + + # Finder & Dock + finder.AppleShowAllExtensions = true; + dock.autohide = true; + dock.mru-spaces = false; + }; + + # Environment + environment.variables = { + DBT_USER = "DNTH"; + }; + + environment.systemPackages = with pkgs; [ + gh + ripgrep + wget + # busybox #TODO: doesn't run on darwin + git + gnupg + coreutils + openssl + neofetch + btop + tldr + fzf + cowsay + lolcat + neovim + ]; + + # Keep for darwin as well (tracks defaults across upgrades) + # current max per nix-darwin; bump only if a release notes says so + system.stateVersion = 6; + +} diff --git a/nixos/hosts/wsl.nix b/nixos/hosts/wsl.nix index ceaeb42..c2817b9 100644 --- a/nixos/hosts/wsl.nix +++ b/nixos/hosts/wsl.nix @@ -55,7 +55,6 @@ # tmux # activated in tmux.nix # vim # using neovim in stead # neovim # activated in neovim.nix - mpv # cli music player git # version control gh # github cli tool diff --git a/nixos/neovim.nix b/nixos/neovim.nix index ed64a44..6fc589b 100644 --- a/nixos/neovim.nix +++ b/nixos/neovim.nix @@ -79,4 +79,3 @@ }; }; } - diff --git a/nixos/readme.md b/nixos/readme.md index 2ec2f5a..e19093b 100644 --- a/nixos/readme.md +++ b/nixos/readme.md @@ -1,7 +1,7 @@ Rebuild nixos and points to dotfiles dir: ``` -sudo nixos-rebuild switch --flake ~/dotfiles/nixos#macbook +sudo nixos-rebuild switch --flake ~/dotfiles/nixos#macbookair # or sudo nixos-rebuild switch --flake ~/dotfiles/nixos#wsl ``` diff --git a/nixos/wsl.conf b/nixos/wsl.conf new file mode 100644 index 0000000..202ffe7 --- /dev/null +++ b/nixos/wsl.conf @@ -0,0 +1,23 @@ +# this file goes here: /etc/wsl.conf +[automount] +enabled=true +ldconfig=false +mountFsTab=false +options=metadata,uid=1000,gid=100 +root=/mnt + +[boot] +command= +systemd=true + +[interop] +appendWindowsPath=true +enabled=true + +[network] +generateHosts=true +generateResolvConf=false +hostname=nixos + +[user] +default=nixos