kat/nixfiles
1
0
Fork 0
mirror of https://github.com/kittywitch/nixfiles.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity

feat: consistent konawall on hyprland

Browse source
This commit is contained in:
Kat Inskip 2024-03-10 12:28:14 -07:00
parent 576f3a3e7e
commit 15f40761fb
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
17 changed files with 92 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.lock generated
View file

@ -411,11 +411,11 @@
]
},
"locked": {
"lastModified": 1708208882,
"narHash": "sha256-Th5ybDsLfWJWDLGeLKLvrYYBQWLarZxWQyWWNNpZg+c=",
"lastModified": 1710095677,
"narHash": "sha256-M1FyL+mCy0dyVfBi2qft3rcqU5NJh2BOQMwJdP2SDek=",
"owner": "kittywitch",
"repo": "konawall-py",
"rev": "51fe663a47c4ad4d36dcd316495c58213e501785",
"rev": "e9eb56126b1c77f2799b1da2a94afc468a1aafec",
"type": "github"
},
"original": {

2
home/environments/gnome/dconf.nix
View file

@ -4,7 +4,7 @@ _: {
settings = {
"org/gnome/shell" = {
favorite-apps = [
"brave-browser.desktop"
"firefox.desktop"
"thunderbird.desktop"
"nheko.desktop"
"discord.desktop"

13
home/environments/hyprland/hyprland.nix
View file

@ -28,16 +28,11 @@ in {
SDL_VIDEODRIVER = "wayland";
XDG_SESSION_TYPE = "wayland";
};
systemd.user.services.swayidle.Install.WantedBy = lib.mkForce ["hyprland-session.target"];
wayland.windowManager.hyprland = {
enable = true;
systemd = {
enable = true;
variables = ["--all"];
extraCommands = [
"systemctl --user stop graphical-session.target"
"systemctl --user start hyprland-session.target"
];
};
xwayland.enable = true;
settings = {
@ -73,16 +68,16 @@ in {
"eDP-1, 2256x1504, 0x0, 1"
];
exec-once = [
"${pkgs.swww}/bin/swww init"
"${pkgs.hypridle}/bin/hypridle"
"${pkgs.udiskie}/bin/udiskie &"
"${pkgs.dbus}/bin/dbus-update-activation-environment --all"
"${pkgs.libsForQt5.polkit-kde-agent}/bin/polkit-kde-agent"
"${pkgs.networkmanagerapplet}/bin/nm-applet"
"${pkgs.mako}/bin/mako"
"${pkgs.swww}/bin/swww init"
"${pkgs.systemd}/bin/systemctl --user restart waybar.service"
"${pkgs.udiskie}/bin/udiskie &"
"${pkgs.pasystray}/bin/pasystray"
"${inputs.konawall-py.packages.${pkgs.system}.konawall-py}/bin/konawall"
];
exec = [
];
xwayland = {
force_zero_scaling = true;

25
home/environments/hyprland/konawall.nix
View file

@ -1,19 +1,24 @@
{
inputs,
pkgs,
config,
...
}: let
desktop_entry = ''
[Desktop Entry]
Exec=${inputs.konawall-py.packages.${pkgs.system}.konawall-py}/bin/konawall
Icon=
Name=konawall
Path=
Terminal=False
Type=Application
'';
systemd.user.services.konawall-py = {
Unit = {
Description = "konawall-py";
X-Restart-Triggers = [(toString config.xdg.configFile."konawall/config.toml".source)];
After = ["hyprland-session.target"];
};
Service = {
ExecStart = "${inputs.konawall-py.packages.${pkgs.system}.konawall-py}/bin/konawall";
Restart = "always";
};
Install = {WantedBy = ["hyprland-session.target"];};
};
konawallConfig = {
interval = 30 * 60;
interval = 60 * 5;
rotate = true;
source = "konachan";
tags = [

23
home/environments/hyprland/waybar.nix
View file

@ -2,13 +2,27 @@
kittywitch,
pkgs,
config,
lib,
...
}: {
systemd.user.services.waybar.Unit.X-Restart-Triggers = [
(builtins.hashString "md5" (builtins.toJSON config.programs.waybar.settings))
];
}: let
inherit (lib.modules) mkForce;
in {
systemd.user.services.waybar = {
Install.WantedBy = lib.mkForce ["hyprland-session.target"];
Service = {
RestartSec = "1s";
};
Unit = {
After = ["hyprland-session.target"];
X-Restart-Triggers = [
(builtins.hashString "md5" (builtins.toJSON config.programs.waybar.settings))
];
};
};
programs.waybar = {
enable = true;
systemd.enable = true;
style = let
template = kittywitch.sassTemplate {
name = "waybar-style";
@ -16,7 +30,6 @@
};
in
template.source;
systemd.enable = true;
settings.main = {
layer = "top";
position = "top";

4
home/environments/hyprland/waybar.sass
View file

@ -11,7 +11,7 @@
%widget_unpadded
transition: none
background: $base01
background: rgba($base01, 0.5)
color: $base07
margin: 0 4px
@ -21,7 +21,7 @@
padding-top: 2px
window#waybar
background: rgba($base00, 0.9)
background: rgba($base00, 0.1)
border-bottom: 2px solid transparent
// sway/workspaces

16
home/environments/kde/gtk.nix
View file

@ -2,8 +2,8 @@
gtk = {
enable = true;
iconTheme = {
name = "Papirus";
package = pkgs.papirus-icon-theme;
name = "Numix-Square-Light";
package = pkgs.numix-icon-theme-square;
};
theme = {
@ -15,18 +15,6 @@
name = "Numix-Cursor";
package = pkgs.numix-cursor-theme;
};
gtk3.extraConfig = {
Settings = ''
gtk-application-prefer-dark-theme=1
'';
};
gtk4.extraConfig = {
Settings = ''
gtk-application-prefer-dark-theme=1
'';
};
};
home.sessionVariables.GTK_THEME = "Arc";

2
home/environments/kde/kde.nix
View file

@ -11,9 +11,9 @@ _: {
"kdeglobals"."General"."BrowserApplication" = "firefox.desktop";
"kdeglobals"."General"."TerminalApplication" = "wezterm start --cwd .";
"kdeglobals"."General"."TerminalService" = "org.wezfurlong.wezterm.desktop";
"kxkbrc"."Layout"."Options" = "terminate:ctrl_alt_bksp,ctrl:nocaps";
"kxkbrc"."Layout"."ResetOldOptions" = true;
"plasmarc"."Theme"."name" = "Arc";
"kxkbrc"."Layout"."Options" = "terminate:ctrl_alt_bksp,ctrl:hyper_capscontrol";
};
};
}

5
home/environments/kde/konawall.nix
View file

@ -3,9 +3,12 @@
pkgs,
...
}: let
konawallWithDelay = pkgs.writeShellScriptBin "konawall" ''
sleep 5 && ${inputs.konawall-py.packages.${pkgs.system}.konawall-py}/bin/konawall
'';
desktop_entry = ''
[Desktop Entry]
Exec=${inputs.konawall-py.packages.${pkgs.system}.konawall-py}/bin/konawall
Exec=${konawallWithDelay}/bin/konawall
Icon=
Name=konawall
Path=

7
nixos/environments/gnome/packages.nix
View file

@ -6,16 +6,9 @@
])
++ (with pkgs.gnome; [
cheese # webcam tool
gnome-music
gedit # text editor
epiphany # web browser
geary # email reader
gnome-characters
tali # poker game
iagno # go game
hitori # sudoku game
atomix # puzzle game
yelp # Help view
gnome-contacts
gnome-initial-setup
]);

3
nixos/environments/hyprland/colord.nix Normal file
View file

@ -0,0 +1,3 @@
_: {
services.colord.enable = true;
}

14
nixos/hardware/framework/boot.nix Normal file
View file

@ -0,0 +1,14 @@
_: {
boot = {
plymouth = {
enable = true;
};
consoleLogLevel = 0;
kernelParams = [ "quiet" ];
initrd = {
verbose = false;
systemd.enable = true;
availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod"];
};
};
}

8
nixos/hardware/framework/color.nix Normal file
View file

@ -0,0 +1,8 @@
{
pkgs,
...
}: {
home-manager.users.kat.wayland.windowManager.hyprland.settings.exec-once = [
"${pkgs.colord}/bin/colormgr import-profile ${./framework-icc.icm}"
];
}

19
nixos/hardware/framework.nix → nixos/hardware/framework/fingerprint.nix
View file

@ -1,21 +1,4 @@
{
inputs,
tree,
pkgs,
...
}: {
imports =
(with tree.nixos.hardware; [
amd_cpu
amd_gpu
uefi
])
++ [
inputs.nixos-hardware.outputs.nixosModules.framework-13-7040-amd
];
boot.initrd = {
availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod"];
};
{ pkgs, ... }: {
services = {
fwupd = {
enable = true;

BIN
nixos/hardware/framework/framework-icc.icm Normal file
View file

Binary file not shown.

15
nixos/hardware/framework/imports.nix Normal file
View file

@ -0,0 +1,15 @@
{
inputs,
tree,
...
}: {
imports =
(with tree.nixos.hardware; [
amd_cpu
amd_gpu
uefi
])
++ [
inputs.nixos-hardware.outputs.nixosModules.framework-13-7040-amd
];
}

2
systems/koishi.nix
View file

@ -35,7 +35,7 @@ _: let
fileSystems = {
"/" = {
device = "UUID=861e8815-9327-4e49-915b-73a3b0bdfa25";
device = "/dev/disk/by-uuid/861e8815-9327-4e49-915b-73a3b0bdfa25";
fsType = "bcachefs";
};
"/boot" = {