From cc179c30a314e8ac659a99726e9fe81d385fd1c1 Mon Sep 17 00:00:00 2001 From: biscuit Date: Tue, 13 May 2025 19:43:34 -0500 Subject: [PATCH] update ags --- flake.lock | 80 ++++++++++++++++++++------- flake.nix | 19 +------ home-manager/home.nix | 1 + packages/ags/default.nix | 17 ++++++ packages/hyprland/custom/general.conf | 2 +- 5 files changed, 82 insertions(+), 37 deletions(-) create mode 100644 packages/ags/default.nix diff --git a/flake.lock b/flake.lock index f9f3900..4f813cb 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,24 @@ { "nodes": { + "ags": { + "inputs": { + "astal": "astal", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1744557573, + "narHash": "sha256-XAyj0iDuI51BytJ1PwN53uLpzTDdznPDQFG4RwihlTQ=", + "owner": "aylur", + "repo": "ags", + "rev": "3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6", + "type": "github" + }, + "original": { + "owner": "aylur", + "repo": "ags", + "type": "github" + } + }, "aquamarine": { "inputs": { "hyprutils": [ @@ -33,6 +52,27 @@ "type": "github" } }, + "astal": { + "inputs": { + "nixpkgs": [ + "ags", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742571008, + "narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=", + "owner": "aylur", + "repo": "astal", + "rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e", + "type": "github" + }, + "original": { + "owner": "aylur", + "repo": "astal", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -159,7 +199,7 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" @@ -351,6 +391,22 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1743583204, + "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1746461020, "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", @@ -366,7 +422,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1746904237, "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", @@ -382,22 +438,6 @@ "type": "github" } }, - "nixpkgsveryold": { - "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -423,10 +463,10 @@ }, "root": { "inputs": { + "ags": "ags", "home-manager": "home-manager", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_2", - "nixpkgsveryold": "nixpkgsveryold" + "nixpkgs": "nixpkgs_3" } }, "systems": { diff --git a/flake.nix b/flake.nix index f33b3d9..60908db 100644 --- a/flake.nix +++ b/flake.nix @@ -3,28 +3,14 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; - nixpkgsveryold.url = "github:nixos/nixpkgs?ref=nixos-23.05"; - home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # ensures version follows nixpkgs hyprland.url = "github:hyprwm/Hyprland"; + ags.url = "github:aylur/ags"; }; - #outputs = { self, nixpkgs, nixpkgsveryold }: - #let - # pkgs = nixpkgs.legacyPackages.x86_64-linux; - # pkgsold = nixpkgsveryold.legacyPackages.x86_64-linux; - #in - #{ - #packages.x86_64-linux.hello = pkgs.hello; - #packages.x86_64-linux.default = pkgs.hello; - #devShells.x86_64-linux-default = pkgs.mkShell { - # buildInputs = [ pkgs.neovim pkgsold.vim ]; - # }; - #}; - - outputs = { self, nixpkgs, home-manager, ... } @ inputs: + outputs = { self, nixpkgs, home-manager, ags, ... } @ inputs: let lib = nixpkgs.lib; system = "x86_64-linux"; @@ -39,6 +25,7 @@ }; homeConfigurations = { biscuit = home-manager.lib.homeManagerConfiguration { + extraSpecialArgs = { inherit inputs; }; inherit pkgs; modules = [ ./home-manager/home.nix ]; diff --git a/home-manager/home.nix b/home-manager/home.nix index 759be63..35a6149 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -5,6 +5,7 @@ ../packages/nvim/default.nix # ../packages/zsh/default.nix ../modules/terminal.nix + ../packages/ags/default.nix ../packages/hyprland/default.nix # /home/biscuit/Nixos/packages/hyprland/default.nix ]; diff --git a/packages/ags/default.nix b/packages/ags/default.nix new file mode 100644 index 0000000..127576c --- /dev/null +++ b/packages/ags/default.nix @@ -0,0 +1,17 @@ +{ inputs, pkgs, ... }: { + # add the home manager module + imports = [ inputs.ags.homeManagerModules.default ]; + + programs.ags = { + enable = true; + + # symlink to ~/.config/ags + configDir = ./custom; + + # additional packages to add to gjs's runtime + extraPackages = with pkgs; [ + inputs.ags.packages.${pkgs.system}.battery + fzf + ]; + }; +} diff --git a/packages/hyprland/custom/general.conf b/packages/hyprland/custom/general.conf index 28d70c4..c264e04 100644 --- a/packages/hyprland/custom/general.conf +++ b/packages/hyprland/custom/general.conf @@ -35,7 +35,7 @@ general { # https://wiki.hyprland.org/Configuring/Variables/#decoration decoration { - rounding = 10 + rounding = 0 rounding_power = 2 # Change transparency of focused and unfocused windows