diff --git a/flake.lock b/flake.lock index 045f597..591b18b 100644 --- a/flake.lock +++ b/flake.lock @@ -1826,8 +1826,10 @@ "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-25_05": { diff --git a/systems/x86_64-linux/fortuna/default.nix b/systems/x86_64-linux/fortuna/default.nix deleted file mode 100644 index 29b8022..0000000 --- a/systems/x86_64-linux/fortuna/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - modulesPath, - lib, - pkgs, - ... -}: { - imports = [ - ./disk-config.nix - ]; - - disko.devices.disk.main.device = "/dev/vda"; - - boot.loader.grub = { - # no need to set devices, disko will add all devices that have a EF02 partition to the list already - # devices = [ ]; - efiSupport = true; - efiInstallAsRemovable = true; - }; - services.openssh.enable = true; - - services = { - desktopManager.plasma6.enable = true; - - displayManager.sddm.enable = true; - - displayManager.sddm.wayland.enable = true; - }; - - networking.hostName = "fortuna"; - networking.hostId = "fortuna"; - - programs.zsh.enable = true; - - environment.systemPackages = map lib.lowPrio [ - pkgs.curl - pkgs.gitMinimal - ]; - - users.users.root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFuw7D+qDzzxBKsfKEmMd7odc98m3ZEnqWYFtuKwvC9k zoey@earth" - ]; - - users.users.zoey = { - isNormalUser = true; - description = "zoey"; - extraGroups = ["networkmanager" "wheel" "docker" "libvirtd" "plugdev"]; - shell = pkgs.zsh; - initialHashedPassword = "$6$rounds=2000000$rFBJH7LwdEHvv.0i$HdHorWqp8REPdWPk5fEgZXX1TujRJkMxumGK0f0elFN0KRPlBjJMW2.35A.ID/o3eC/hGTwbSJAcJcwVN2zyV/"; - }; - - system.stateVersion = "24.11"; -} diff --git a/systems/x86_64-linux/fortuna/disk-config.nix b/systems/x86_64-linux/fortuna/disk-config.nix deleted file mode 100644 index 8550430..0000000 --- a/systems/x86_64-linux/fortuna/disk-config.nix +++ /dev/null @@ -1,80 +0,0 @@ -# USAGE in your configuration.nix. -# Update devices to match your hardware. -# { -# imports = [ ./disko-config.nix ]; -# disko.devices.disk.main.device = "/dev/sda"; -# } -{ - disko.devices = { - disk = { - main = { - type = "disk"; - content = { - type = "gpt"; - partitions = { - ESP = { - size = "1G"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ "umask=0077" ]; - }; - }; - zfs = { - size = "100%"; - content = { - type = "zfs"; - pool = "zroot"; - }; - }; - }; - }; - }; - }; - zpool = { - zroot = { - type = "zpool"; - rootFsOptions = { - # https://wiki.archlinux.org/title/Install_Arch_Linux_on_ZFS - acltype = "posixacl"; - atime = "off"; - compression = "zstd"; - mountpoint = "none"; - xattr = "sa"; - }; - options.ashift = "12"; - - datasets = { - "local" = { - type = "zfs_fs"; - options.mountpoint = "none"; - }; - "local/home" = { - type = "zfs_fs"; - mountpoint = "/home"; - # Used by services.zfs.autoSnapshot options. - options."com.sun:auto-snapshot" = "true"; - }; - "local/nix" = { - type = "zfs_fs"; - mountpoint = "/nix"; - options."com.sun:auto-snapshot" = "false"; - }; - "local/persist" = { - type = "zfs_fs"; - mountpoint = "/persist"; - options."com.sun:auto-snapshot" = "false"; - }; - "local/root" = { - type = "zfs_fs"; - mountpoint = "/"; - options."com.sun:auto-snapshot" = "false"; - postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/local/root@blank$' || zfs snapshot zroot/local/root@blank"; - }; - }; - }; - }; - }; -} \ No newline at end of file diff --git a/systems/x86_64-linux/fortuna/hardware-configuration.nix b/systems/x86_64-linux/fortuna/hardware-configuration.nix deleted file mode 100644 index b59e196..0000000 --- a/systems/x86_64-linux/fortuna/hardware-configuration.nix +++ /dev/null @@ -1,26 +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 + "/profiles/qemu-guest.nix") - ]; - - boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - swapDevices = [ ]; - - # 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.enp1s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -}