bchmnn/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: add ags

Browse source
This commit is contained in:
Jacob Bachmann 2024-04-01 12:29:46 +02:00
parent c47bef985a
commit a51ff38394
Signed by: bchmnn
GPG key ID: 732A612DAD28067D
7 changed files with 78 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

45
flake.lock generated
View file

@ -1,5 +1,23 @@
{ {
"nodes": { "nodes": {
"ags": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1711629152,
"narHash": "sha256-GxhduJ3mRzdtdOiJTn2fD6Z5rvM51aT9X7YrZCmoKbs=",
"owner": "Aylur",
"repo": "ags",
"rev": "eedd643db42bb9a5f837904062efb01b6d59fa5b",
"type": "github"
},
"original": {
"owner": "Aylur",
"repo": "ags",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -87,7 +105,7 @@
"hyprcursor": "hyprcursor", "hyprcursor": "hyprcursor",
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang_2", "hyprlang": "hyprlang_2",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"systems": "systems_2", "systems": "systems_2",
"wlroots": "wlroots", "wlroots": "wlroots",
"xdph": "xdph" "xdph": "xdph"
@ -196,6 +214,22 @@
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1708475490,
"narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0e74ca98a74bc7270d28838369593635a5db3260",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1711523803, "lastModified": 1711523803,
"narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
@ -211,7 +245,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1711523803, "lastModified": 1711523803,
"narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
@ -227,7 +261,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1711163522, "lastModified": 1711163522,
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
@ -245,11 +279,12 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"ags": "ags",
"home-manager": "home-manager", "home-manager": "home-manager",
"hy3": "hy3", "hy3": "hy3",
"hyprland": "hyprland", "hyprland": "hyprland",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"waybar": "waybar" "waybar": "waybar"
} }
}, },
@ -286,7 +321,7 @@
"waybar": { "waybar": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1711628124, "lastModified": 1711628124,

22
flake.nix
View file

@ -5,8 +5,10 @@
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
home-manager.url = "github:nix-community/home-manager"; home-manager = {
home-manager.inputs.nixpkgs.follows = "nixpkgs"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
hy3 = { hy3 = {
@ -16,20 +18,22 @@
waybar.url = "github:Alexays/Waybar"; waybar.url = "github:Alexays/Waybar";
ags.url = "github:Aylur/ags";
}; };
outputs = { self, nixpkgs, nixos-hardware, home-manager, hyprland, hy3, waybar, ... }@inputs: { outputs = { self, nixpkgs, nixos-hardware, ... }@inputs: {
nixosConfigurations = { nixosConfigurations = {
W530 = nixpkgs.lib.nixosSystem { W530 = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = inputs; specialArgs = inputs;
modules = [ modules = [
hyprland.nixosModules.default inputs.hyprland.nixosModules.default
./modules ./modules
./hosts/W530 ./hosts/W530
home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
{ {
imports = [ ./users/gandalf ]; imports = [ ./users/gandalf ];
@ -42,14 +46,14 @@
specialArgs = inputs; specialArgs = inputs;
modules = [ modules = [
hyprland.nixosModules.default inputs.hyprland.nixosModules.default
./modules ./modules
./hosts/T430 ./hosts/T430
# nixos-hardware.nixosModules.lenovo-thinkpad-t430 # nixos-hardware.nixosModules.lenovo-thinkpad-t430
home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
{ {
imports = [ ./users/gandalf ]; imports = [ ./users/gandalf ];
@ -62,12 +66,12 @@
specialArgs = inputs; specialArgs = inputs;
modules = [ modules = [
hyprland.nixosModules.default inputs.hyprland.nixosModules.default
./modules ./modules
./hosts/IROH ./hosts/IROH
home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
{ {
imports = [ ./users/gandalf ]; imports = [ ./users/gandalf ];

10
users/gandalf/default.nix
View file

@ -1,4 +1,4 @@
{ unstable, hyprland, hy3, waybar, ... }: { ... }@inputs:
let let
aliases = import ../../modules/aliases.nix; aliases = import ../../modules/aliases.nix;
in in
@ -11,15 +11,13 @@ in
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = {
inherit unstable; inherit inputs;
inherit hyprland;
inherit hy3;
inherit waybar;
}; };
home-manager.users.gandalf = { pkgs, ... }: { home-manager.users.gandalf = { pkgs, ... }: {
imports = [ imports = [
hyprland.homeManagerModules.default inputs.hyprland.homeManagerModules.default
inputs.ags.homeManagerModules.default
./modules ./modules
]; ];

16
users/gandalf/modules/gui/ags/default.nix Normal file
View file

@ -0,0 +1,16 @@
{ pkgs, ... }: {
programs.ags = {
enable = true;
# null or path, leave as null if you don't want hm to manage the config
# configDir = ../ags;
# additional packages to add to gjs's runtime
extraPackages = with pkgs; [
gtksourceview
webkitgtk
];
};
}

1
users/gandalf/modules/gui/default.nix
View file

@ -2,6 +2,7 @@
imports = with lib; with nixosConfig.bchmnn; imports = with lib; with nixosConfig.bchmnn;
optionals gui.enable [ optionals gui.enable [
./ags
./gtk.nix ./gtk.nix
./programs ./programs
] ++ optionals (gui.enable && elem "sway" gui.flavour) [ ] ++ optionals (gui.enable && elem "sway" gui.flavour) [

4
users/gandalf/modules/gui/hyprland/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, nixosConfig, hy3, config, ... }: { pkgs, lib, nixosConfig, config, inputs, ... }:
let let
common = (import ../common.nix) { pkgs = pkgs; lib = lib; }; common = (import ../common.nix) { pkgs = pkgs; lib = lib; };
@ -62,7 +62,7 @@ in
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
plugins = [ hy3.packages.x86_64-linux.hy3 ]; plugins = [ inputs.hy3.packages.x86_64-linux.hy3 ];
settings = { settings = {
env = with lib; with nixosConfig.bchmnn; optionals nvidia.enable [ env = with lib; with nixosConfig.bchmnn; optionals nvidia.enable [
"CLUTTER_BACKEND,wayland" "CLUTTER_BACKEND,wayland"

4
users/gandalf/modules/gui/waybar.nix
View file

@ -1,4 +1,4 @@
{ pkgs, waybar, ... }: { pkgs, inputs, ... }:
let let
check-battery = pkgs.writeShellScript "check-battery" '' check-battery = pkgs.writeShellScript "check-battery" ''
bat=/sys/class/power_supply/BAT0 bat=/sys/class/power_supply/BAT0
@ -687,6 +687,6 @@ in
programs.waybar = { programs.waybar = {
enable = true; enable = true;
# TODO replace with (un-)stable channel version once available # TODO replace with (un-)stable channel version once available
package = waybar.packages.x86_64-linux.default; package = inputs.waybar.packages.x86_64-linux.default;
}; };
} }