From 36c7313b0169f1366d21eeaf883d04371abbdd90 Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Sun, 7 Dec 2025 21:11:18 -0500 Subject: [PATCH] cleanup --- dot_config/flake/flake.lock | 107 ++++++------------ dot_config/flake/flake.nix | 16 --- .../flake/machines/wash/configuration.nix | 3 - dot_config/flake/modules/nixos/niri.nix | 2 +- 4 files changed, 35 insertions(+), 93 deletions(-) diff --git a/dot_config/flake/flake.lock b/dot_config/flake/flake.lock index 31bc06e..3b2fb33 100644 --- a/dot_config/flake/flake.lock +++ b/dot_config/flake/flake.lock @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1764161084, - "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=", + "lastModified": 1765065051, + "narHash": "sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE+oEE=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "e95de00a471d07435e0527ff4db092c84998698e", + "rev": "7e22bf538aa3e0937effcb1cee73d5f1bcc26f79", "type": "github" }, "original": { @@ -124,11 +124,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764277375, - "narHash": "sha256-xGjj40guf+KcFcjlArxwil2amljuCrZkfUOHgDCk4a4=", + "lastModified": 1764873433, + "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "d3f4d42f89280b48a1ed13917678f64a0b2b0aa7", + "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", "type": "github" }, "original": { @@ -153,22 +153,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -190,28 +174,6 @@ "url": "https://flakehub.com/f/hercules-ci/flake-parts/0.1" } }, - "fw-fanctrl": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1758876503, - "narHash": "sha256-cFMFr0lheAKxEj0WYgFbHf+YFWCdyQJsVv6cBhmpgFg=", - "owner": "TamtamHero", - "repo": "fw-fanctrl", - "rev": "6ce57662e2f31dd7090a591fdd77185410ab3181", - "type": "github" - }, - "original": { - "owner": "TamtamHero", - "ref": "packaging/nix", - "repo": "fw-fanctrl", - "type": "github" - } - }, "git-hooks-nix": { "inputs": { "flake-compat": "flake-compat", @@ -245,11 +207,11 @@ ] }, "locked": { - "lastModified": 1764534535, - "narHash": "sha256-TkAB7JTfQXq8wpBcCZ8cH/Dlkd/96J0VjFKqwhKl7kI=", + "lastModified": 1764998300, + "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", "owner": "nix-community", "repo": "home-manager", - "rev": "784a83782ce00985bee65c588d4c315ec0b5a172", + "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", "type": "github" }, "original": { @@ -265,11 +227,11 @@ ] }, "locked": { - "lastModified": 1764534535, - "narHash": "sha256-TkAB7JTfQXq8wpBcCZ8cH/Dlkd/96J0VjFKqwhKl7kI=", + "lastModified": 1764998300, + "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", "owner": "nix-community", "repo": "home-manager", - "rev": "784a83782ce00985bee65c588d4c315ec0b5a172", + "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", "type": "github" }, "original": { @@ -289,11 +251,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1764488513, - "narHash": "sha256-xBUnv+ndZxRbY9mYSPEP0afaZRUVXDFcJx0WMD4ypfs=", + "lastModified": 1765120349, + "narHash": "sha256-MvwrHRV80hOdEwfLgI16XhApHuvj69aAgUWQ8ZBgAqE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "9e3bbd170669d10846bae68d23dabef11832f8f2", + "rev": "0f4acff79842637e92f5f2609d3844bac9d5e592", "type": "github" }, "original": { @@ -322,11 +284,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1764485473, - "narHash": "sha256-RlGEcuZFB/IdvYLrYsf0RpgvNtCMyIuBLt3lS+GZvP8=", + "lastModified": 1764966114, + "narHash": "sha256-nC0Fsu4zSdabdR4tHHMCrTgqLms612eEDy5VCdQVZFk=", "owner": "YaLTeR", "repo": "niri", - "rev": "311ca6b5da19f5acd7d3e481620de57240ce8f7c", + "rev": "ba29735fbbd8cf8319c71ccb55b54a0580007c80", "type": "github" }, "original": { @@ -404,27 +366,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1764316264, - "narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=", + "lastModified": 1764983851, + "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0", + "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -450,11 +412,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -466,11 +428,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1764494334, - "narHash": "sha256-x2xCEXUlU4Ap56+t5HaoReOQ/bV/bIQ5rzTn/m+V3HQ=", + "lastModified": 1764983851, + "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d542db745310b6929708d9abea513f3ff19b1341", + "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454", "type": "github" }, "original": { @@ -532,7 +494,6 @@ "darwin": "darwin", "determinate": "determinate", "firefox-gnome-theme": "firefox-gnome-theme", - "fw-fanctrl": "fw-fanctrl", "home-manager": "home-manager", "home-manager-unstable": "home-manager-unstable", "niri": "niri", @@ -577,11 +538,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1764366786, - "narHash": "sha256-yVCJ4Qe/JkdKDu0DddFdAQgDQVeF12nxH7zv3jtooV4=", + "lastModified": 1764721075, + "narHash": "sha256-ChH4nq0cMEEkzkHqKlQt5Z7wxrk8ybcEHuA1YKAYmV0=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "b362a3873710a42f7ac2d8ba03772d8290733934", + "rev": "1b918e29b419e89910014054e8b71d54c9235ea5", "type": "github" }, "original": { diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix index 804a8b5..7768938 100644 --- a/dot_config/flake/flake.nix +++ b/dot_config/flake/flake.nix @@ -25,11 +25,6 @@ # url = "github:helix-editor/helix/bfcbef10c513108c7b43317569416c2eefc4ed44"; # }; - fw-fanctrl = { - url = "github:TamtamHero/fw-fanctrl/packaging/nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - niri = { url = "github:sodiboo/niri-flake"; }; @@ -74,23 +69,12 @@ } @ inputs: let inherit (self) outputs; - systems = [ - "x86_64-linux" - "aarch64-darwin" - ]; - - forAllSystems = nixpkgs.lib.genAttrs systems; - - allPkgs = forAllSystems (system: import nixpkgs {inherit system;}); - nixosModules = ./modules/nixos; homeModules = ./modules/home; darwinModules = ./modules/darwin; in { overlays = import ./overlays {inherit inputs;}; - # defaultPackage = forAllSystems (system: home-manager.defaultPackage.${system}); - nixosConfigurations = { kaylee = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; diff --git a/dot_config/flake/machines/wash/configuration.nix b/dot_config/flake/machines/wash/configuration.nix index a86e691..85dd763 100644 --- a/dot_config/flake/machines/wash/configuration.nix +++ b/dot_config/flake/machines/wash/configuration.nix @@ -1,5 +1,4 @@ { - inputs, outputs, pkgs, ... @@ -17,8 +16,6 @@ ../../modules/nixos/android-studio.nix # ../../modules/nixos/docker.nix ../../modules/nixos/podman.nix - - inputs.fw-fanctrl.nixosModules.default ]; nixpkgs = { diff --git a/dot_config/flake/modules/nixos/niri.nix b/dot_config/flake/modules/nixos/niri.nix index 58faf78..7180fb1 100644 --- a/dot_config/flake/modules/nixos/niri.nix +++ b/dot_config/flake/modules/nixos/niri.nix @@ -9,7 +9,7 @@ programs.niri.package = pkgs.niri-unstable; - services.displayManager.gdm.enable = true; + services.displayManager.ly.enable = true; niri-flake.cache.enable = true; programs.niri.enable = true; services.upower.enable = true;