From 3c556ab68cf67495b7e3823b7d3eeca09efbd5c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= Date: Wed, 15 Jan 2025 22:10:43 +0100 Subject: [PATCH] hosts: remove miyagi --- README.md | 1 - hosts/default.nix | 1 - hosts/miyagi/default.nix | 96 ------------------------ hosts/miyagi/disks.nix | 83 --------------------- hosts/miyagi/sway.nix | 155 --------------------------------------- 5 files changed, 336 deletions(-) delete mode 100644 hosts/miyagi/default.nix delete mode 100644 hosts/miyagi/disks.nix delete mode 100644 hosts/miyagi/sway.nix diff --git a/README.md b/README.md index 7f68181..7d406a9 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,6 @@ Collection of my personal Nix configurations and opinionated NixOS, nix-darwin, - legion - my linux x86 server - hijiri - my macbook - hijiri-vm - linux vm running on my macbook - - miyagi - my work machine - ude - another linux arm server - kogata - my m1 mac mini doubling as a server - modules - options which in principle should be reusable by others diff --git a/hosts/default.nix b/hosts/default.nix index 197ab66..bcc0f60 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -14,7 +14,6 @@ # ./installer ./ude ./kogata - ./miyagi ]; builders = diff --git a/hosts/miyagi/default.nix b/hosts/miyagi/default.nix deleted file mode 100644 index edcbd44..0000000 --- a/hosts/miyagi/default.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ - configurations.nixos.miyagi = - { - config, - pkgs, - username, - ... - }: - { - imports = [ - ./sway.nix - ./disks.nix - ]; - nixpkgs.hostPlatform = "x86_64-linux"; - - boot.kernelModules = [ - "kvm-intel" - "i2c-dev" - ]; - - boot = { - loader.systemd-boot.enable = true; - loader.efi.canTouchEfiVariables = true; - }; - - powerManagement.cpuFreqGovernor = "performance"; - - networking.networkmanager.enable = true; - - zramSwap.enable = true; - boot.kernel.sysctl."kernel.sysrq" = 1; - - age.secrets.niko-pass.file = ../../secrets/miyagi-niko-pass.age; - users.users.${username} = { - hashedPasswordFile = config.age.secrets.niko-pass.path; - extraGroups = [ - "libvirtd" - "i2c" - "networkmanager" - ]; - }; - - settei.tailscale = { - ipv4 = "100.103.204.32"; - ipv6 = "fd7a:115c:a1e0:ab12:4843:cd96:6267:cc20"; - }; - settei.user.config = { - common.desktop.enable = true; - home.packages = [ pkgs.slack ]; - programs.git.userEmail = "nrabulinski@antmicro.com"; - # TODO: Move to common? - xdg.mimeApps = { - enable = true; - defaultApplications = { - "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop"; - "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop"; - "x-scheme-handler/chrome" = "org.qutebrowser.qutebrowser.desktop"; - "text/html" = "org.qutebrowser.qutebrowser.desktop"; - "application/x-extension-htm" = "org.qutebrowser.qutebrowser.desktop"; - "application/x-extension-html" = "org.qutebrowser.qutebrowser.desktop"; - "application/x-extension-shtml" = "org.qutebrowser.qutebrowser.desktop"; - "application/xhtml+xml" = "org.qutebrowser.qutebrowser.desktop"; - "application/x-extension-xhtml" = "org.qutebrowser.qutebrowser.desktop"; - "application/x-extension-xht" = "org.qutebrowser.qutebrowser.desktop"; - "application/pdf" = "org.qutebrowser.qutebrowser.desktop"; - }; - }; - }; - common.incus.enable = true; - virtualisation.podman.enable = true; - - services.udisks2.enable = true; - services.printing = { - enable = true; - drivers = [ pkgs.brlaser ]; - }; - services.avahi = { - enable = true; - nssmdns4 = true; - }; - hardware.bluetooth = { - enable = true; - settings.General.ControllerMode = "bredr"; - }; - hardware.keyboard.qmk.enable = true; - - systemd.coredump.enable = true; - - # Needed for enableAllFirmware - nixpkgs.config.allowUnfree = true; - hardware = { - enableAllFirmware = true; - cpu.intel.updateMicrocode = true; - }; - }; -} diff --git a/hosts/miyagi/disks.nix b/hosts/miyagi/disks.nix deleted file mode 100644 index a3c0d07..0000000 --- a/hosts/miyagi/disks.nix +++ /dev/null @@ -1,83 +0,0 @@ -args: -let - bootDevice = args.bootDevice or "/dev/nvme0n1"; -in -{ - disko.devices.disk.bootDisk = { - type = "disk"; - device = bootDevice; - content = { - type = "gpt"; - partitions = { - esp = { - label = "ESP"; - priority = 3; - type = "EF00"; - start = "1MiB"; - end = "512MiB"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - }; - }; - nixos = { - label = "primary"; - priority = 1; - start = "512MiB"; - end = "-8G"; - content = { - type = "btrfs"; - extraArgs = [ "-f" ]; - subvolumes = - let - mountOptions = [ - "compress=zstd" - "noatime" - ]; - in - { - "/root" = { - inherit mountOptions; - mountpoint = "/"; - }; - "/home" = { - inherit mountOptions; - mountpoint = "/home"; - }; - "/nix" = { - inherit mountOptions; - mountpoint = "/nix"; - }; - "/persist" = { - inherit mountOptions; - mountpoint = "/persist"; - }; - "/log" = { - inherit mountOptions; - mountpoint = "/var/log"; - }; - }; - }; - }; - swap = { - label = "swap"; - priority = 2; - size = "100%"; - content.type = "swap"; - }; - }; - }; - }; - - fileSystems."/var/log".neededForBoot = true; - - fileSystems."/bulk" = { - device = "/dev/disk/by-label/bulk"; - fsType = "btrfs"; - options = [ - "compress=zstd" - "noatime" - ]; - }; -} diff --git a/hosts/miyagi/sway.nix b/hosts/miyagi/sway.nix deleted file mode 100644 index e862fb7..0000000 --- a/hosts/miyagi/sway.nix +++ /dev/null @@ -1,155 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -{ - services.greetd = { - enable = true; - settings.default_session = - let - swayWrapper = pkgs.writeShellScript "sway-wrapper" '' - export XCURSOR_THEME=volantes_cursors - exec ${lib.getExe config.programs.sway.package} - ''; - in - { - command = "${lib.getExe pkgs.greetd.tuigreet} --time --cmd ${swayWrapper}"; - user = "niko"; - }; - }; - - programs.sway = { - enable = true; - wrapperFeatures.base = true; - wrapperFeatures.gtk = true; - }; - - security.pam.services.swaylock = { }; - xdg.portal.config.common.default = "*"; - - settei.user.config = - { config, ... }: - { - home.pointerCursor = { - name = "volantes_cursors"; - package = pkgs.volantes-cursors; - }; - - home.packages = with pkgs; [ - (writeShellApplication { - name = "lock"; - text = '' - swaymsg output '*' power off - swaylock -c 000000 - swaymsg output '*' power on - ''; - }) - (writeShellApplication { - name = "screenshot"; - runtimeInputs = [ - slurp - grim - wl-clipboard - ]; - text = '' - grim -g "$(slurp)" - | \ - wl-copy -t image/png - ''; - }) - # Bitwarden stuff, move to separate module or properly package? - # Maybe use some other input method? - (rofi-rbw.override { waylandSupport = true; }) - rbw - pinentry-rofi - ]; - - wayland.windowManager.sway = - let - mod = config.wayland.windowManager.sway.config.modifier; - in - { - enable = true; - package = null; - config.workspaceAutoBackAndForth = true; - config.terminal = "wezterm"; - config.modifier = "Mod4"; - config.fonts.names = [ "IosevkaTerm Nerd Font" ]; - config.keybindings = lib.mkOptionDefault { - "${mod}+b" = "exec rofi-rbw --selector rofi"; - "${mod}+d" = "exec rofi -show drun"; - "${mod}+Shift+s" = "exec screenshot"; - }; - config.keycodebindings = { - "${mod}+Shift+60" = "exec lock"; - }; - config.window.commands = - let - alwaysFloating = [ - { window_role = "pop-up"; } - { window_role = "bubble"; } - { window_role = "dialog"; } - { window_type = "dialog"; } - { window_role = "task_dialog"; } - { window_type = "menu"; } - { app_id = "floating"; } - { app_id = "floating_update"; } - { class = "(?i)pinentry"; } - { title = "Administrator privileges required"; } - { title = "About Mozilla Firefox"; } - { window_role = "About"; } - { - app_id = "firefox"; - title = "Library"; - } - ]; - in - map (criteria: { - inherit criteria; - command = "floating enable"; - }) alwaysFloating; - config.output = { - "HDMI-A-1" = { - pos = "0 472"; - }; - "DP-1" = { - pos = "2560 0"; - transform = "90"; - }; - }; - config.input = { - "type:pointer" = { - accel_profile = "flat"; - pointer_accel = "0.2"; - }; - "type:keyboard" = { - xkb_layout = "pl"; - }; - }; - config.workspaceOutputAssign = [ - { - workspace = "1"; - output = "HDMI-A-1"; - } - { - workspace = "2"; - output = "DP-1"; - } - ]; - config.seat."*" = { - xcursor_theme = "volantes_cursors 24"; - }; - config.startup = [ - { - command = "${lib.getExe' pkgs.glib "gsettings"} set org.gnome.desktop.interface cursor-theme 'volantes_cursors'"; - always = true; - } - ]; - }; - programs.rofi = { - enable = true; - package = pkgs.rofi-wayland; - }; - }; -}