Skip to content

Commit

Permalink
feat: switch to andromeda
Browse files Browse the repository at this point in the history
  • Loading branch information
sioodmy committed Jun 8, 2024
1 parent 0dd9c2c commit 98b45d0
Show file tree
Hide file tree
Showing 9 changed files with 562 additions and 208 deletions.
716 changes: 527 additions & 189 deletions flake.lock

Large diffs are not rendered by default.

13 changes: 9 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@
};
};

ags = {
url = "github:Aylur/ags";
inputs.nixpkgs.follows = "nixpkgs";
};

# a tree-wide formatter
treefmt-nix = {
url = "github:numtide/treefmt-nix";
Expand All @@ -135,8 +140,9 @@
inputs.home-manager.follows = "home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
seashell = {
url = "github:sioodmy/seashell";
andromeda = {
# url = "github:sioodmy/andromeda";
url = "path:/home/sioodmy/dev/andromeda";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-parts.follows = "flake-parts";
Expand Down Expand Up @@ -179,8 +185,7 @@
};
};
bitcoinstatus = {
# url = "github:sioodmy/bitcoinstatus";
url = "path:/home/sioodmy/dev/bitcoinstatus";
url = "github:sioodmy/bitcoinstatus";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-parts.follows = "flake-parts";
Expand Down
2 changes: 1 addition & 1 deletion home/impermanence.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ in {
"vids"
"other"
]
++ forEach ["syncthing" "Caprine" "VencordDesktop" "obs-studio" "Signal" "niri" "BraveSoftware" "nicotine"] (
++ forEach ["syncthing" "Caprine" "VencordDesktop" "obs-studio" "Signal" "niri" "BraveSoftware" "nicotine" "ags"] (
x: ".config/${x}"
)
++ forEach ["tealdeer" "keepassxc" "nix" "starship" "nix-index" "mozilla" "go-build" "BraveSoftware"] (
Expand Down
9 changes: 8 additions & 1 deletion home/packages.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
{pkgs, ...}: {
{pkgs, inputs, ...}: {
nixpkgs.config.allowUnfree = false;
home.packages = with pkgs; [
inputs.ags.packages.${pkgs.system}.default

#ags
overskride
dart-sass


libreoffice-fresh
thunderbird
nicotine-plus
Expand Down
8 changes: 4 additions & 4 deletions home/rice/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{...}: {
imports = [
./foot.nix
# ./foot.nix
./zathura.nix
./dunst.nix
# ./dunst.nix
./gtk.nix
./waybar
# ./waybar
./fuzzel
./niri
# ./niri
];
}
11 changes: 5 additions & 6 deletions home/rice/foot.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@
inputs,
...
}: let
seashell = inputs.seashell.packages.${pkgs.system}.default;
nucleus = inputs.andromeda.packages.${pkgs.system}.nucleus;
in {
home.packages = with pkgs; [
libsixel
seashell
# for displaying images
home.packages = [
pkgs.libsixel
nucleus
];
programs.foot = {
enable = true;
Expand All @@ -21,7 +20,7 @@ in {
locked-title = "no";
term = "xterm-256color";
font = "monospace:size=9";
shell = "${seashell}/bin/seashell";
shell = "${nucleus}/bin/nucleus";
vertical-letter-offset = "-0.75";
pad = "12x21 center";
resize-delay-ms = 100;
Expand Down
2 changes: 1 addition & 1 deletion home/rice/niri/config.nix
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ with theme.colors; {
natural-scroll = true;
click-method = "clickfinger";
};
focus-follows-mouse = true;
focus-follows-mouse = false;
warp-mouse-to-focus = true;
trackpoint.accel-speed = 0.001;
};
Expand Down
6 changes: 5 additions & 1 deletion system/wayland/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,14 @@
eval $(gnome-keyring-daemon --start --components=ssh,secrets)
eval $(ssh-agent)
'';
systemPackages = with pkgs; [
systemPackages = with pkgs;
with inputs.andromeda.packages.${pkgs.system}; [
pamixer
brightnessctl
wl-clipboard
andromeda
andromeda-niri
nucleus
];
};

Expand Down
3 changes: 2 additions & 1 deletion system/wayland/services.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
enable = true;
settings = rec {
initial_session = {
command = "${config.programs.niri.package}/bin/niri-session";
# command = "${config.programs.niri.package}/bin/niri-session";
command = "${inputs.andromeda.packages.${pkgs.system}.andromeda-niri}/bin/niri";
user = "sioodmy";
};
default_session = initial_session;
Expand Down

0 comments on commit 98b45d0

Please sign in to comment.