From 6c7632896d149f738c46de1d70253d5003b54610 Mon Sep 17 00:00:00 2001 From: macronova Date: Sun, 17 Mar 2024 12:40:09 -0700 Subject: [PATCH] Fix deck --- flake.lock | 37 ++++++++++++++++--------------- flake.nix | 2 +- linux/protostar/configuration.nix | 11 ++++----- linux/protostar/gui.nix | 1 + linux/protostar/network.nix | 6 +---- 5 files changed, 26 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 4ec8c1a..555c1de 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1710532761, - "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=", + "lastModified": 1710714957, + "narHash": "sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA=", "owner": "nix-community", "repo": "home-manager", - "rev": "206f457fffdb9a73596a4cb2211a471bd305243d", + "rev": "7b3fca5adcf6c709874a8f2e0c364fe9c58db989", "type": "github" }, "original": { @@ -107,15 +107,16 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1710404304, - "narHash": "sha256-tYsUAsZgt9TT7d+r1KRYHWyBRWedJ39SXNBVSCQVsGQ=", + "lastModified": 1709910040, + "narHash": "sha256-tsgHcous8puhTz02H/lLRoTeC4OsFWJOKQvCJHdfDhQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "ffa51458aec4d53aac85b6dee1ee2ec29f4e953f", + "rev": "77fc86c1b4c2c8464316f7744f9fba63fe6df7ce", "type": "github" }, "original": { "owner": "Jovian-Experiments", + "ref": "77fc", "repo": "Jovian-NixOS", "type": "github" } @@ -222,11 +223,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1710033658, - "narHash": "sha256-yiZiVKP5Ya813iYLho2+CcFuuHpaqKc/CoxOlANKcqM=", + "lastModified": 1710628718, + "narHash": "sha256-y+l3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b17375d3bb7c79ffc52f3538028b2ec06eb79ef8", + "rev": "6dc11d9859d6a18ab0c5e5829a5b8e4810658de3", "type": "github" }, "original": { @@ -317,11 +318,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1710451336, - "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", + "lastModified": 1710631334, + "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d691274a972b3165335d261cc4671335f5c67de9", + "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", "type": "github" }, "original": { @@ -333,11 +334,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1709968316, - "narHash": "sha256-4rZEtEDT6jcgRaqxsatBeds7x1PoEiEjb6QNGb4mNrk=", + "lastModified": 1710534455, + "narHash": "sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e7f98a5f30166cbed344569426850b21e4091d4", + "rev": "9af9c1c87ed3e3ed271934cb896e0cdd33dae212", "type": "github" }, "original": { @@ -366,11 +367,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1710433464, - "narHash": "sha256-IXlPoWgIRovZ32mYvqqdBgOQln71LouE/HBhbKc1wcw=", + "lastModified": 1710644594, + "narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=", "owner": "Mic92", "repo": "sops-nix", - "rev": "6c32d3b9c7593f4b466ec5404e59fc09a803a090", + "rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 39b2ace..69af7c1 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ disko.url = "github:nix-community/disko"; hardware.url = "github:nixos/nixos-hardware"; home-manager.url = "github:nix-community/home-manager"; - jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; + jovian.url = "github:Jovian-Experiments/Jovian-NixOS/77fc"; mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; nh.url = "github:viperML/nh"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; diff --git a/linux/protostar/configuration.nix b/linux/protostar/configuration.nix index 2342a7a..d64b1a7 100644 --- a/linux/protostar/configuration.nix +++ b/linux/protostar/configuration.nix @@ -6,13 +6,10 @@ { # Configuration boot - boot = { - initrd.systemd.enable = true; - loader = { - efi.canTouchEfiVariables = true; - systemd-boot.enable = true; - timeout = 0; - }; + boot.loader = { + efi.canTouchEfiVariables = true; + systemd-boot.enable = true; + timeout = 0; }; # Change secrets file diff --git a/linux/protostar/gui.nix b/linux/protostar/gui.nix index 33ed284..0f834ce 100644 --- a/linux/protostar/gui.nix +++ b/linux/protostar/gui.nix @@ -6,6 +6,7 @@ let in { home-manager.users.${usr}.home.packages = with jovianPkgs; [ + lutris (retroarch.override { cores = with libretro; [ pcsx2 diff --git a/linux/protostar/network.nix b/linux/protostar/network.nix index 85cf799..d132fa3 100644 --- a/linux/protostar/network.nix +++ b/linux/protostar/network.nix @@ -4,12 +4,8 @@ networking = { firewall.trustedInterfaces = [ config.services.tailscale.interfaceName ]; hostId = "74247225"; - networkmanager = { - enable = true; - wifi.backend = "iwd"; - }; + networkmanager.enable = true; nftables.enable = true; - wireless.iwd.enable = true; }; services.openssh.enable = true; }