From 18e95cdb6f8d1264ef1665fa967e1c51bf11fe39 Mon Sep 17 00:00:00 2001 From: Lilith Date: Tue, 11 Jun 2024 20:54:17 +0200 Subject: [PATCH] update --- flake.lock | 155 ++++++++++++++++++++++--------------------- flake.nix | 1 + home/ags/default.nix | 4 +- home/default.nix | 1 + home/firefox.nix | 1 + home/packages.nix | 1 + home/thunderbird.nix | 5 +- 7 files changed, 89 insertions(+), 79 deletions(-) diff --git a/flake.lock b/flake.lock index 35cf22c5..9a9d83f9 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "ags": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1715703984, + "narHash": "sha256-0BZkMui6aCqswMCouvp0G90tAxDOxVnxTvG6TDZsDaI=", + "owner": "Aylur", + "repo": "ags", + "rev": "11150225e62462bcd431d1e55185e810190a730a", + "type": "github" + }, + "original": { + "owner": "Aylur", + "repo": "ags", + "type": "github" + } + }, "arkenfox": { "inputs": { "flake-compat": "flake-compat", @@ -12,11 +30,11 @@ "pre-commit": "pre-commit" }, "locked": { - "lastModified": 1708283120, - "narHash": "sha256-IgJe5xhssW199zGQq4Q81stGdVDJH7nFHm3yu62I75E=", + "lastModified": 1718013593, + "narHash": "sha256-671qqVhQk5olD01x/BMt6sr2sI/mBsObWiQDaKGeoZA=", "owner": "dwarfmaster", "repo": "arkenfox-nixos", - "rev": "05e7e0996493f47bbc15228895c4e31ce24616f0", + "rev": "69e312a746b9b76be2cb6c9fe2352fdf1752e2c7", "type": "github" }, "original": { @@ -212,24 +230,6 @@ "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -244,9 +244,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1709126324, @@ -287,11 +287,11 @@ ] }, "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -320,8 +320,8 @@ "helix": { "inputs": { "crane": "crane", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_2", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" }, "locked": { @@ -386,7 +386,7 @@ "rose-pine-hyprcursor", "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1709914708, @@ -419,27 +419,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704842529, - "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1704874635, - "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", "type": "github" }, "original": { @@ -451,11 +451,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1717952948, - "narHash": "sha256-mJi4/gjiwQlSaxjA6AusXBN/6rQRaPCycR7bd8fydnQ=", + "lastModified": 1718127891, + "narHash": "sha256-lJMtINwge5VwCdpeLIWKfePmT5Qk09sX2tvSq2Mjumw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2819fffa7fa42156680f0d282c60d81e8fb185b7", + "rev": "9fec85e1ab9a6cb54ca3c0f3424c92a1573576ca", "type": "github" }, "original": { @@ -466,6 +466,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1710765496, + "narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e367f7a1fb93137af22a3908f00b9a35e2d286a7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1709479366, "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", @@ -481,13 +497,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1717868076, - "narHash": "sha256-c83Y9t815Wa34khrux81j8K8ET94ESmCuwORSKm2bQY=", + "lastModified": 1718089647, + "narHash": "sha256-COO4Xk2EzlZ3x9KCiJildlAA6cYDSPlnY8ms7pKl2Iw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9", + "rev": "f7207adcc68d9cafa29e3cd252a18743ae512c6a", "type": "github" }, "original": { @@ -497,7 +513,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", @@ -513,7 +529,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1714912032, "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", @@ -532,17 +548,16 @@ "pre-commit": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils", "gitignore": "gitignore", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1708018599, - "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { @@ -553,12 +568,13 @@ }, "root": { "inputs": { + "ags": "ags", "arkenfox": "arkenfox", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "helix": "helix", "home-manager": "home-manager", "impermanence": "impermanence", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable_2", "rose-pine-hyprcursor": "rose-pine-hyprcursor", "sops-nix": "sops-nix", @@ -568,7 +584,7 @@ "rose-pine-hyprcursor": { "inputs": { "hyprlang": "hyprlang", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "utils": "utils" }, "locked": { @@ -620,11 +636,11 @@ ] }, "locked": { - "lastModified": 1717902109, - "narHash": "sha256-OQTjaEZcByyVmHwJlKp/8SE9ikC4w+mFd3X0jJs6wiA=", + "lastModified": 1718058322, + "narHash": "sha256-d5jLlAwVi4NzT9yc5UrPiOpDxTRhu8GGh0IIfeFcdrM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f0922ad001829b400f0160ba85b47d252fa3d925", + "rev": "d071c74a7de1e26d211b69b6fbae37ae2e31a87f", "type": "github" }, "original": { @@ -645,14 +661,14 @@ "flake-compat": "flake-compat_3", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1717866166, - "narHash": "sha256-iOeRZXIhFpQJdxzNJ3nUAANyDfLqCslRhjGhLD2RstM=", + "lastModified": 1718122552, + "narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=", "owner": "danth", "repo": "stylix", - "rev": "ca3247ed8cfbf369f3fe1b7a421579812a95c101", + "rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7", "type": "github" }, "original": { @@ -692,21 +708,6 @@ } }, "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -721,7 +722,7 @@ "type": "github" } }, - "systems_5": { + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -738,7 +739,7 @@ }, "utils": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, diff --git a/flake.nix b/flake.nix index 49bb7f43..d231969d 100644 --- a/flake.nix +++ b/flake.nix @@ -30,6 +30,7 @@ inputs.flake-utils.follows = "flake-utils"; }; + ags.url = "github:Aylur/ags"; rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor"; }; diff --git a/home/ags/default.nix b/home/ags/default.nix index 05ff92e3..0ee18ce1 100644 --- a/home/ags/default.nix +++ b/home/ags/default.nix @@ -1,4 +1,6 @@ -{pkgs, ...}: { +{ ags, pkgs, ...}: { + imports = [ ags.homeManagerModules.default ]; + programs.ags = { enable = true; configDir = ./widgets/bar; diff --git a/home/default.nix b/home/default.nix index a9dbc684..ab7444c0 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,5 +1,6 @@ { user = [ + ./ags ./alacritty.nix ./clipman.nix ./common.nix diff --git a/home/firefox.nix b/home/firefox.nix index d5e61da0..32ffa547 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -11,6 +11,7 @@ nativeMessagingHosts = with pkgs; [ tridactyl-native + keepassxc ]; policies = { diff --git a/home/packages.nix b/home/packages.nix index d54fb372..06dc1c52 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -20,6 +20,7 @@ obsidian vlc + obs-studio keepassxc ncspot diff --git a/home/thunderbird.nix b/home/thunderbird.nix index b11b9a8a..779ba017 100644 --- a/home/thunderbird.nix +++ b/home/thunderbird.nix @@ -1,8 +1,11 @@ -{...}:{ +{conf,...}:{ programs.thunderbird = { enable = true; settings = { }; + profiles.${conf.user} = { + isDefault = true; + }; }; }