From 76b04b41903f4dce54ecba8d656a4b8e4c34bbcc Mon Sep 17 00:00:00 2001 From: Luna Simons Date: Tue, 3 Sep 2024 12:48:29 +0200 Subject: [PATCH] refactor(modules/{home,nixos}): remove aagl --- flake.lock | 40 +------------------- flake.nix | 67 ++++++++++++++++++++++------------ modules/home/aagl/default.nix | 13 ------- modules/nixos/aagl/default.nix | 25 ------------- systems/dissension/default.nix | 1 - 5 files changed, 44 insertions(+), 102 deletions(-) delete mode 100644 modules/home/aagl/default.nix delete mode 100644 modules/nixos/aagl/default.nix diff --git a/flake.lock b/flake.lock index 9ad5b3b..d9d6cc6 100644 --- a/flake.lock +++ b/flake.lock @@ -1,26 +1,5 @@ { "nodes": { - "aagl-gtk-on-nix": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1725307913, - "narHash": "sha256-Slc+vPJFiarviylZsq3FgaWRPeeKHTrT6J0NpHvDfgg=", - "owner": "ezkea", - "repo": "aagl-gtk-on-nix", - "rev": "f8e7957aa7d4651d5df7b50299cb9b6f4b51adfc", - "type": "github" - }, - "original": { - "owner": "ezkea", - "repo": "aagl-gtk-on-nix", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -242,22 +221,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1673956053, @@ -645,7 +608,6 @@ }, "root": { "inputs": { - "aagl-gtk-on-nix": "aagl-gtk-on-nix", "disko": "disko", "fenix": "fenix", "flake-parts": "flake-parts", @@ -778,7 +740,7 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-utils": "flake-utils_3", "gnome-shell": "gnome-shell", "home-manager": [ diff --git a/flake.nix b/flake.nix index 294c03b..3868dde 100644 --- a/flake.nix +++ b/flake.nix @@ -11,39 +11,58 @@ impermanence.url = "github:nix-community/impermanence"; - disko.url = "github:nix-community/disko"; - disko.inputs.nixpkgs.follows = "nixpkgs"; - - nix-darwin.url = "github:lnl7/nix-darwin"; - nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; + disko = { + url = "github:nix-community/disko"; + inputs.nixpkgs.follows = "nixpkgs"; + }; - home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; + nix-darwin = { + url = "github:lnl7/nix-darwin"; + inputs.nixpkgs.follows = "nixpkgs"; + }; - nix-index-database.url = "github:nix-community/nix-index-database"; - nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; - stylix.url = "github:danth/stylix"; - stylix.inputs.nixpkgs.follows = "nixpkgs"; - stylix.inputs.home-manager.follows = "home-manager"; + nix-index-database = { + url = "github:nix-community/nix-index-database"; + inputs.nixpkgs.follows = "nixpkgs"; + }; - fenix.url = "github:nix-community/fenix?ref=monthly"; - fenix.inputs.nixpkgs.follows = "nixpkgs"; + stylix = { + url = "github:danth/stylix"; + inputs = { + nixpkgs.follows = "nixpkgs"; + home-manager.follows = "home-manager"; + }; + }; - aagl-gtk-on-nix.url = "github:ezkea/aagl-gtk-on-nix"; - aagl-gtk-on-nix.inputs.nixpkgs.follows = "nixpkgs"; + fenix = { + url = "github:nix-community/fenix?ref=monthly"; + inputs.nixpkgs.follows = "nixpkgs"; + }; - helix.url = "github:helix-editor/helix"; - helix.inputs.nixpkgs.follows = "nixpkgs"; + helix = { + url = "github:helix-editor/helix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; - nix-steel.url = "github:bddvlpr/nix-steel"; - nix-steel.inputs.nixpkgs.follows = "nixpkgs"; + nix-steel = { + url = "github:bddvlpr/nix-steel"; + inputs.nixpkgs.follows = "nixpkgs"; + }; - helix-steel.url = "github:mattwparas/helix?ref=steel-event-system"; - helix-steel.inputs.nixpkgs.follows = "nixpkgs"; + helix-steel = { + url = "github:mattwparas/helix?ref=steel-event-system"; + inputs.nixpkgs.follows = "nixpkgs"; + }; - schemat.url = "github:bddvlpr/schemat"; - schemat.inputs.nixpkgs.follows = "nixpkgs"; + schemat = { + url = "github:bddvlpr/schemat"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = {flake-parts, ...} @ inputs: diff --git a/modules/home/aagl/default.nix b/modules/home/aagl/default.nix deleted file mode 100644 index fdafc33..0000000 --- a/modules/home/aagl/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - lib, - osConfig, - ... -}: let - inherit (lib) mkIf; -in { - config = mkIf osConfig.sysc.aagl.enable { - home.persistence."/persist/home/bddvlpr".directories = [ - ".local/share/honkers-railway-launcher" - ]; - }; -} diff --git a/modules/nixos/aagl/default.nix b/modules/nixos/aagl/default.nix deleted file mode 100644 index 9d2f82f..0000000 --- a/modules/nixos/aagl/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - config, - inputs, - ... -}: let - inherit (lib) mkIf mkOption types; - inherit (inputs.aagl-gtk-on-nix.nixosModules) default; - - cfg = config.sysc.aagl; -in { - imports = [default]; - - options.sysc.aagl = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable aagl."; - }; - }; - - config = mkIf cfg.enable { - programs.honkers-railway-launcher.enable = true; - }; -} diff --git a/systems/dissension/default.nix b/systems/dissension/default.nix index 3868c84..ed4600a 100644 --- a/systems/dissension/default.nix +++ b/systems/dissension/default.nix @@ -1,6 +1,5 @@ { sysc = { - aagl.enable = true; avahi.enable = true; docker.enable = true; libvirtd.enable = true;