From 36cf7592f6d11f9a8bb2da6415e3dcfa3da722ca Mon Sep 17 00:00:00 2001 From: Tomasz Mrozinski Date: Sat, 21 Mar 2026 16:49:25 +0100 Subject: Cleanup after ditching dendritic It was too hard and lsp didnt work --- .gitignore | 1 + flake.lock | 34 ---------------------------------- hosts/Makbuk/configuration.nix | 19 ++++++++++--------- hosts/Makbuk/packages.nix | 31 +++++++++++++++++++++++++++++-- 4 files changed, 40 insertions(+), 45 deletions(-) diff --git a/.gitignore b/.gitignore index 751553b..3653d52 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.bak +*.backup diff --git a/flake.lock b/flake.lock index b89aa74..231134e 100644 --- a/flake.lock +++ b/flake.lock @@ -46,24 +46,6 @@ "type": "github" } }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -101,21 +83,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1769909678, - "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "72716169fe93074c333e8d0173151350670b824c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1770169770, @@ -156,7 +123,6 @@ "root": { "inputs": { "caelestiaShell": "caelestiaShell", - "flake-parts": "flake-parts", "home-manager": "home-manager", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable" diff --git a/hosts/Makbuk/configuration.nix b/hosts/Makbuk/configuration.nix index e69fd0e..074ad31 100644 --- a/hosts/Makbuk/configuration.nix +++ b/hosts/Makbuk/configuration.nix @@ -1,9 +1,8 @@ -#configuration.nix - -{ mods, ... }: +{ inputs, self, mods, userName, fullName, unstbl, ... }: { - programs.fuse.enable = true; + + programs.fuse.enable = true; boot.binfmt.emulatedSystems = [ "i686-linux" "x86_64-linux" ]; boot.binfmt.addEmulatedSystemsToNixSandbox = true; @@ -12,18 +11,18 @@ ./hardware-configuration.nix ./apple-silicon-support ./packages.nix + ../../common # "${mods}/sddm.nix" "${mods}/minecraft.nix" "${mods}/hyprland/new" # "${mods}/cosmic.nix" "${mods}/cpp.nix" "${mods}/rust.nix" -# "${mods}/plasma6.nix" + "${mods}/bluetooth.nix" "${mods}/aarch.nix" "${mods}/neovim" "${mods}/ipon.nix" "${mods}/tailscale.nix" - "${mods}/bluetooth.nix" ]; networking.hostName = "Makbuk"; @@ -32,9 +31,11 @@ settings.General.EndableNetworkConfiguration = true; }; - virtualisation.docker.enable = true; - nixpkgs.config.allowUnsupportedSystem = true; - boot.kernelParams = [ "hid_apple.fnmode=2" "appledrm.show_notch=1" "hid_apple.swap_opt_cmd=2" ]; + boot.kernelParams = [ "hid_apple.fnmode=2" "appledrm.show_notch=1" "hid_apple.swap_opt_cmd=2" "hid_apple.swap_fn_leftctrl=1" ]; hardware.asahi.peripheralFirmwareDirectory = ./firmware; + + services.seatd.enable = true; + + } diff --git a/hosts/Makbuk/packages.nix b/hosts/Makbuk/packages.nix index 09a77c9..b356626 100644 --- a/hosts/Makbuk/packages.nix +++ b/hosts/Makbuk/packages.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, unstbl, ... }: { nixpkgs.config.allowUnsupportedSystem = true; @@ -9,7 +9,7 @@ apfs-fuse qemu edk2 - retroarch + retroarch-full asahi-audio spotify-qt superTuxKart @@ -20,7 +20,34 @@ gperf libreoffice-fresh rpcs3 + blender + python3 + widevine-cdm + brave + glibc + ryubing + qbittorrent + snes9x + element-desktop + claude-code + udev # libudev + libinput + mesa # libgbm + libxkbcommon + seatd # libseat + pkg-config + seatd + appimage-run + clementine + lm_sensors + discord + rmpc ]; + services.mpd.enable = true; + + services.ollama.enable = true; + services.ollama.package = unstbl.legacyPackages.${pkgs.system}.ollama; + services.usbmuxd.enable = true; } -- cgit v1.3