From 1aeb88ac11b8dfc7504899bfd67bb96ce2362421 Mon Sep 17 00:00:00 2001 From: joy Date: Tue, 8 Oct 2024 14:10:40 +0200 Subject: [PATCH] lol --- flake.lock | 64 +++++++++++++++++------------ flake.nix | 21 ++++++---- modules/system/misc/default.nix | 3 +- modules/wm/theme/stylix/default.nix | 4 +- 4 files changed, 55 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 9da1a7b..9b33615 100644 --- a/flake.lock +++ b/flake.lock @@ -2,7 +2,9 @@ "nodes": { "ags": { "inputs": { - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems" }, "locked": { @@ -309,11 +311,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -355,34 +357,18 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-stable": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1728156290, + "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "17ae88b569bb15590549ff478bab6494dde4a907", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1725194671, - "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } @@ -431,7 +417,8 @@ "firefox-addons": "firefox-addons", "home-manager": "home-manager", "nix-on-droid": "nix-on-droid", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", + "sops-nix": "sops-nix", "stylix": "stylix" } }, @@ -451,6 +438,27 @@ "type": "github" } }, + "sops-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1728345710, + "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, "stylix": { "inputs": { "base16": "base16", @@ -461,7 +469,9 @@ "flake-utils": "flake-utils_2", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", diff --git a/flake.nix b/flake.nix index 868cf83..d2a8313 100644 --- a/flake.nix +++ b/flake.nix @@ -11,14 +11,13 @@ systemConfig = {modules}: nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs;}; - modules = modules ++ [stylix.nixosModules.stylix home-manager.nixosModules.default]; + modules = modules ++ [home-manager.nixosModules.default]; }; in { nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { pkgs = import nixpkgs {system = "aarch64-linux";}; modules = [./hosts/phone]; }; - nixosConfigurations = { desktop = systemConfig { modules = [./hosts/desktop]; @@ -30,15 +29,10 @@ }; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - ags.url = "github:Aylur/ags"; - - stylix.url = "github:danth/stylix"; - firefox-addons = { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; }; - home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -47,5 +41,18 @@ url = "github:nix-community/nix-on-droid/master"; inputs.nixpkgs.follows = "nixpkgs"; }; + stylix = { + url = "github:danth/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + ags = { + url = "github:Aylur/ags"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + sops-nix = { + url = "github:Mic92/sops-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; } diff --git a/modules/system/misc/default.nix b/modules/system/misc/default.nix index f7ed231..925984f 100644 --- a/modules/system/misc/default.nix +++ b/modules/system/misc/default.nix @@ -4,7 +4,6 @@ system.stateVersion = "23.11"; programs.zsh.enable = true; users.defaultUserShell = pkgs.zsh; - services.xserver.excludePackages = [ pkgs.xterm ]; + services.xserver.excludePackages = [pkgs.xterm]; programs.nano.enable = false; } - diff --git a/modules/wm/theme/stylix/default.nix b/modules/wm/theme/stylix/default.nix index 28f0c01..9512e6a 100644 --- a/modules/wm/theme/stylix/default.nix +++ b/modules/wm/theme/stylix/default.nix @@ -1,7 +1,9 @@ -{pkgs, ...}: let +{pkgs,inputs, ...}: let backgroundUrl = "https://wallpapers.joygnu.org/wallpapers/anime/ghibli-japanese-walled-garden.png"; backgroundSha256 = "sha256-10Lv25V0RG0mnw/O90DeVchCNWJbdktUADtuI+enEwM="; in { + imports = [inputs.stylix.nixosModules.stylix ]; + stylix = { enable = true;