From 4188df087c133fe1899641d43b20b326253cab98 Mon Sep 17 00:00:00 2001 From: sefidel Date: Sat, 16 Sep 2023 19:01:53 +0900 Subject: feat(darwin)!: remove darwin --- nixos/default.nix | 10 -- nixos/kompakt/configuration.nix | 189 ------------------------------- nixos/kompakt/hardware-configuration.nix | 58 ---------- nixos/kompakt/secrets/secrets.yaml | 31 ----- 4 files changed, 288 deletions(-) delete mode 100644 nixos/kompakt/configuration.nix delete mode 100644 nixos/kompakt/hardware-configuration.nix delete mode 100644 nixos/kompakt/secrets/secrets.yaml (limited to 'nixos') diff --git a/nixos/default.nix b/nixos/default.nix index bc14379..ecf182c 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -34,14 +34,4 @@ inputs.impermanence.nixosModules.impermanence ]; }; - - kompakt = self.lib.mkSystem { - name = "kompakt"; - system = "aarch64-linux"; - nixpkgs = unstable-small; - extraModules = [ - inputs.sops-nix.nixosModules.sops - inputs.impermanence.nixosModules.impermanence - ]; - }; } diff --git a/nixos/kompakt/configuration.nix b/nixos/kompakt/configuration.nix deleted file mode 100644 index 31a0a5c..0000000 --- a/nixos/kompakt/configuration.nix +++ /dev/null @@ -1,189 +0,0 @@ -{ config, lib, pkgs, apple-silicon, asahi-firmware, ... }: - -{ - imports = - [ - ./hardware-configuration.nix - apple-silicon.nixosModules.apple-silicon-support - ]; - - nixpkgs.overlays = [ apple-silicon.overlays.apple-silicon-overlay ]; - - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = false; - - # Specify path to peripheral firmware files. - # This lets the flake stay pure. - hardware.asahi.peripheralFirmwareDirectory = asahi-firmware; - # Or completely disable extraction and managemement of them completely: - # hardware.asahi.extractPeripheralFirmware = false; - - # Enable GPU acceleration - # TODO: Fix scaling issue - # hardware.asahi.useExperimentalGPUDriver = true; - # hardware.asahi.experimentalGPUInstallMode = "overlay"; - hardware.opengl.enable = true; - - boot.kernelParams = [ - "console=tty1" - ]; - - boot.supportedFilesystems = [ "zfs" ]; - - networking.hostName = "kompakt"; - networking.hostId = "9c8c0140"; - - boot.initrd.postDeviceCommands = lib.mkAfter '' - zfs rollback -r rpool/local/root@blank - ''; - - networking.wireless.iwd.enable = true; - hardware.bluetooth.enable = true; - - time.timeZone = "Asia/Seoul"; - - i18n.defaultLocale = "en_US.UTF-8"; - console = { - font = "ter-v32n"; - packages = with pkgs; [ terminus_font ]; - }; - - services.printing.enable = true; - - sound.enable = false; - - services.pipewire = { - enable = true; - - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - # Backlight control - programs.light.enable = true; - services.actkbd = { - enable = true; - bindings = [ - { keys = [ 224 ]; events = [ "key" ]; command = "/run/current-system/sw/bin/light -U 10"; } - { keys = [ 225 ]; events = [ "key" ]; command = "/run/current-system/sw/bin/light -A 10"; } - ]; - }; - - fonts = { - fontDir.enable = true; - - packages = with pkgs; [ - dina-font - jetbrains-mono - sarasa-gothic - siji - emacs-all-the-icons-fonts - twemoji-color-font - (nerdfonts.override { fonts = [ "Iosevka" "JetBrainsMono" ]; }) - ]; - - fontconfig = { - enable = true; - - defaultFonts = { - serif = [ - "Sarasa Gothic C" - "Sarasa Gothic J" - "Sarasa Gothic K" - ]; - - sansSerif = [ - "Sarasa Gothic C" - "Sarasa Gothic J" - "Sarasa Gothic K" - ]; - - monospace = [ - "Dina" - "Iosevka Nerd Font" - "JetBrainsMono Nerd Font" - ]; - - emoji = [ - "Siji" - "Twitter Color Emoji" - ]; - }; - }; - }; - - services.greetd = { - enable = true; - vt = 2; - - settings.default_session.command = "${pkgs.greetd.tuigreet}/bin/tuigreet -t -c sway"; - }; - - programs = { - sway.enable = true; - sway.extraPackages = lib.mkForce [ ]; - - zsh.enable = true; - zsh.enableCompletion = false; - }; - - xdg.portal = { - enable = true; - extraPortals = with pkgs; [ - xdg-desktop-portal-gtk - xdg-desktop-portal-wlr - ]; - }; - - sops.defaultSopsFile = ./secrets/secrets.yaml; - sops.secrets.root-password.neededForUsers = true; - sops.secrets.sefidel-password.neededForUsers = true; - - users.mutableUsers = false; - - users.users = { - root.hashedPasswordFile = config.sops.secrets.root-password.path; - sefidel = { - isNormalUser = true; - shell = pkgs.zsh; - hashedPasswordFile = config.sops.secrets.sefidel-password.path; - - extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - }; - }; - - services.openssh.enable = true; - services.openssh.hostKeys = [ - { - path = "/persist/ssh/ssh_host_ed25519_key"; - type = "ed25519"; - } - { - path = "/persist/ssh/ssh_host_rsa_key"; - type = "rsa"; - bits = 4096; - } - ]; - - environment.systemPackages = with pkgs; [ - git - ]; - - environment.persistence."/persist".directories = [ - "/var/lib/iwd" - "/etc/nixos" - ]; - - fileSystems."/persist".neededForBoot = true; - - # 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.05"; # Did you read the comment? - -} - diff --git a/nixos/kompakt/hardware-configuration.nix b/nixos/kompakt/hardware-configuration.nix deleted file mode 100644 index ab2c6ed..0000000 --- a/nixos/kompakt/hardware-configuration.nix +++ /dev/null @@ -1,58 +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 = [ "usb_storage" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { - device = "rpool/local/root"; - fsType = "zfs"; - }; - - fileSystems."/boot" = - { - device = "/dev/disk/by-uuid/01AC-1BF6"; - fsType = "vfat"; - }; - - fileSystems."/nix" = - { - device = "rpool/local/nix"; - fsType = "zfs"; - }; - - fileSystems."/persist" = - { - device = "rpool/safe/persist"; - fsType = "zfs"; - }; - - fileSystems."/home" = - { - device = "rpool/safe/home"; - fsType = "zfs"; - }; - - 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.wlp1s0f0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; -} diff --git a/nixos/kompakt/secrets/secrets.yaml b/nixos/kompakt/secrets/secrets.yaml deleted file mode 100644 index f9d53ff..0000000 --- a/nixos/kompakt/secrets/secrets.yaml +++ /dev/null @@ -1,31 +0,0 @@ -root-password: ENC[AES256_GCM,data:YQnUoTGpz0JC1Ck3pPTkbHavcSAZJxVD9xvKYXQRmfIS27B9yz0TmLv0ozweb7qsvRAgO0m3tCO9rfIh+5qO3kGMG0h5OhP7dw==,iv:hFTEFEsOubYaWEu58xusBtT5c9K5sAcezKfVkCrtvrE=,tag:GZA6AVsFIdWjaGZe1c5aJQ==,type:str] -sefidel-password: ENC[AES256_GCM,data:jphYVr3Wg8+1llflee0Hb2f2V6bgwq+uAoZ+ZTCHxh95vHRHGBSUYDDnMZdJr63hr9Kc+t/ZYRJpwmmxAbZqrFJAjCzuSrBqlKFY0AGRVhIvFg/jeZbocea+8T+Flpp/yQ5rMtJWIE5NSg==,iv:+3UCC8tCXVyyLmHDuxTTJpB6ufZoZUNvBwHb70S5iYc=,tag:44OdW9OFv9hibABsB4w6cw==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1jt8xg0lvzj5q4f7fn7nw670qsszm3kv3caa654eh62azra4x44zss4fad8 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1UkJnR2czcm90MHBoUUtE - Zi94UFJvRUlhbjhZMStUWlhUVzlXTE5MSkRvCjZOck9kWTBKMHhUai9kbklGVUF1 - RTNESGZyZFVucGlDM2cxbUVPS0w5cjQKLS0tIGhDeFN2KzkzZTVmWHBVTFhScHBR - czFyOHArSHNpaGN2R1p5aDJjd2JEOWsKThjzyM88xKZPrMjLOzrS7q2GQzS9+Xl/ - df1X1guIS3i7fwjc9DuvaDlnuz3QpIwOQ1/1M8NR/gjBfYRJ+0pLcw== - -----END AGE ENCRYPTED FILE----- - - recipient: age180yj8dn9jhjzj9c0y6qr5fa76g0ls3p772dvn60nu67wveqv8pvsahvur6 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHNlVqOGFYUEl2TVR5dlBp - aVRUSjhjYXBVVFVZaTlWN0hiblVvSXhMWFV3Ci9haDA1V0w1MjYwSThyU25ia3NJ - L1htVTZnUGRPakQyQUVxbzJYWmxvblEKLS0tIGFOSTZ3cmI0NnBxdzl3N2dvUW92 - bjJCVUJDMm50V3pwaU1zQkUwRXdpdjAK39fVzMaVj7WRv7CcrTTrWyaSqohVZ59Z - coo75mzw8ImC8Evk1ZqkOAjmN4FbXrsWnpF+pLp17fsqbINkQM3QvA== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-02-20T07:26:03Z" - mac: ENC[AES256_GCM,data:xH89h6MC0LNk8RkxDGrp0m92PZcjBWI0itMCS1OoHKEo+pRNYVVlQT4sqKyY5SWs1UAKKhF/Ks7jHNtAHFvo7gxw56mziYXhtnOTV3uzxLkVmhOH1qkma+4eztwVdLzBny9v9MtqCWdVdEPnCgeJfM3lLCEuT/Rif/b3wdnLcwQ=,iv:7K+xpkjUtxCEhplksrxl73GbMtzQM6YIFdGJQELGUOQ=,tag:UoTyR1rlEEMsg0/SCclfUg==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.7.3 -- cgit 1.4.1