From 211808b02e761db9b54b7545a10ca5e00a75a84f Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Sat, 23 Nov 2024 19:55:16 -0500 Subject: [PATCH] flake: drop pacifidlog and jovian due to dependency on unstable --- flake.lock | 77 +++++++------------- flake.nix | 11 +-- hosts/pacifidlog/README.md | 57 --------------- hosts/pacifidlog/default.nix | 135 ----------------------------------- hosts/pacifidlog/home.nix | 27 ------- hosts/pacifidlog/secrets.nix | 6 -- hosts/pacifidlog/stylix.nix | 50 ------------- 7 files changed, 28 insertions(+), 335 deletions(-) delete mode 100644 hosts/pacifidlog/README.md delete mode 100644 hosts/pacifidlog/default.nix delete mode 100644 hosts/pacifidlog/home.nix delete mode 100644 hosts/pacifidlog/secrets.nix delete mode 100644 hosts/pacifidlog/stylix.nix diff --git a/flake.lock b/flake.lock index 78887b13..e2eb7e73 100644 --- a/flake.lock +++ b/flake.lock @@ -345,16 +345,16 @@ ] }, "locked": { - "lastModified": 1731832479, - "narHash": "sha256-icDDuYwJ0avTMZTxe1qyU/Baht5JOqw4pb5mWpR+hT0=", + "lastModified": 1732319136, + "narHash": "sha256-wpmPl6FkAF9Jj5C/rzANgpUjfzQrUYOn267LnzKU2uI=", "owner": "nix-community", "repo": "home-manager", - "rev": "5056a1cf0ce7c2a08ab50713b6c4af77975f6111", + "rev": "f8831cc700030e11fc91da9ef6270593e6440edc", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -401,27 +401,6 @@ "type": "github" } }, - "jovian": { - "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1731736013, - "narHash": "sha256-AYB3yeogE9vtBuSStdFFmGR0kzGuumW4nrpdlcuZ/As=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "a2c6d8d1acce49de8dc7ed951428aae901908316", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", @@ -471,40 +450,18 @@ "type": "github" } }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "jovian", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729697500, - "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", - "owner": "zhaofengli", - "repo": "nix-github-actions", - "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "matrix-name", - "repo": "nix-github-actions", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1731755305, + "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -537,6 +494,22 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "locked": { "lastModified": 1731863972, @@ -585,10 +558,10 @@ "disko": "disko", "home-manager": "home-manager_2", "iio-hyprland": "iio-hyprland", - "jovian": "jovian", "lanzaboote": "lanzaboote", "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "stylix": "stylix", "wallpapers": "wallpapers" diff --git a/flake.nix b/flake.nix index a850afff..704d5fd2 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,8 @@ description = "Aly's NixOS flake."; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; agenix = { inputs.nixpkgs.follows = "nixpkgs"; @@ -16,7 +17,7 @@ home-manager = { inputs.nixpkgs.follows = "nixpkgs"; - url = "github:nix-community/home-manager/master"; + url = "github:nix-community/home-manager/release-24.11"; }; iio-hyprland = { @@ -24,11 +25,6 @@ url = "github:JeanSchoeller/iio-hyprland"; }; - jovian = { - url = "github:Jovian-Experiments/Jovian-NixOS"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - lanzaboote = { inputs.nixpkgs.follows = "nixpkgs"; url = "github:nix-community/lanzaboote/v0.4.1"; @@ -99,7 +95,6 @@ "fallarbor" "lavaridge" "mauville" - "pacifidlog" "rustboro" "slateport" ]; diff --git a/hosts/pacifidlog/README.md b/hosts/pacifidlog/README.md deleted file mode 100644 index cb8e331e..00000000 --- a/hosts/pacifidlog/README.md +++ /dev/null @@ -1,57 +0,0 @@ -# pacifidlog - -## Overview - -Lenovo Legion Go with AMD Z1 Extreme. Gaming beast. Uses Jovian for Steam Deck-like interface. - -## Todo - -- \[x\] update hdd-ui and adjustor. -- \[ \] upgrade to large SSD. - -## Specs - -| Model | Legion Go | -|---------|---------------------------| -| Display | 8.8" 1600x2560 144Hz | -| CPU | AMD Z1 Extreme | -| RAM | 16GB LPDDR5 (soldered) | -| GPU | AMD Z1 Extreme | -| Disks | 512GB M.2 2242 NVMe | - -## Filesystems - -### / - -Encrypted LUKS btrfs volume. - -## Display - -Vertical-turned-horizontal 1600x2560 display running at 144Hz. Scales perfectly to 2x. - -## Steam / Jovian Docs - -Jovian delivers a Steam Deck-like interface on top of NixOS, with some limitations. This includes performance optimizations, patched versions of Mesa, and other tweaks to be as consistent with the Steam Deck as possible. - -### Features - -#### What works - -- Basic performance settings (frame limits, refresh rates, etc). -- Desktop mode with KDE. -- Installing GOG and EGS games with Heroic. -- Launching and playing games, natively and with Proton. -- Plugins and themes with Decky Loader. - -#### What does not work - -- Adaptive Brightness. -- EmuDeck. -- Formatting microSD cards. -- Night light. -- System updates. -- TDP control and Legion Go specific features (all work with Handheld Daemon). - -### Decky Loader - -Decky loader can be installed and configured through the Jovian modules, but needs CEF Remote Debugging enabled via Deveroper Options for the frontend UI to load. diff --git a/hosts/pacifidlog/default.nix b/hosts/pacifidlog/default.nix deleted file mode 100644 index 2d68b2ab..00000000 --- a/hosts/pacifidlog/default.nix +++ /dev/null @@ -1,135 +0,0 @@ -# Lenovo Legion Go -{ - config, - pkgs, - lib, - self, - ... -}: { - imports = [ - ./home.nix - ./secrets.nix - ./stylix.nix - (import ./../../disko/luks-btrfs-subvolumes.nix {disks = ["/dev/nvme0n1"];}) - self.inputs.jovian.nixosModules.default - self.inputs.nix-gaming.nixosModules.pipewireLowLatency - self.inputs.nix-gaming.nixosModules.platformOptimizations - self.nixosModules.common-base - self.nixosModules.common-locale - self.nixosModules.common-mauville-share - self.nixosModules.common-nix - self.nixosModules.common-pkgs - self.nixosModules.common-tailscale - self.nixosModules.common-wifi-profiles - self.nixosModules.hw-lenovo-legion-go - ]; - - boot = { - initrd.systemd.enable = true; - - lanzaboote = { - enable = true; - pkiBundle = "/etc/secureboot"; - }; - - loader = { - efi.canTouchEfiVariables = true; - - systemd-boot = { - enable = lib.mkForce false; - consoleMode = "1"; - }; - }; - }; - - environment = { - systemPackages = with pkgs; [ - heroic - hhd-ui - lutris - ]; - - variables.GDK_SCALE = "2"; - }; - - hardware.pulseaudio.enable = lib.mkForce false; - - jovian = { - decky-loader = { - enable = true; - user = "aly"; - }; - - hardware.has.amd.gpu = true; - - steam = { - enable = true; - autoStart = true; - desktopSession = "plasma"; - - environment = { - STEAM_EXTRA_COMPAT_TOOLS_PATHS = lib.makeSearchPathOutput "steamcompattool" "" config.programs.steam.extraCompatPackages; - STEAM_GAMESCOPE_COLOR_MANAGED = "0"; - }; - - user = "aly"; - }; - - steamos = { - enableMesaPatches = lib.mkForce false; - useSteamOSConfig = true; - }; - }; - - networking.hostName = "pacifidlog"; - nixpkgs.overlays = [self.overlays.tablet]; - programs.steam.platformOptimizations.enable = true; - - services = { - handheld-daemon = { - enable = true; - - package = with pkgs; - handheld-daemon.overrideAttrs (oldAttrs: { - propagatedBuildInputs = - oldAttrs.propagatedBuildInputs - ++ [pkgs.adjustor]; - }); - - user = "aly"; - }; - - pipewire.lowLatency = { - enable = true; - quantum = 256; - rate = 48000; - }; - }; - - system.stateVersion = "24.11"; - systemd.services.handheld-daemon.path = with pkgs; [hhd-ui lsof]; - zramSwap.memoryPercent = 100; - - ar = { - apps = { - firefox.enable = true; - steam.enable = true; - }; - - desktop.kde.enable = true; - laptopMode = true; - services.flatpak.enable = true; - - users.aly = { - enable = true; - password = "$y$j9T$CXjk5Z9e2PXbSsWh5CK.81$I9Hm/Oa4KcYMqPi8KMBfsEv5NzoXCgaCK5xhyGeikH7"; - - syncthing = { - enable = true; - certFile = config.age.secrets.syncthingCert.path; - keyFile = config.age.secrets.syncthingKey.path; - syncMusic = false; - }; - }; - }; -} diff --git a/hosts/pacifidlog/home.nix b/hosts/pacifidlog/home.nix deleted file mode 100644 index 24ed60dd..00000000 --- a/hosts/pacifidlog/home.nix +++ /dev/null @@ -1,27 +0,0 @@ -{self, ...}: { - home-manager = { - sharedModules = [ - { - wayland.windowManager = { - hyprland.settings = { - input = { - touchdevice = { - transform = 1; - output = "eDP-1"; - }; - }; - }; - }; - - ar.home = { - desktop.hyprland = { - laptopMonitors = ["desc:Lenovo Group Limited Go Display 0x00888888, 1600x2560@144, 0x0, 2, transform, 1"]; - tabletMode.enable = true; - }; - }; - } - ]; - - users.aly = self.homeManagerModules.aly; - }; -} diff --git a/hosts/pacifidlog/secrets.nix b/hosts/pacifidlog/secrets.nix deleted file mode 100644 index cb448683..00000000 --- a/hosts/pacifidlog/secrets.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - age.secrets = { - syncthingCert.file = ../../secrets/aly/syncthing/pacifidlog/cert.age; - syncthingKey.file = ../../secrets/aly/syncthing/pacifidlog/key.age; - }; -} diff --git a/hosts/pacifidlog/stylix.nix b/hosts/pacifidlog/stylix.nix deleted file mode 100644 index b264c09e..00000000 --- a/hosts/pacifidlog/stylix.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - pkgs, - self, - ... -}: { - stylix = { - enable = true; - base16Scheme = "${pkgs.base16-schemes}/share/themes/default-dark.yaml"; - image = "${self.inputs.wallpapers}/Legion_Go_Meteorite_Wallpaper.jpg"; - imageScalingMode = "fill"; - polarity = "dark"; - - cursor = { - name = "Bibata-Modern-Classic"; - package = pkgs.bibata-cursors; - size = 24; - }; - - fonts = { - monospace = { - name = "CaskaydiaCove Nerd Font"; - package = pkgs.nerdfonts.override {fonts = ["CascadiaCode"];}; - }; - - sansSerif = { - name = "UbuntuSans Nerd Font"; - package = pkgs.nerdfonts.override {fonts = ["UbuntuSans"];}; - }; - - serif = { - name = "Source Serif Pro"; - package = pkgs.source-serif-pro; - }; - - sizes = { - applications = 12; - desktop = 11; - popups = 12; - terminal = 13; - }; - }; - - opacity = { - applications = 1.0; - desktop = 0.8; - terminal = 0.8; - popups = 0.8; - }; - }; -}