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

Bringing sway back
All checks were successful
/ check (push) Successful in 3m50s
Details

Browse source
This commit is contained in:
Daniel Flanagan 2024-09-12 11:22:43 -05:00
parent e7ecd05161
commit a633ccc36f
12 changed files with 171 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
flake.lock
View file

@ -386,11 +386,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1725976150, "lastModified": 1726132501,
"narHash": "sha256-0N3dolz8WTcko44lP5+9y9M7WP0ViX43AqhidTZDHpg=", "narHash": "sha256-mFSCZCvUZJX51V7F2NA3uAj5iaCzsDWhBXMNDz0PhH0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "155d44016d0cb11332c454db73d59030cdbd7b13", "rev": "73b9756b8d7ee06fc1c9f072f2a41f2dd1aeb2c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -817,11 +817,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725228143, "lastModified": 1725203932,
"narHash": "sha256-kbSiPA5oXiz1+1eVoRslMi5wylHD6SDT8dS9eZAxXAM=", "narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "11e15b437e7efc39e452f36e15a183225d6bfa39", "rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251",
"type": "github" "type": "github"
}, },
"original": { "original": {

18
flake.nix
View file

@ -88,15 +88,17 @@
pkg = callee: overrides: genPkgs (pkgs: pkgs.callPackage callee overrides); pkg = callee: overrides: genPkgs (pkgs: pkgs.callPackage callee overrides);
}; };
colors = (import ./lib/colors.nix {inherit (nixpkgs) lib;}).schemes.catppuccin-mocha-sapphire; style = {
colors = (import ./lib/colors.nix {inherit (nixpkgs) lib;}).schemes.catppuccin-mocha-sapphire;
# font = { font = {
# name = "IosevkaLyteTerm"; name = "IosevkaLyteTerm";
# size = 12; size = 12;
# }; };
};
# moduleArgs = { # moduleArgs = {
# # inherit colors font; # # inherit style;
# inherit helix slippi hyprland hardware disko home-manager; # inherit helix slippi hyprland hardware disko home-manager;
# inherit (outputs) nixosModules homeManagerModules diskoConfigurations overlays; # inherit (outputs) nixosModules homeManagerModules diskoConfigurations overlays;
# }; # };
@ -236,12 +238,12 @@
}; };
nixosModules = import ./modules/nixos { nixosModules = import ./modules/nixos {
inherit home-manager home-manager-unstable helix nixosModules homeManagerModules pubkey overlays colors sops-nix disko; inherit home-manager home-manager-unstable helix nixosModules homeManagerModules pubkey overlays style sops-nix disko;
flakeInputs = self.inputs; flakeInputs = self.inputs;
}; };
homeManagerModules = import ./modules/home-manager { homeManagerModules = import ./modules/home-manager {
inherit home-manager home-manager-unstable helix nixosModules homeManagerModules pubkey overlays colors; inherit home-manager home-manager-unstable helix nixosModules homeManagerModules pubkey overlays style;
inherit (nixpkgs) lib; inherit (nixpkgs) lib;
flakeInputs = self.inputs; flakeInputs = self.inputs;
}; };

28
modules/home-manager/default.nix
View file

@ -1,5 +1,5 @@
{ {
colors, style,
lib, lib,
flakeInputs, flakeInputs,
homeManagerModules, homeManagerModules,
@ -752,7 +752,7 @@
}; };
}; };
themes = with colors.withHashPrefix; { themes = with style.colors.withHashPrefix; {
custom = { custom = {
"type" = orange; "type" = orange;
@ -1188,7 +1188,7 @@
]; ];
}; };
# mako = {}; mako = {};
# nnn = {}; # nnn = {};
@ -1234,7 +1234,19 @@
}; };
}; };
# sway = {}; sway = {
imports = [
{
_module.args = {
inherit style;
};
}
./waybar.nix
./mako.nix
./swaylock.nix
./sway.nix
];
};
# sway-laptop = {}; # sway-laptop = {};
# swaylock = {}; # swaylock = {};
# tmux = {}; # tmux = {};
@ -1247,14 +1259,14 @@
... ...
}: { }: {
# docs: https://wezfurlong.org/wezterm/config/appearance.html#defining-your-own-colors # docs: https://wezfurlong.org/wezterm/config/appearance.html#defining-your-own-colors
programs.wezterm = with colors.withHashPrefix; { programs.wezterm = with style.colors.withHashPrefix; {
enable = true; enable = true;
# package = pkgs.wezterm; # package = pkgs.wezterm;
extraConfig = builtins.readFile ./wezterm/config.lua; extraConfig = builtins.readFile ./wezterm/config.lua;
colorSchemes = { colorSchemes = {
catppuccin-mocha-sapphire = { catppuccin-mocha-sapphire = {
ansi = map (x: colors.withHashPrefix.${toString x}) (pkgs.lib.lists.range 0 7); ansi = map (x: style.colors.withHashPrefix.${toString x}) (pkgs.lib.lists.range 0 7);
brights = map (x: colors.withHashPrefix.${toString (x + 8)}) (pkgs.lib.lists.range 0 7); brights = map (x: style.colors.withHashPrefix.${toString (x + 8)}) (pkgs.lib.lists.range 0 7);
foreground = fg; foreground = fg;
background = bg; background = bg;
@ -1791,7 +1803,7 @@
theme = "match"; theme = "match";
themes = { themes = {
match = with colors.withHashPrefix; { match = with style.colors.withHashPrefix; {
fg = fg; fg = fg;
bg = bg; bg = bg;

4
modules/home-manager/hyprland.nix
View file

@ -8,7 +8,7 @@
}: { }: {
imports = [ imports = [
./ewwbar.nix ./ewwbar.nix
# ./mako.nix ./mako.nix
./swaylock.nix ./swaylock.nix
# TODO: figure out how to import this for this module _and_ for the sway module? # TODO: figure out how to import this for this module _and_ for the sway module?
./linux-desktop.nix ./linux-desktop.nix
@ -45,7 +45,7 @@
exec-once = [ exec-once = [
"hyprpaper" "hyprpaper"
# "mako" "mako"
"swayosd-server" "swayosd-server"
"eww daemon && eww open bar$EWW_BAR_MON" "eww daemon && eww open bar$EWW_BAR_MON"
"firefox" "firefox"

8
modules/home-manager/mako.nix
View file

@ -1,9 +1,5 @@
{ {style, ...}: {
colors, services.mako = with style.colors.withHashPrefix; {
font,
...
}: {
services.mako = with colors.withHashPrefix; {
enable = false; enable = false;
anchor = "top-right"; anchor = "top-right";

22
modules/home-manager/sway.nix
View file

@ -1,29 +1,21 @@
{ {
colors, style,
lib, lib,
config, config,
pkgs, pkgs,
font,
... ...
}: { }: {
imports = [
./waybar.nix
# ./mako.nix
./swaylock.nix
./linux-desktop.nix
];
programs.foot = { programs.foot = {
enable = true; enable = true;
}; };
home.file."${config.xdg.configHome}/mako/config" = { home.file."${config.xdg.configHome}/mako/config" = {
enable = true; enable = true;
text = with colors.withHashPrefix; '' text = with style.colors.withHashPrefix; ''
border-size=1 border-size=1
max-visible=5 max-visible=5
default-timeout=15000 default-timeout=15000
font=Symbols Nerd Font ${toString font.size},${font.name} ${toString font.size} font=Symbols Nerd Font ${toString style.font.size},${style.font.name} ${toString style.font.size}
anchor=top-right anchor=top-right
background-color=${bg} background-color=${bg}
@ -162,9 +154,9 @@
"timeout 600 'swaymsg \"output * dpms off\"' resume 'swaymsg \"output * dpms on\" & maybe-good-morning &'" "timeout 600 'swaymsg \"output * dpms off\"' resume 'swaymsg \"output * dpms on\" & maybe-good-morning &'"
]; ];
} }
# {command = "mako";} {command = "mako";}
# {command = "firefox";} {command = "firefox";}
# {command = "wezterm";} {command = "wezterm";}
]; ];
modes = { modes = {
@ -334,7 +326,7 @@
}; };
assigns = {}; assigns = {};
bars = []; bars = [];
colors = with colors; { colors = with style.colors; {
background = bg; background = bg;
focused = { focused = {
background = bg; background = bg;

8
modules/home-manager/swaylock.nix
View file

@ -1,14 +1,10 @@
{ {style, ...}: {
font,
# colors,
...
}: {
programs.swaylock = { programs.swaylock = {
enable = true; enable = true;
settings = { settings = {
color = "ffffffff"; color = "ffffffff";
image = "~/.wallpaper"; image = "~/.wallpaper";
font = font.name; font = style.font.name;
show-failed-attempts = true; show-failed-attempts = true;
ignore-empty-password = true; ignore-empty-password = true;

10
modules/home-manager/waybar.nix
View file

@ -1,8 +1,4 @@
{ {style, ...}: {
colors,
font,
...
}: {
programs.waybar = { programs.waybar = {
enable = true; enable = true;
settings = { settings = {
@ -136,10 +132,10 @@
style = let style = let
border-width = "0px"; border-width = "0px";
in in
with colors.withHashPrefix; '' with style.colors.withHashPrefix; ''
* { * {
border-radius: 0; border-radius: 0;
font-family: "${font.name}", "Symbols Nerd Font Mono", sans-serif; font-family: "${style.font.name}", "Symbols Nerd Font Mono", sans-serif;
font-size: 16px; font-size: 16px;
} }

125
modules/nixos/default.nix
View file

@ -1,7 +1,7 @@
{ {
disko, disko,
sops-nix, sops-nix,
colors, style,
flakeInputs, flakeInputs,
homeManagerModules, homeManagerModules,
home-manager, home-manager,
@ -11,6 +11,121 @@
pubkey, pubkey,
overlays, overlays,
}: { }: {
ewwbar = {pkgs, ...}: {
# imports = with nixosModules; [];
environment.systemPackages = with pkgs; [eww upower jq];
# TODO: include the home-manager modules for daniel?
};
hyprland = {pkgs, ...}: {
imports = with nixosModules; [
ewwbar
pipewire
];
programs.hyprland = {
enable = true;
};
environment.systemPackages = with pkgs; [hyprpaper xwaylandvideobridge socat];
programs.hyprland = {
package = flakeInputs.hyprland.packages.${pkgs.system}.hyprland;
};
# TODO: include the home-manager modules for daniel?
};
sway = {pkgs, ...}: {
imports = with nixosModules; [
pipewire
];
home-manager.users.daniel = {
imports = with homeManagerModules; [
sway
];
};
programs.sway = {
enable = true;
wrapperFeatures.gtk = true;
};
# services.xserver.libinput.enable = true;
# TODO: a lot of this probably needs de-duping with hyprland?
services.gnome.gnome-keyring.enable = true;
xdg.portal = {
enable = true;
wlr.enable = true;
extraPortals = with pkgs; [
xdg-desktop-portal-wlr
];
};
services.dbus.enable = true;
programs.thunar = {
enable = true;
plugins = with pkgs.xfce; [thunar-archive-plugin thunar-volman];
};
services.gvfs = {
enable = true;
};
environment = {
variables = {
GTK_THEME = "Catppuccin-Mocha-Compact-Sapphire-Dark";
VISUAL = "hx";
PAGER = "less";
MANPAGER = "less";
};
systemPackages = with pkgs; [
brightnessctl
feh
# gimp
grim
# inkscape
# krita
libinput
libinput-gestures
libnotify
mako
# lutris
# nil
# nixpkgs-fmt
noto-fonts
pamixer
# pavucontrol
playerctl
pulseaudio
pulsemixer
# rclone
# restic
slurp
# steam
swaybg
swayidle
swaylock
swayosd
tofi
# vlc
# vulkan-tools
waybar
# weechat
# wine
wl-clipboard
zathura
];
};
};
deno-netlify-ddns-client = import ./deno-netlify-ddns-client.nix; deno-netlify-ddns-client = import ./deno-netlify-ddns-client.nix;
fallback-hostname = {lib, ...}: { fallback-hostname = {lib, ...}: {
@ -442,6 +557,8 @@
}: { }: {
imports = with nixosModules; [ imports = with nixosModules; [
plasma6 plasma6
sway
# hyprland
enable-flatpaks-and-appimages enable-flatpaks-and-appimages
fonts fonts
development-tools development-tools
@ -480,9 +597,7 @@
}; };
}; };
# ewwbar = {};
# gnome = {}; # gnome = {};
# hyprland = {};
# intel = {}; # intel = {};
kde-connect = { kde-connect = {
@ -772,8 +887,6 @@
services.printing.drivers = [pkgs.gutenprint]; services.printing.drivers = [pkgs.gutenprint];
}; };
sway = {};
enable-flatpaks-and-appimages = { enable-flatpaks-and-appimages = {
services.flatpak.enable = true; services.flatpak.enable = true;
programs.appimage.binfmt = true; programs.appimage.binfmt = true;
@ -1023,7 +1136,7 @@
useXkbConfig = lib.mkDefault true; useXkbConfig = lib.mkDefault true;
earlySetup = lib.mkDefault true; earlySetup = lib.mkDefault true;
colors = with colors; [ colors = with style.colors; [
bg bg
red red
green green

3
modules/nixos/ewwbar.nix
View file

@ -1,3 +0,0 @@
{pkgs, ...}: {
environment.systemPackages = with pkgs; [eww upower jq];
}

17
modules/nixos/hyprland.nix
View file

@ -1,17 +0,0 @@
{
inputs,
pkgs,
...
}: {
imports = [
./ewwbar.nix
./pipewire.nix
{
programs.hyprland = {
enable = true;
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
};
environment.systemPackages = with pkgs; [hyprpaper xwaylandvideobridge socat];
}
];
}

81
modules/nixos/sway.nix
View file

@ -1,81 +0,0 @@
{pkgs, ...}: {
imports = [
./pipewire.nix
];
programs.sway = {
enable = true;
wrapperFeatures.gtk = true;
};
# services.xserver.libinput.enable = true;
services.gnome.gnome-keyring.enable = true;
xdg.portal = {
enable = true;
wlr.enable = true;
extraPortals = with pkgs; [
xdg-desktop-portal-wlr
];
};
services.dbus.enable = true;
programs.thunar = {
enable = true;
plugins = with pkgs.xfce; [thunar-archive-plugin thunar-volman];
};
services.gvfs = {
enable = true;
};
environment = {
variables = {
GTK_THEME = "Catppuccin-Mocha-Compact-Sapphire-Dark";
VISUAL = "hx";
PAGER = "less";
MANPAGER = "less";
};
systemPackages = with pkgs; [
brightnessctl
feh
# gimp
grim
# inkscape
# krita
libinput
libinput-gestures
libnotify
# mako
# lutris
# nil
# nixpkgs-fmt
noto-fonts
pamixer
# pavucontrol
playerctl
pulseaudio
pulsemixer
# rclone
# restic
slurp
# steam
swaybg
swayidle
swaylock
swayosd
tofi
# vlc
# vulkan-tools
waybar
# weechat
# wine
wl-clipboard
zathura
];
};
}