diff --git a/devshells/idris2.nix b/devshells/idris2.nix index 358cfea..0a03015 100644 --- a/devshells/idris2.nix +++ b/devshells/idris2.nix @@ -11,10 +11,19 @@ { devShells.idris2 = let - libPackages = with pkgs; [ - readline70 - openssl - ]; + rakudo_env = pkgs.buildEnv { + name = "rakudo-env"; + paths = with pkgs; [ + rakudo + zef + ]; + pathsToLink = [ + "/bin" + "/lib" + "/share" + ]; + }; + libPackages = with pkgs; [ readline70 openssl ]; in pkgs.mkShell { buildInputs = @@ -28,6 +37,7 @@ gnumake chez rlwrap + rakudo_env ] ++ libPackages; shellHook = '' diff --git a/flake.nix b/flake.nix index d40d6bf..0f06d06 100644 --- a/flake.nix +++ b/flake.nix @@ -21,52 +21,40 @@ }; outputs = - inputs@{ flake-parts, self, ... }: + inputs@{ flake-parts, ... }: flake-parts.lib.mkFlake { inherit inputs; } { imports = [ inputs.devshell.flakeModule ./nixos/machines/wsl/configuration.nix ./nixos/machines/installer/configuration.nix - ./nixos/machines/crash/machine.nix ./home-manager/machines/wsl/home.nix - ./home-manager/machines/crash/home.nix ./devshells/rust.nix ./devshells/idris2.nix ./devshells/raku.nix ]; - config = { - systems = [ - "x86_64-linux" - "aarch64-linux" - "aarch64-darwin" - "x86_64-darwin" - ]; - perSystem = - { - config, - self', - inputs', - pkgs, - system, - ... - }: - { - # Per-system attributes can be defined here. The self' and inputs' - # module parameters provide easy access to attributes of the same - # system. - - # Equivalent to inputs'.nixpkgs.legacyPackages.hello; - packages.default = pkgs.hello; - }; - }; - options = with inputs.nixpkgs.lib; { - flake = flake-parts.lib.mkSubmoduleOptions { - homeConfigurations = mkOption { - type = types.lazyAttrsOf types.raw; - default = { }; - }; + systems = [ + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; + perSystem = + { + config, + self', + inputs', + pkgs, + system, + ... + }: + { + # Per-system attributes can be defined here. The self' and inputs' + # module parameters provide easy access to attributes of the same + # system. + # Equivalent to inputs'.nixpkgs.legacyPackages.hello; + packages.default = pkgs.hello; }; - }; + flake = { }; }; } diff --git a/home-manager/machines/crash/home.nix b/home-manager/machines/crash/home.nix deleted file mode 100644 index 29d578f..0000000 --- a/home-manager/machines/crash/home.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ withSystem, inputs, ... }: -{ - # perSystem = { ... }: { config.packages.hello = ...; }; - - flake.homeConfigurations.crash = withSystem "x86_64-linux" ( - ctx@{ config, inputs', ... }: - inputs.home-manager.lib.homeManagerConfiguration { - pkgs = inputs.nixpkgs.legacyPackages.${"x86_64-linux"}; - extraSpecialArgs = { - inherit inputs inputs'; - packages = config.packages; - }; - modules = [ - ( - { - config, - lib, - pkgs, - ... - }: - { - imports = [ - ../../modules/programs/shell.nix - ../../modules/programs/neovim.nix - (import ../../modules/programs/git.nix { }) - ../../modules/programs/core.nix - ../../modules/programs/devel.nix - ../../modules/programs/ssh.nix - (import ../../modules/programs/emacs.nix { }) - ../../modules/programs/fonts.nix - ../../modules/programs/desktop.nix - ]; - home.username = "nathan"; - home.homeDirectory = "/home/nathan/"; - programs.command-not-found.enable = true; - home.stateVersion = "24.11"; - programs.home-manager.enable = true; - - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - - # Machine specific configuration - services.emacs.defaultEditor = true; - - systemd.user.targets.tray = { - Unit = { - Description = "Home Manager System Tray"; - Requires = [ "graphical-session-pre.target" ]; - }; - }; - } - ) - ]; - } - ); -} diff --git a/home-manager/modules/programs/desktop.nix b/home-manager/modules/programs/desktop.nix deleted file mode 100644 index a76748b..0000000 --- a/home-manager/modules/programs/desktop.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - config, - lib, - pkgs, - inputs', - ... -}: - -{ - home.packages = with pkgs; [ - webcord-vencord - spotify - protonmail-desktop - inputs'.nixpkgs-unstable.legacyPackages.ente-web - protonvpn-gui - calibre - ]; - - services.syncthing = { - enable = true; - tray = { - enable = true; - }; - }; - -} diff --git a/home-manager/modules/programs/emacs.nix b/home-manager/modules/programs/emacs.nix index 18301c8..cf61e4d 100644 --- a/home-manager/modules/programs/emacs.nix +++ b/home-manager/modules/programs/emacs.nix @@ -72,8 +72,4 @@ in )) ]; }; - services.emacs = { - enable = true; - client.enable = true; - }; } diff --git a/home-manager/modules/programs/ssh.nix b/home-manager/modules/programs/ssh.nix index 8211f7c..f3a2f24 100644 --- a/home-manager/modules/programs/ssh.nix +++ b/home-manager/modules/programs/ssh.nix @@ -19,7 +19,8 @@ controlMaster = "auto"; controlPersist = "10m"; # Configure known hosts - matchBlocks = { - }; + matchBlocks = + { + }; }; } diff --git a/nixos/machines/crash/configuration.nix b/nixos/machines/crash/configuration.nix deleted file mode 100644 index 50138ba..0000000 --- a/nixos/machines/crash/configuration.nix +++ /dev/null @@ -1,164 +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 = [ - ]; - - programs.ssh.extraConfig = '' - Host eu.nixbuild.net - PubkeyAcceptedKeyTypes ssh-ed25519 - ServerAliveInterval 60 - IPQoS throughput - IdentityFile /home/nathan/.ssh/id_ed25519 - ''; - - programs.ssh.knownHosts = { - nixbuild = { - hostNames = [ "eu.nixbuild.net" ]; - publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIQCZc54poJ8vqawd8TraNryQeJnvH1eLpIDgbiqymM"; - }; - }; - - nix = { - settings = { - auto-optimise-store = true; - trusted-users = [ - "root" - "nathan" - ]; - }; - gc = { - automatic = true; - dates = "hourly"; - options = "--delete-older-than 7d"; - }; - distributedBuilds = true; - buildMachines = [ - { - hostName = "eu.nixbuild.net"; - system = "x86_64-linux"; - maxJobs = 100; - supportedFeatures = [ - "benchmark" - "big-parallel" - ]; - } - ]; - }; - - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - networking.hostName = "crash"; # Define your hostname. - - services.tailscale.enable = true; - - networking.networkmanager.enable = true; - - # Set your time zone. - time.timeZone = "America/New_York"; - - # 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"; - }; - - # Enable the X11 windowing system. - # You can disable this if you're only using the Wayland session. - services.xserver.enable = true; - - # Enable the KDE Plasma Desktop Environment. - services.displayManager.sddm.enable = true; - services.desktopManager.plasma6.enable = true; - environment.sessionVariables.NIXOS_OZONE_WL = "1"; - # Setup bluetooth - hardware.bluetooth.enable = true; - - # 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.nathan = { - extraGroups = [ "networkmanager" ]; - }; - - # Install firefox. - programs.firefox.enable = 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; - - # 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 = "24.11"; # Did you read the comment? - -} diff --git a/nixos/machines/crash/hardware.nix b/nixos/machines/crash/hardware.nix deleted file mode 100644 index cca4031..0000000 --- a/nixos/machines/crash/hardware.nix +++ /dev/null @@ -1,54 +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" - "nvme" - "usb_storage" - "sd_mod" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/0a846b89-7219-47c1-9db5-362e3c018964"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/D1C9-AFA9"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" - ]; - }; - - swapDevices = [ - { device = "/dev/disk/by-uuid/bf35a46f-552c-4b37-a68b-c2fcf132f359"; } - ]; - - # 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.wlp0s20f3.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/nixos/machines/crash/machine.nix b/nixos/machines/crash/machine.nix deleted file mode 100644 index be21325..0000000 --- a/nixos/machines/crash/machine.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ withSystem, inputs, ... }: -{ - # perSystem = { ... }: { config.packages.hello = ...; }; - - flake.nixosConfigurations.crash = withSystem "x86_64-linux" ( - ctx@{ config, inputs', ... }: - inputs.nixpkgs.lib.nixosSystem { - # Expose `packages`, `inputs` and `inputs'` as module arguments. - # Use specialArgs permits use in `imports`. - # Note: if you publish modules for reuse, do not rely on specialArgs, but - # on the flake scope instead. See also https://flake.parts/define-module-in-separate-file.html - specialArgs = { - packages = config.packages; - inherit inputs inputs'; - }; - modules = [ - ( - { - config, - lib, - pkgs, - ... - }: - - { - imports = [ - # Hardware support - inputs.nixos-hardware.nixosModules.microsoft-surface-common - # Our modules - (import ../../modules/base.nix { inherit inputs; }) - (import ./configuration.nix) - (import ./hardware.nix) - (import ../../modules/user.nix { - inherit inputs; - mutableUsers = false; - }) - ]; - - nix.settings.experimental-features = [ - "nix-command" - "flakes" - ]; - - } - ) - ]; - } - ); -} diff --git a/nixos/machines/wsl/configuration.nix b/nixos/machines/wsl/configuration.nix index 1d6b1e0..a79c28d 100644 --- a/nixos/machines/wsl/configuration.nix +++ b/nixos/machines/wsl/configuration.nix @@ -45,7 +45,7 @@ services.tailscale.enable = true; - nix.settings.system-features = [ "x86_64-linux" ]; + nix.settings.system-features = ["x86_64-linux"]; nix.settings.experimental-features = [ "nix-command" diff --git a/nixos/modules/user.nix b/nixos/modules/user.nix index dfab48a..168cb26 100644 --- a/nixos/modules/user.nix +++ b/nixos/modules/user.nix @@ -27,7 +27,7 @@ ]; hashedPassword = "$6$ShBAPGwzKZuB7eEv$cbb3erUqtVGFo/Vux9UwT2NkbVG9VGCxJxPiZFYL0DIc3t4GpYxjkM0M7fFnh.6V8MoSKLM/TvOtzdWbYwI58."; openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEtE+KjKuHUj5bKKQBDKqhO5dpEQf8E8u1G6kRj7y6dI nathan@nixos" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEtE+KjKuHUj5bKKQBDKqhO5dpEQf8E8u1G6kRj7y6dI nathan@nixos" ]; };