byteio/nixos-config
1
0
Fork 0
mirror of https://github.com/librephoenix/nixos-config synced 2025-11-30 22:54:01 +05:30
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: byteio:74ade000816e9b3adcd34d44edf5744a1c238634
Branches Tags
byteio:main
..
compare: byteio:cd339f647cc1b65ccd7ef5ec551ad24155e8b16d
Branches Tags
byteio:main

No commits in common. "74ade000816e9b3adcd34d44edf5744a1c238634" and "cd339f647cc1b65ccd7ef5ec551ad24155e8b16d" have entirely different histories.
74ade00081 ... cd339f647c

13 changed files with 365 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

90
flake.lock generated
View file

@ -104,11 +104,11 @@
"blocklist-hosts": { "blocklist-hosts": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1762541446, "lastModified": 1760670453,
"narHash": "sha256-9L4jyN+ByqdjpsymZW+W56IV3D1mi63D9hm4bcltlfI=", "narHash": "sha256-KQx4CWPfKBJwuBONYSE7AIKa7UBXBvtNVcrOmkPrjkY=",
"owner": "StevenBlack", "owner": "StevenBlack",
"repo": "hosts", "repo": "hosts",
"rev": "99bdb28ee250dd2ad83eeefda0bf64e6262a46ca", "rev": "5da10a61afc297307c489903bfc35b1eb8dac674",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -126,11 +126,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1762542222, "lastModified": 1761326352,
"narHash": "sha256-d46HIbWOP7NXcKPYnO+E1ihn2O5cscsvGr8oQSrVQKg=", "narHash": "sha256-DoR4mHaStX6Dg2Gilc2Dqr/XaxXmQTOQS5cZ5xKPQJY=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "38976b6f30bf13c208066a2f9271b4f5367e4b78", "rev": "6492dc810f2f250ef95096910a44f03eea6a594f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -147,11 +147,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1762593927, "lastModified": 1761325938,
"narHash": "sha256-5MYTB/RUF197w6KwTqnZB0sgOiPp+tqaDdEOJrZ6cuA=", "narHash": "sha256-E2dm2bIlu1zBVBAVYM2bZVdr9vkzXGj70aLTfXuXUKA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "4aaea6591714bb81186d13dcdbf9cecbcb20de72", "rev": "99807d1b33588b9d113fc5e9cca87e4f1ae3e0a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -322,11 +322,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762463325, "lastModified": 1761266473,
"narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=", "narHash": "sha256-QxCyKWBmuzI+eMhYV1JmbZsiUnBNATRP1EW34OBt5Vg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0562fef070a1027325dd4ea10813d64d2c967b39", "rev": "5c71d4a730bd3c972befff343bb074421e345937",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -342,11 +342,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762463325, "lastModified": 1761316995,
"narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=", "narHash": "sha256-BAAjCpjTnfaxtc9NCkbUl9MUv5JmAG5qU7/G8TTHmb4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0562fef070a1027325dd4ea10813d64d2c967b39", "rev": "82b58f38202540bce4e5e00759d115c5a43cab85",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -806,11 +806,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762452596, "lastModified": 1761202163,
"narHash": "sha256-Iaga+mkwWnWa6FxsAYknpHzeP344VCKGkdudX420LgA=", "narHash": "sha256-6RySf5VQElrm7RYGWxlIkNttemDp4FF0aH+LX435G2Y=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "99919fd35e70c1b18ce948d5329928d751031312", "rev": "47976126007d9658ca4ac4dd933bea8846170fd9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -859,11 +859,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1762363567, "lastModified": 1761114652,
"narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -875,11 +875,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1762498405, "lastModified": 1761173472,
"narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -891,11 +891,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1762498405, "lastModified": 1761173472,
"narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -906,11 +906,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1762363567, "lastModified": 1761114652,
"narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -986,11 +986,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762274591, "lastModified": 1761078382,
"narHash": "sha256-Vbhluvk15qwiyNDyPd9tjJh9gxIfUjbKVT79c05Pd3I=", "narHash": "sha256-JNJesbe9MMN1Brq41BHEpuH+Z+Zg74y/nI5AFZX84Vw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "6296d7100cc84b2ff732b7c103a50c2856974cf6", "rev": "27dfa61b64d0cdb8e4ba6f3aaa4d4e067d64cb5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1048,11 +1048,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762483116, "lastModified": 1761273263,
"narHash": "sha256-Z8EVsTH10BjCdFyPxbUu5jBV+HGL39rh9+beQcnNRm0=", "narHash": "sha256-6d6ojnu6A6sVxIjig8OL6E1T8Ge9st3YGgVwg5MOY+Q=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "9de55b59b6aaadbd9dbf223765a835239b767ee5", "rev": "28405834d4fdd458d28e123fae4db148daecec6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1066,11 +1066,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1762569282, "lastModified": 1761273263,
"narHash": "sha256-vINZAJpXQTZd5cfh06Rcw7hesH7sGSvi+Tn+HUieJn8=", "narHash": "sha256-6d6ojnu6A6sVxIjig8OL6E1T8Ge9st3YGgVwg5MOY+Q=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "a35a6144b976f70827c2fe2f5c89d16d8f9179d8", "rev": "28405834d4fdd458d28e123fae4db148daecec6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1118,11 +1118,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1762264356, "lastModified": 1761028816,
"narHash": "sha256-QVfC53Ri+8n3e7Ujx9kq6all3+TLBRRPRnc6No5qY5w=", "narHash": "sha256-s1XiIeJHpODVWfzsPaK9e21iz1dQSCU3H4/1OxOsyps=",
"owner": "nix-community", "owner": "nix-community",
"repo": "stylix", "repo": "stylix",
"rev": "647bb8dd96a206a1b79c4fd714affc88b409e10b", "rev": "b81dc0a385443099e7d231fe6275189e32c3b760",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1297,11 +1297,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762415361, "lastModified": 1761221437,
"narHash": "sha256-po1Ao4hmrC4+o0fvLLT4LN2z1hJ7XPRxpEpzF3cSarQ=", "narHash": "sha256-6V+PkcUvinA/Ryl+tZO0pLvEmJWzfieMKj8UyAFvduo=",
"owner": "winapps-org", "owner": "winapps-org",
"repo": "winapps", "repo": "winapps",
"rev": "c088928440fdf80946de9131e81e081528a5e47a", "rev": "daa052d42d338a50bb3e093a0c86daa3d32f08c5",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
hosts/duskfall/hardware-configuration.nix
View file

@ -27,7 +27,8 @@
vpl-gpu-rt vpl-gpu-rt
intel-media-driver intel-media-driver
intel-vaapi-driver intel-vaapi-driver
libva-vdpau-driver vaapiIntel
vaapiVdpau
libvdpau-va-gl libvdpau-va-gl
]; ];
extraPackages32 = with pkgs.driversi686Linux; [ extraPackages32 = with pkgs.driversi686Linux; [

1
hosts/ori/home.nix
View file

@ -12,6 +12,7 @@
xdg.enable = false; xdg.enable = false;
# programs # programs
ranger.enable = true;
yazi.enable = true; yazi.enable = true;
git.enable = true; git.enable = true;
}; };

19
hosts/zenith/home.nix
View file

@ -1,10 +1,4 @@
{ { config, lib, pkgs, pkgs-stable, ... }:
config,
lib,
pkgs,
pkgs-stable,
...
}:
{ {
config = { config = {
@ -49,16 +43,7 @@
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
openldap openldap ldapvi rclone teams-for-linux pkgs-stable.rpi-imager freerdp pkgs-stable.tigervnc unixtools.xxd nodejs electron
ldapvi
rclone
teams-for-linux
#rpi-imager # FIXME
freerdp
pkgs-stable.tigervnc
unixtools.xxd
nodejs
electron
]; ];
home.sessionVariables = lib.mkIf config.userSettings.hyprland.enable { home.sessionVariables = lib.mkIf config.userSettings.hyprland.enable {

35
modules/system/overlays/ranger.nix Normal file
View file

@ -0,0 +1,35 @@
{ lib, pkgs, ... }:
{
config = {
nixpkgs.overlays = [
(self: super:
{
ranger = super.ranger.overrideAttrs (oldAttrs: {
preConfigure = ''
substituteInPlace ranger/__init__.py \
--replace "DEFAULT_PAGER = 'less'" "DEFAULT_PAGER = '${lib.getBin pkgs.bat}/bin/bat'"
# give image previews out of the box when building with w3m
substituteInPlace ranger/config/rc.conf \
--replace "set preview_images false" "set preview_images true"
# adds this patch: https://github.com/ranger/ranger/pull/1758
# fixes a bug for kitty users that use image previews
substituteInPlace ranger/ext/img_display.py \
--replace "self.image_id -= 1" "self.image_id = max(0, self.image_id - 1)"
# fixes the .desktop file
substituteInPlace doc/ranger.desktop \
--replace "Icon=utilities-terminal" "Icon=user-desktop"
substituteInPlace doc/ranger.desktop \
--replace "Terminal=true" "Terminal=false"
substituteInPlace doc/ranger.desktop \
--replace "Exec=ranger" "Exec=kitty -e ranger %U"
'';
});
}
)
];
};
}

44
modules/system/phoenix/default.nix
View file

@ -1,10 +1,4 @@
{ { config, lib, pkgs, pkgs-stable, ... }:
config,
lib,
pkgs,
pkgs-stable,
...
}:
{ {
options = { options = {
@ -30,8 +24,7 @@
config = { config = {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
attic-client attic-client
git git git-lfs
git-lfs
nix-output-monitor nix-output-monitor
(pkgs.writeScriptBin "phoenix" '' (pkgs.writeScriptBin "phoenix" ''
if [[ $EUID -ne 0 ]]; then if [[ $EUID -ne 0 ]]; then
@ -77,28 +70,30 @@
chown -R 0:0 ${config.systemSettings.dotfilesDir}; chown -R 0:0 ${config.systemSettings.dotfilesDir};
chown -R 0:0 ${config.systemSettings.secretsFlakeDir}; chown -R 0:0 ${config.systemSettings.secretsFlakeDir};
exit 0; exit 0;
# TODO allow specifying host with $2 in build subcommand
elif [ "$1" = "build" ]; then elif [ "$1" = "build" ]; then
if [ "$#" -gt 1 ]; then
echo "Warning: The 'build' command has no subcommands (no $2 subcommand)";
fi
chown -R 0:0 ${config.systemSettings.dotfilesDir}; chown -R 0:0 ${config.systemSettings.dotfilesDir};
chown -R 0:0 ${config.systemSettings.secretsFlakeDir}; chown -R 0:0 ${config.systemSettings.secretsFlakeDir};
pushd ${config.systemSettings.dotfilesDir} &> /dev/null; pushd ${config.systemSettings.dotfilesDir} &> /dev/null;
if [ "$#" -gt 1 ]; then systemd-inhibit --what sleep:idle:handle-lid-switch nixos-rebuild build --flake .#snowfire;
hoststobuild=("''${@:2}")
for i in "''${hoststobuild[@]}"
do
systemd-inhibit --what sleep:idle:handle-lid-switch nixos-rebuild build --flake .#$i;
systemd-inhibit --what sleep:idle:handle-lid-switch attic push emmet ./result; systemd-inhibit --what sleep:idle:handle-lid-switch attic push emmet ./result;
systemd-inhibit --what sleep:idle:handle-lid-switch rm ./result; systemd-inhibit --what sleep:idle:handle-lid-switch rm ./result;
done systemd-inhibit --what sleep:idle:handle-lid-switch nixos-rebuild build --flake .#duskfall;
else systemd-inhibit --what sleep:idle:handle-lid-switch attic push emmet ./result;
hoststobuild=($(find ${config.systemSettings.dotfilesDir}/hosts -maxdepth 1 -type d \! \( -name TEMPLATE \) \! \( -name hosts \) -exec basename {} \; | xargs -d " ")) systemd-inhibit --what sleep:idle:handle-lid-switch rm ./result;
for i in "''${hoststobuild[@]}" systemd-inhibit --what sleep:idle:handle-lid-switch nixos-rebuild build --flake .#zenith;
do systemd-inhibit --what sleep:idle:handle-lid-switch attic push emmet ./result;
systemd-inhibit --what sleep:idle:handle-lid-switch nixos-rebuild build --flake .#$i; systemd-inhibit --what sleep:idle:handle-lid-switch rm ./result;
systemd-inhibit --what sleep:idle:handle-lid-switch nixos-rebuild build --flake .#stardust;
systemd-inhibit --what sleep:idle:handle-lid-switch attic push emmet ./result;
systemd-inhibit --what sleep:idle:handle-lid-switch rm ./result;
systemd-inhibit --what sleep:idle:handle-lid-switch nixos-rebuild build --flake .#ori;
systemd-inhibit --what sleep:idle:handle-lid-switch attic push emmet ./result; systemd-inhibit --what sleep:idle:handle-lid-switch attic push emmet ./result;
systemd-inhibit --what sleep:idle:handle-lid-switch rm ./result; systemd-inhibit --what sleep:idle:handle-lid-switch rm ./result;
done
exit 0; exit 0;
fi
elif [ "$1" = "lock" ]; then elif [ "$1" = "lock" ]; then
if [ "$#" -gt 1 ]; then if [ "$#" -gt 1 ]; then
echo "Warning: The 'lock' command has no subcommands (no $2 subcommand)"; echo "Warning: The 'lock' command has no subcommands (no $2 subcommand)";
@ -132,10 +127,7 @@
# FIXME this thing doesn't work at all # FIXME this thing doesn't work at all
systemd.services."phoenix-system-builder" = lib.mkIf config.systemSettings.systemBuilder.enable { systemd.services."phoenix-system-builder" = lib.mkIf config.systemSettings.systemBuilder.enable {
path = with pkgs; [ path = with pkgs; [
pkgs-stable.openssh pkgs-stable.openssh git nix nixos-rebuild
git
nix
nixos-rebuild
]; ];
script = '' script = ''
set -euo pipefail set -euo pipefail

32
modules/system/security/firejail/default.nix
View file

@ -13,26 +13,18 @@ in {
environment.systemPackages = with pkgs; [ firejail ]; environment.systemPackages = with pkgs; [ firejail ];
programs.firejail.enable = true; programs.firejail.enable = true;
programs.firejail.wrappedBinaries = { programs.firejail.wrappedBinaries = {
brave = { #prismlauncher = {
executable = "${pkgs.brave}/bin/brave"; # executable = "${pkgs.prismlauncher}/bin/prismlauncher";
profile = "${pkgs.firejail}/etc/firejail/brave.profile"; # profile = ./firejail-profiles/prismlauncher.profile;
}; #};
discord = { #steam = {
executable = "${pkgs.discord}/bin/discord"; # executable = "${pkgs.steam}/bin/steam";
profile = "${pkgs.firejail}/etc/firejail/discord.profile"; # profile = "${pkgs.firejail}/etc/firejail/steam.profile";
}; #};
prismlauncher = { #steam-run = {
executable = "${pkgs.prismlauncher}/bin/prismlauncher"; # executable = "${pkgs.steam}/bin/steam-run";
profile = ./firejail-profiles/prismlauncher.profile; # profile = "${pkgs.firejail}/etc/firejail/steam.profile";
}; #};
steam = {
executable = "${pkgs.steam}/bin/steam";
profile = "${pkgs.firejail}/etc/firejail/steam.profile";
};
steam-run = {
executable = "${pkgs.steam}/bin/steam-run";
profile = "${pkgs.firejail}/etc/firejail/steam.profile";
};
}; };
}; };
} }

9
modules/user/emacs/default.nix
View file

@ -14,13 +14,11 @@ in {
}; };
}; };
## THIS IS BROKEN BECAUSE THEY CHANGED EMACS IN NIXPKGS I THINK config = lib.mkIf cfg.enable {
config = lib.mkIf false { home.packages = with pkgs-stable; [
#config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
(pkgs.emacsWithPackagesFromUsePackage { (pkgs.emacsWithPackagesFromUsePackage {
config = ./init.el; config = ./init.el;
package = pkgs.emacs-pgtk; package = pkgs-stable.emacs-pgtk;
alwaysEnsure = false; alwaysEnsure = false;
extraEmacsPackages = epkgs: with epkgs; [ extraEmacsPackages = epkgs: with epkgs; [
org-modern olivetti org-modern olivetti
@ -144,6 +142,7 @@ in {
}) })
fira-code fira-code
nerd-fonts.fira-code nerd-fonts.fira-code
nil
]; ];
home.file.".config/emacs/init.el".source = ./init.el; home.file.".config/emacs/init.el".source = ./init.el;
home.file.".config/emacs/lib".source = ./lib; home.file.".config/emacs/lib".source = ./lib;

174
modules/user/hyprland/default.nix
View file

@ -1,10 +1,4 @@
{ { config, lib, pkgs, inputs, ... }:
config,
lib,
pkgs,
inputs,
...
}:
let let
cfg = config.userSettings.hyprland; cfg = config.userSettings.hyprland;
font = config.stylix.fonts.monospace.name; font = config.stylix.fonts.monospace.name;
@ -29,9 +23,7 @@ in
userSettings.alacritty.enable = true; userSettings.alacritty.enable = true;
programs.alacritty.settings.window.opacity = lib.mkOverride 40 (if performance then 1.0 else 0.85); programs.alacritty.settings.window.opacity = lib.mkOverride 40 (if performance then 1.0 else 0.85);
userSettings.kitty.enable = true; userSettings.kitty.enable = true;
programs.kitty.settings.background_opacity = lib.mkOverride 40 ( programs.kitty.settings.background_opacity = lib.mkOverride 40 (if performance then "1.0" else "0.85");
if performance then "1.0" else "0.85"
);
userSettings.emacs.opacity = lib.mkOverride 40 (if performance then 100 else 85); userSettings.emacs.opacity = lib.mkOverride 40 (if performance then 100 else 85);
userSettings.dmenuScripts = { userSettings.dmenuScripts = {
enable = true; enable = true;
@ -60,9 +52,11 @@ in
GRIM_DEFAULT_DIR = config.xdg.userDirs.extraConfig.XDG_SCREENSHOT_DIR; GRIM_DEFAULT_DIR = config.xdg.userDirs.extraConfig.XDG_SCREENSHOT_DIR;
}; };
xdg.portal = { xdg.portal =
{
enable = true; enable = true;
extraPortals = with pkgs; [ extraPortals = with pkgs;
[
xdg-desktop-portal-wlr xdg-desktop-portal-wlr
xdg-desktop-portal-termfilechooser xdg-desktop-portal-termfilechooser
]; ];
@ -79,9 +73,11 @@ in
home.sessionVariables.TERMCMD = "kitty --class=filechoose_yazi"; home.sessionVariables.TERMCMD = "kitty --class=filechoose_yazi";
xdg.configFile."xdg-desktop-portal-termfilechooser/config" = { xdg.configFile."xdg-desktop-portal-termfilechooser/config" =
{
force = true; force = true;
text = '' text =
''
[filechooser] [filechooser]
cmd=${pkgs.xdg-desktop-portal-termfilechooser}/share/xdg-desktop-portal-termfilechooser/yazi-wrapper.sh cmd=${pkgs.xdg-desktop-portal-termfilechooser}/share/xdg-desktop-portal-termfilechooser/yazi-wrapper.sh
''; '';
@ -119,18 +115,13 @@ in
"alacritty --class scratch_numbat -e numbat" "alacritty --class scratch_numbat -e numbat"
"alacritty --class scratch_btm -e btm" "alacritty --class scratch_btm -e btm"
"element-desktop" "element-desktop"
"zulip"
"sleep 5 && hyprctl keyword bind SUPER,S,exec,${spawnBrowser}" "sleep 5 && hyprctl keyword bind SUPER,S,exec,${spawnBrowser}"
]; ];
general = { general = {
layout = "master"; layout = "master";
border_size = 0; border_size = 0;
"col.active_border" = "col.active_border" = if performance then "0xff${config.lib.stylix.colors.base0B}" else "0xff${config.lib.stylix.colors.base08} 0xff${config.lib.stylix.colors.base09} 0xff${config.lib.stylix.colors.base0A} 0xff${config.lib.stylix.colors.base0B} 0xff${config.lib.stylix.colors.base0C} 0xff${config.lib.stylix.colors.base0D} 0xff${config.lib.stylix.colors.base0E} 0xff${config.lib.stylix.colors.base0F} 270deg";
if performance then
"0xff${config.lib.stylix.colors.base0B}"
else
"0xff${config.lib.stylix.colors.base08} 0xff${config.lib.stylix.colors.base09} 0xff${config.lib.stylix.colors.base0A} 0xff${config.lib.stylix.colors.base0B} 0xff${config.lib.stylix.colors.base0C} 0xff${config.lib.stylix.colors.base0D} 0xff${config.lib.stylix.colors.base0E} 0xff${config.lib.stylix.colors.base0F} 270deg";
"col.inactive_border" = "0xff${config.lib.stylix.colors.base02}"; "col.inactive_border" = "0xff${config.lib.stylix.colors.base02}";
resize_on_border = true; resize_on_border = true;
gaps_in = 14; gaps_in = 14;
@ -139,8 +130,7 @@ in
group = { group = {
"col.border_active" = config.wayland.windowManager.hyprland.settings.general."col.active_border"; "col.border_active" = config.wayland.windowManager.hyprland.settings.general."col.active_border";
"col.border_inactive" = "col.border_inactive" = config.wayland.windowManager.hyprland.settings.general."col.inactive_border";
config.wayland.windowManager.hyprland.settings.general."col.inactive_border";
groupbar = { groupbar = {
gradients = false; gradients = false;
"col.active" = "0xff${config.lib.stylix.colors.base0B}"; "col.active" = "0xff${config.lib.stylix.colors.base0B}";
@ -296,9 +286,8 @@ in
"SUPER,N,togglespecialworkspace,scratch_numbat" "SUPER,N,togglespecialworkspace,scratch_numbat"
''SUPER,B,exec,if hyprctl clients | grep scratch_btm; then echo "scratch_yazi respawn not needed"; else alacritty --class scratch_btm -e btm; fi'' ''SUPER,B,exec,if hyprctl clients | grep scratch_btm; then echo "scratch_yazi respawn not needed"; else alacritty --class scratch_btm -e btm; fi''
"SUPER,B,togglespecialworkspace,scratch_btm" "SUPER,B,togglespecialworkspace,scratch_btm"
''SUPER,D,exec,if hyprctl clients | grep Element; then echo "scratch_chat respawn not needed"; else element-desktop; fi'' ''SUPER,D,exec,if hyprctl clients | grep Element; then echo "scratch_yazi respawn not needed"; else element-desktop; fi''
''SUPER,D,exec,if hyprctl clients | grep Zulip; then echo "scratch_chat respawn not needed"; else zulip; fi'' "SUPER,D,togglespecialworkspace,scratch_element"
"SUPER,D,togglespecialworkspace,scratch_chat"
''SUPER,equal, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | grep float | awk '{print $2 + 0.5}')"'' ''SUPER,equal, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | grep float | awk '{print $2 + 0.5}')"''
''SUPER,minus, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | grep float | awk '{print $2 - 0.5}')"'' ''SUPER,minus, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | grep float | awk '{print $2 - 0.5}')"''
"SUPER,I,exec,networkmanager_dmenu" "SUPER,I,exec,networkmanager_dmenu"
@ -358,16 +347,8 @@ in
"center,class:^(scratch_btm)$" "center,class:^(scratch_btm)$"
"float,class:^(Element)$" "float,class:^(Element)$"
"size 85% 90%,class:^(Element)$" "size 85% 90%,class:^(Element)$"
"workspace special:scratch_chat silent,class:^(Element)$" "workspace special:scratch_element silent,class:^(Element)$"
"center,class:^(Element)$" "center,class:^(Element)$"
"float,class:^(Zulip)$"
"size 85% 90%,class:^(Zulip)$"
"workspace special:scratch_chat silent,class:^(Zulip)$"
"center,class:^(Zulip)$"
"float,class:^(discord)$"
"size 85% 90%,class:^(discord)$"
"workspace special:scratch_chat silent,class:^(discord)$"
"center,class:^(discord)$"
"float,title:^(Save to Disk)$" "float,title:^(Save to Disk)$"
"size 70% 75%,title:^(Save to Disk)$" "size 70% 75%,title:^(Save to Disk)$"
"center,title:^(Save to Disk)$" "center,title:^(Save to Disk)$"
@ -395,14 +376,11 @@ in
"float,title:^(Unlock Database - KeePassXC)$" "float,title:^(Unlock Database - KeePassXC)$"
"size 80% 85%,title:^(Unlock Database - KeePassXC)$" "size 80% 85%,title:^(Unlock Database - KeePassXC)$"
"center,title:^(Unlock Database - KeepassXC)$" "center,title:^(Unlock Database - KeepassXC)$"
] ] ++ lib.optionals (!performance) [
++ lib.optionals (!performance) [
"opacity 0.80,class:^(dev.zed.Zed)$" "opacity 0.80,class:^(dev.zed.Zed)$"
"opacity 0.80,class:^(org.pulseaudio.pavucontrol)$" "opacity 0.80,class:^(org.pulseaudio.pavucontrol)$"
"opacity 1.0,class:^(org.qutebrowser.qutebrowser),fullscreen:1" "opacity 1.0,class:^(org.qutebrowser.qutebrowser),fullscreen:1"
"opacity 0.85,class:^(Element)$" "opacity 0.85,class:^(Element)$"
"opacity 0.85,class:^(Zulip)$"
"opacity 0.85,class:^(discord)$"
"opacity 0.85,class:^(Logseq)$" "opacity 0.85,class:^(Logseq)$"
"opacity 1.0,class:^(Brave-browser),fullscreen:1" "opacity 1.0,class:^(Brave-browser),fullscreen:1"
"opacity 1.0,class:^(librewolf),fullscreen:1" "opacity 1.0,class:^(librewolf),fullscreen:1"
@ -448,16 +426,12 @@ in
}; };
}; };
systemd.variables = [ "--all" ]; systemd.variables = ["--all"];
xwayland = { xwayland = { enable = true; };
enable = true;
};
systemd.enable = true; systemd.enable = true;
}; };
home.packages = ( home.packages = (with pkgs; [
with pkgs;
[
networkmanagerapplet networkmanagerapplet
hyprland-monitor-attached hyprland-monitor-attached
alacritty alacritty
@ -558,6 +532,21 @@ in
#!/bin/sh #!/bin/sh
hyprctl monitors -j | jq ".[$1] | .activeWorkspace.id" hyprctl monitors -j | jq ".[$1] | .activeWorkspace.id"
'') '')
(pkgs.writeScriptBin "open-under-ranger" ''
#!/bin/sh
command="$1"
echo $command
file="''${*:2}"
file=''${file// /\\ }
echo $file
workspace=$(hyprctl monitors -j | jq ".[] | select(.specialWorkspace.name == \"special:scratch_yazi\") | .activeWorkspace.id")
if [ -z "''${workspace}" ]; then
hyprctl dispatch exec -- "$command";
else
hyprctl dispatch exec "[workspace $workspace]" -- "$command" "$file";
fi
hyprctl dispatch togglespecialworkspace scratch_yazi
'')
(pkgs.writeScriptBin "sct" '' (pkgs.writeScriptBin "sct" ''
#!/bin/sh #!/bin/sh
killall wlsunset &> /dev/null; killall wlsunset &> /dev/null;
@ -590,8 +579,7 @@ in
if pgrep -x nixos-rebuild > /dev/null || pgrep -x home-manager > /dev/null || pgrep -x kdenlive > /dev/null || pgrep -x FL64.exe > /dev/null || pgrep -x blender > /dev/null || pgrep -x flatpak > /dev/null; if pgrep -x nixos-rebuild > /dev/null || pgrep -x home-manager > /dev/null || pgrep -x kdenlive > /dev/null || pgrep -x FL64.exe > /dev/null || pgrep -x blender > /dev/null || pgrep -x flatpak > /dev/null;
then echo "Shouldn't suspend"; sleep 10; else echo "Should suspend"; systemctl suspend; fi then echo "Shouldn't suspend"; sleep 10; else echo "Should suspend"; systemctl suspend; fi
'') '')
] ]);
);
home.file.".config/hypr/shaders/grayscale.glsl".text = '' home.file.".config/hypr/shaders/grayscale.glsl".text = ''
/* /*
* Grayscale * Grayscale
@ -650,52 +638,52 @@ in
} }
''; '';
home.file.".config/ashell/config.toml".text = '' home.file.".config/ashell/config.toml".text = ''
outputs = "All" outputs = "All"
position = "Top" position = "Top"
app_launcher_cmd = "nwggrid-wrapper" app_launcher_cmd = "nwggrid-wrapper"
truncate_title_after_length = 150 truncate_title_after_length = 150
[modules] [modules]
left = [ "AppLauncher", "SystemInfo" ] left = [ "AppLauncher", "SystemInfo" ]
center = [ "Workspaces" ] center = [ "Workspaces" ]
right = [ "Clock", "Settings", "Tray" ] right = [ "Clock", "Settings", "Tray" ]
[workspaces] [workspaces]
visibility_mode = "MonitorSpecific" visibility_mode = "MonitorSpecific"
enable_workspace_filling = true enable_workspace_filling = true
[system.cpu] [system.cpu]
warn_threshold = 80 warn_threshold = 80
alert_threshold = 95 alert_threshold = 95
[system.mem] [system.mem]
warn_threshold = 50 warn_threshold = 50
alert_threshold = 75 alert_threshold = 75
[system.temp] [system.temp]
warn_threshold = 85 warn_threshold = 85
alert_threshold = 95 alert_threshold = 95
[clock] [clock]
format = "%a %d %b %H:%M:%S" format = "%a %d %b %H:%M:%S"
[mediaPlayer] [mediaPlayer]
max_title_length = 100 max_title_length = 100
[settings] [settings]
lockCmd = "hyprlock &" lockCmd = "hyprlock &"
audio_sinks_more_cmd = "pavucontrol -t 3" audio_sinks_more_cmd = "pavucontrol -t 3"
audio_sources_more_cmd = "pavucontrol -t 4" audio_sources_more_cmd = "pavucontrol -t 4"
wifi_more_cmd = "nm-connection-editor" wifi_more_cmd = "nm-connection-editor"
vpn_more_cmd = "nm-connection-editor" vpn_more_cmd = "nm-connection-editor"
bluetooth_more_cmd = "blueman-manager" bluetooth_more_cmd = "blueman-manager"
[appearance] [appearance]
scale_factor = 1.25 scale_factor = 1.25
style = "Solid" style = "Solid"
opacity = ${if performance then "1.0" else "0.7"} opacity = ${if performance then "1.0" else "0.7"}
background_color = "#${config.lib.stylix.colors.base00}88" background_color = "#${config.lib.stylix.colors.base00}88"
primary_color = "#${config.lib.stylix.colors.base0A}" primary_color = "#${config.lib.stylix.colors.base0A}"
secondary_color = "#${config.lib.stylix.colors.base01}" secondary_color = "#${config.lib.stylix.colors.base01}"
success_color = "#${config.lib.stylix.colors.base0A}" success_color = "#${config.lib.stylix.colors.base0A}"
danger_color = "#${config.lib.stylix.colors.base08}" danger_color = "#${config.lib.stylix.colors.base08}"
text_color = "#${config.lib.stylix.colors.base07}" text_color = "#${config.lib.stylix.colors.base07}"
workspace_colors = [ "#${config.lib.stylix.colors.base0B}", "#${config.lib.stylix.colors.base0B}" ] workspace_colors = [ "#${config.lib.stylix.colors.base0B}", "#${config.lib.stylix.colors.base0B}" ]
specialWorkspaceColors = [ "#${config.lib.stylix.colors.base0B}", "#${config.lib.stylix.colors.base0B}" ] specialWorkspaceColors = [ "#${config.lib.stylix.colors.base0B}", "#${config.lib.stylix.colors.base0B}" ]
[appearance.menu] [appearance.menu]
opacity = ${if performance then "1.0" else "0.7"} opacity = ${if performance then "1.0" else "0.7"}
backdrop = 0.0 backdrop = 0.0
''; '';
home.file.".config/hypr/hypridle.conf".text = '' home.file.".config/hypr/hypridle.conf".text = ''
general { general {

6
modules/user/nix/default.nix
View file

@ -1,11 +1,7 @@
{ pkgs, ... }: { ... }:
{ {
config = { config = {
home.stateVersion = "22.11"; home.stateVersion = "22.11";
home.packages = with pkgs; [
nil nixd
nixdoc
];
}; };
} }

2
modules/user/office/default.nix
View file

@ -21,8 +21,6 @@ in {
gnome-maps gnome-maps
seahorse seahorse
element-desktop element-desktop
zulip
discord
openvpn openvpn
pomodoro-gtk pomodoro-gtk
]; ];

2
modules/user/shell/default.nix
View file

@ -69,6 +69,6 @@ in {
programs.direnv.enable = true; programs.direnv.enable = true;
programs.direnv.enableZshIntegration = true; programs.direnv.enableZshIntegration = true;
programs.direnv.nix-direnv.enable = true; programs.direnv.nix-direnv.enable = true;
programs.direnv.nix-direnv.package = pkgs.nix-direnv; programs.direnv.nix-direnv.package = pkgs.nix-direnv-flakes;
}; };
} }

2
modules/user/zed/default.nix
View file

@ -11,7 +11,7 @@ in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
gitu gitu nixd
]; ];
stylix.targets.zed.enable = true; stylix.targets.zed.enable = true;
programs.zed-editor.enable = true; programs.zed-editor.enable = true;