From 772c6311d0d5abc03a158bfd2e2400cd3044c9ea Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Thu, 27 Mar 2025 20:52:26 +0100 Subject: [PATCH] remove this fucking macbook finally (it's all in vcs anyway) --- flake.lock | 28 ++---- flake.nix | 43 +-------- hosts/potatobook-g/configuration.nix | 87 ------------------- hosts/potatobook-g/hardware-configuration.nix | 62 ------------- hosts/potatobook-g/iso.nix | 11 --- mac-brcm-fw/default.nix | 3 - 6 files changed, 8 insertions(+), 226 deletions(-) delete mode 100644 hosts/potatobook-g/configuration.nix delete mode 100644 hosts/potatobook-g/hardware-configuration.nix delete mode 100644 hosts/potatobook-g/iso.nix delete mode 100644 mac-brcm-fw/default.nix diff --git a/flake.lock b/flake.lock index 81b1fc3..155bf7c 100644 --- a/flake.lock +++ b/flake.lock @@ -424,19 +424,6 @@ "url": "https://git.lix.systems/lix-project/nixos-module" } }, - "mac-brcm-fw": { - "flake": false, - "locked": { - "lastModified": 1727366922, - "narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=", - "path": "/home/jade/nix-configs/mac-brcm-fw", - "type": "path" - }, - "original": { - "path": "/home/jade/nix-configs/mac-brcm-fw", - "type": "path" - } - }, "niri": { "inputs": { "niri-stable": "niri-stable", @@ -495,18 +482,16 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1687903496, - "narHash": "sha256-4PPwbFM4dNqso3zBya5rgfRvnBoIbN2J7qZ2ZpRyOUc=", - "owner": "networkException", + "lastModified": 1742806253, + "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=", + "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8e28b9ee431b265d1fc74b8b819ea0816344c4a1", + "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726", "type": "github" }, "original": { - "owner": "networkException", - "ref": "apple-t2-init", - "repo": "nixos-hardware", - "type": "github" + "id": "nixos-hardware", + "type": "indirect" } }, "nixpkgs": { @@ -659,7 +644,6 @@ "fenix": "fenix", "home-manager": "home-manager", "lix-module": "lix-module", - "mac-brcm-fw": "mac-brcm-fw", "niri": "niri", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index d9bca2e..4ff56c9 100644 --- a/flake.nix +++ b/flake.nix @@ -7,9 +7,8 @@ nixpkgs-unstable-small.url = "nixpkgs/nixos-unstable-small"; niri.url = "github:sodiboo/niri-flake"; stylix.url = "github:danth/stylix"; - typst-within = { - url = "github:schrottkatze/typst"; - }; + typst-within.url = "github:schrottkatze/typst"; + crane.url = "github:ipetkov/crane"; lix-module = { url = "git+https://git.lix.systems/lix-project/nixos-module"; inputs.nixpkgs.follows = "nixpkgs"; @@ -18,14 +17,6 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixos-hardware.url = "github:networkException/nixos-hardware/apple-t2-init"; - mac-brcm-fw = { - url = "path:/home/jade/nix-configs/mac-brcm-fw"; - flake = false; - }; - crane = { - url = "github:ipetkov/crane"; - }; fenix = { url = "github:nix-community/fenix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -41,7 +32,6 @@ typst-within, home-manager, nixos-hardware, - mac-brcm-fw, niri, stylix, fenix, @@ -127,35 +117,6 @@ } ]; }; - potatobook-g = nixpkgs.lib.nixosSystem { - specialArgs = { - inherit inputs pkgs-unstable-small rs-programs lix-module niri; - }; - system = "x86_64-linux"; - modules = [ - inputs.niri.nixosModules.niri - stylix.nixosModules.stylix - "${mac-brcm-fw}" - ./hosts/potatobook-g/configuration.nix - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { - inherit pkgs-unstable-small pkgs-stable typst-within; - }; - home-manager.users.jade = { - nixosConfig, - pkgs, - ... - }: { - home.sessionVariables.TZ = nixosConfig.time.timeZone; - home.stateVersion = "${nixosConfig.system.stateVersion}"; - }; - } - nixos-hardware.nixosModules.apple-t2 - ]; - }; }; }; } diff --git a/hosts/potatobook-g/configuration.nix b/hosts/potatobook-g/configuration.nix deleted file mode 100644 index db0f132..0000000 --- a/hosts/potatobook-g/configuration.nix +++ /dev/null @@ -1,87 +0,0 @@ -{pkgs, ...}: { - nix.settings = { - trusted-substituters = [ - "https://t2linux.cachix.org" - ]; - trusted-public-keys = [ - "t2linux.cachix.org-1:P733c5Gt1qTcxsm+Bae0renWnT8OLs0u9+yfaK2Bejw=" - ]; - }; - imports = [ - ./hardware-configuration.nix - ../../common.nix - ../../modules - ]; - - boot.binfmt.emulatedSystems = ["aarch64-linux"]; - - jade = { - flatpak.enable = true; - desktop = { - compositing.enable = true; - syncthing.enable = true; - kdeconnect.enable = true; - cloud.enable = true; - social.enable = true; - mail.enable = true; - gaming.enable = true; - evremap.enable = true; - }; - terminal.enable = true; - }; - - fileSystems = { - "/".options = ["compress=zstd:3"]; - "/home".options = ["compress=zstd:3"]; - "/nix".options = ["compress=zstd:3" "noatime"]; - }; - - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - services.libinput.touchpad = { - disableWhileTyping = true; - }; - - networking.hostName = "potatobook-g"; - - hardware.enableRedistributableFirmware = true; - - environment.pathsToLink = [ - "/share/nix-direnv" - ]; - - services.blueman.enable = true; - - programs.adb.enable = true; - - services.gnome.gnome-keyring.enable = true; - programs.seahorse.enable = true; - security.pam.services.jade.enableGnomeKeyring = true; - - systemd.services."NetworkManager-wait-online".enable = false; - - systemd.services = { - create-swapfile = { - serviceConfig.Type = "oneshot"; - wantedBy = ["swap-swapfile.swap"]; - script = '' - swapfile="/swap/swapfile" - if [[ -f "$swapfile" ]]; then - echo "Swap file $swapfile already exists, taking no action" - else - echo "Setting up swap file $swapfile" - ${pkgs.coreutils}/bin/truncate -s 0 "$swapfile" - ${pkgs.e2fsprogs}/bin/chattr +C "$swapfile" - fi - ''; - }; - }; - - services.logind.extraConfig = '' - RuntimeDirectorySize=12G - ''; - - # i rly should put that important big comment back here - system.stateVersion = "22.11"; # Did you read the comment? -} diff --git a/hosts/potatobook-g/hardware-configuration.nix b/hosts/potatobook-g/hardware-configuration.nix deleted file mode 100644 index 31a176a..0000000 --- a/hosts/potatobook-g/hardware-configuration.nix +++ /dev/null @@ -1,62 +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" "usbhid" "uas" "sd_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/f6d243ec-6be9-4551-8cbb-aefb7b691a62"; - fsType = "btrfs"; - options = ["subvol=root"]; - }; - - fileSystems."/home" = { - device = "/dev/disk/by-uuid/f6d243ec-6be9-4551-8cbb-aefb7b691a62"; - fsType = "btrfs"; - options = ["subvol=home"]; - }; - - fileSystems."/nix" = { - device = "/dev/disk/by-uuid/f6d243ec-6be9-4551-8cbb-aefb7b691a62"; - fsType = "btrfs"; - options = ["subvol=nix"]; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/5F66-17ED"; - fsType = "vfat"; - }; - - swapDevices = [ - { - device = "/swap/swapfile"; - size = 1024 * 12; # 12GB - } - ]; - - # 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.enp2s0f1u1.useDHCP = lib.mkDefault true; - # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - # high-resolution display -} diff --git a/hosts/potatobook-g/iso.nix b/hosts/potatobook-g/iso.nix deleted file mode 100644 index b99407f..0000000 --- a/hosts/potatobook-g/iso.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - config, - pkgs, - ... -}: { - imports = [ - - - ./configuration.nix - ]; -} diff --git a/mac-brcm-fw/default.nix b/mac-brcm-fw/default.nix deleted file mode 100644 index 0ce5a72..0000000 --- a/mac-brcm-fw/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{...}: {} -# dummy -