Compare commits
4 Commits
452426f363
...
3b23c25509
| Author | SHA1 | Date | |
|---|---|---|---|
| 3b23c25509 | |||
| 0874bb6698 | |||
| 316bffb9f5 | |||
| b19be561bf |
1167
flake.lock
generated
1167
flake.lock
generated
File diff suppressed because it is too large
Load Diff
16
flake.nix
16
flake.nix
@@ -176,6 +176,18 @@
|
|||||||
url = "git+https://tangled.org/tangled.org/core";
|
url = "git+https://tangled.org/tangled.org/core";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
hyprland = {
|
||||||
|
url = "github:hyprwm/Hyprland";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
iamb = {
|
||||||
|
url = "github:ulyssa/iamb/latest";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
cinny = {
|
||||||
|
url = "github:cinnyapp/cinny/dev";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = {
|
outputs = {
|
||||||
@@ -354,10 +366,6 @@
|
|||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
# packages = rec {
|
|
||||||
# default = neovim;
|
|
||||||
# neovim = pkgs.nixvim.makeNixvim (pkgs.callPackage ./neovim);
|
|
||||||
# };
|
|
||||||
devShells = {
|
devShells = {
|
||||||
default = pkgs.mkShell {
|
default = pkgs.mkShell {
|
||||||
packages = with pkgs; [sops just openssl ast-grep];
|
packages = with pkgs; [sops just openssl ast-grep];
|
||||||
|
|||||||
@@ -158,6 +158,5 @@
|
|||||||
Fingerprinting = true;
|
Fingerprinting = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
suppressXdgMigrationWarning = true;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -85,5 +85,6 @@
|
|||||||
./yq.nix
|
./yq.nix
|
||||||
./codex.nix
|
./codex.nix
|
||||||
./nixify.nix
|
./nixify.nix
|
||||||
|
./iamb.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
3
home/programs/iamb.nix
Normal file
3
home/programs/iamb.nix
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
{pkgs, ...}: {
|
||||||
|
home.packages = [pkgs.iamb];
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
device,
|
device,
|
||||||
lib,
|
lib,
|
||||||
|
inputs,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
# lib.optionalAttrs device.isNix
|
# lib.optionalAttrs device.isNix
|
||||||
@@ -31,6 +32,8 @@
|
|||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
enable = device.is "ryu";
|
enable = device.is "ryu";
|
||||||
systemd.enable = true;
|
systemd.enable = true;
|
||||||
|
package = pkgs.hyprland;
|
||||||
|
portalPackage = pkgs.xdph;
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
# source = "${pkgs.catppuccinThemes.hyprland}/themes/mocha.conf";
|
# source = "${pkgs.catppuccinThemes.hyprland}/themes/mocha.conf";
|
||||||
@@ -203,7 +206,7 @@
|
|||||||
"$mainMod, d, exec, ${lib.getExe pkgs.vicinae} toggle"
|
"$mainMod, d, exec, ${lib.getExe pkgs.vicinae} toggle"
|
||||||
"$mainMod, Space, exec, ${lib.getExe pkgs.vicinae} toggle"
|
"$mainMod, Space, exec, ${lib.getExe pkgs.vicinae} toggle"
|
||||||
"$mainMod, p, pseudo, # dwindle"
|
"$mainMod, p, pseudo, # dwindle"
|
||||||
"$mainMod, v, togglesplit,"
|
"$mainMod, v, layoutmsg, togglesplit"
|
||||||
"$mainMod, a, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t"
|
"$mainMod, a, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t"
|
||||||
"$mainMod, Tab, cyclenext"
|
"$mainMod, Tab, cyclenext"
|
||||||
# Audio
|
# Audio
|
||||||
|
|||||||
@@ -2,18 +2,15 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
device,
|
device,
|
||||||
|
inputs,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
|
environment.pathsToLink = ["/share/xdg-desktop-portal" "/share/applications"];
|
||||||
xdg.portal = {
|
xdg.portal = {
|
||||||
enable = device.is "ryu";
|
enable = device.is "ryu";
|
||||||
config = {
|
config = {
|
||||||
hyprland.default = ["hyprland"];
|
hyprland.default = ["hyprland"];
|
||||||
common.default = ["*" "hyprland"];
|
common.default = ["*" "hyprland"];
|
||||||
};
|
};
|
||||||
extraPortals = with pkgs; [
|
|
||||||
kdePackages.xdg-desktop-portal-kde
|
|
||||||
xdg-desktop-portal-hyprland
|
|
||||||
xdg-desktop-portal-gtk
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
3
nixos/ryu/apps/crosspipe.nix
Normal file
3
nixos/ryu/apps/crosspipe.nix
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
{pkgs, ...}: {
|
||||||
|
environment.systemPackages = with pkgs; [crosspipe];
|
||||||
|
}
|
||||||
@@ -7,7 +7,7 @@
|
|||||||
# ./alvr.nix
|
# ./alvr.nix
|
||||||
./easyeffects.nix
|
./easyeffects.nix
|
||||||
./vr.nix
|
./vr.nix
|
||||||
./helvum.nix
|
./crosspipe.nix
|
||||||
# ./wine.nix
|
# ./wine.nix
|
||||||
# ./virt.nix
|
# ./virt.nix
|
||||||
./gparted.nix
|
./gparted.nix
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
{pkgs, ...}: {
|
|
||||||
environment.systemPackages = with pkgs; [helvum];
|
|
||||||
}
|
|
||||||
@@ -3,6 +3,7 @@
|
|||||||
lib,
|
lib,
|
||||||
device,
|
device,
|
||||||
config,
|
config,
|
||||||
|
inputs,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
@@ -22,15 +23,6 @@
|
|||||||
tctiEnvironment.enable = true;
|
tctiEnvironment.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
programs = {
|
|
||||||
hyprland = {
|
|
||||||
enable = true;
|
|
||||||
withUWSM = true;
|
|
||||||
xwayland.enable = true;
|
|
||||||
};
|
|
||||||
uwsm.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services.NetworkManager-wait-online.enable = lib.mkForce false;
|
systemd.services.NetworkManager-wait-online.enable = lib.mkForce false;
|
||||||
# systemd.tmpfiles.rules = [
|
# systemd.tmpfiles.rules = [
|
||||||
# "L+ /etc/gdm/.config/monitors.xml - - - - ${./monitors.xml}"
|
# "L+ /etc/gdm/.config/monitors.xml - - - - ${./monitors.xml}"
|
||||||
|
|||||||
@@ -1,6 +1,19 @@
|
|||||||
{pkgs, ...}: {
|
{
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
hyprland
|
|
||||||
xhost
|
xhost
|
||||||
];
|
];
|
||||||
|
programs = {
|
||||||
|
hyprland = {
|
||||||
|
enable = true;
|
||||||
|
withUWSM = true;
|
||||||
|
xwayland.enable = true;
|
||||||
|
package = pkgs.hyprland;
|
||||||
|
portalPackage = pkgs.xdph;
|
||||||
|
};
|
||||||
|
uwsm.enable = true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
./llms.nix
|
./llms.nix
|
||||||
./matrix
|
./matrix
|
||||||
./monitoring.nix
|
./monitoring.nix
|
||||||
./servius-website.nix
|
# ./servius-website.nix
|
||||||
# ./paperless.nix
|
# ./paperless.nix
|
||||||
./prowlarr.nix
|
./prowlarr.nix
|
||||||
# ./searxng.nix
|
# ./searxng.nix
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
config,
|
config,
|
||||||
|
inputs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
base_domain = "darksailor.dev";
|
base_domain = "darksailor.dev";
|
||||||
@@ -19,16 +20,18 @@
|
|||||||
pname = "cinny-unwrapped";
|
pname = "cinny-unwrapped";
|
||||||
version = "4.10.5";
|
version = "4.10.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
# src = fetchFromGitHub {
|
||||||
owner = "cinnyapp";
|
# owner = "cinnyapp";
|
||||||
repo = "cinny";
|
# repo = "cinny";
|
||||||
tag = "v${version}";
|
# rev = "dev";
|
||||||
hash = "sha256-Napy3AcsLRDZPcBh3oq1U30FNtvoNtob0+AZtZSvcbM=";
|
# # tag = "v${version}";
|
||||||
};
|
# hash = "sha256-2qxmlj4IK6twDh27R6qMJDmYSfsWoofVGuRHxSP72f0=";
|
||||||
|
# };
|
||||||
|
src = inputs.cinny;
|
||||||
|
|
||||||
nodejs = nodejs_22;
|
nodejs = nodejs_22;
|
||||||
|
|
||||||
npmDepsHash = "sha256-2Lrd0jAwAH6HkwLHyivqwaEhcpFAIALuno+MchSIfxo=";
|
npmDepsHash = "sha256-qyQ0SXkPSUES/tavKzPra0Q+ZnU9qHvkTC1JgAjL0o8=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
python3
|
python3
|
||||||
|
|||||||
22
overlays.nix
22
overlays.nix
@@ -26,9 +26,9 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
tmux-float = inputs.tmux-float.packages.${prev.system}.default;
|
tmux-float = inputs.tmux-float.packages.${prev.stdenv.hostPlatform.system}.default;
|
||||||
zellijPlugins = {
|
zellijPlugins = {
|
||||||
zjstatus = inputs.zjstatus.packages.${prev.system}.default;
|
zjstatus = inputs.zjstatus.packages.${prev.stdenv.hostPlatform.system}.default;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -57,7 +57,7 @@
|
|||||||
|
|
||||||
# --- Networking ---
|
# --- Networking ---
|
||||||
networking = final: prev: {
|
networking = final: prev: {
|
||||||
caddyWithCloudflare = inputs.nixpkgs.legacyPackages.${final.system}.caddy.withPlugins {
|
caddyWithCloudflare = inputs.nixpkgs.legacyPackages.${prev.stdenv.hostPlatform.system}.caddy.withPlugins {
|
||||||
plugins = ["github.com/caddy-dns/cloudflare@v0.2.2"];
|
plugins = ["github.com/caddy-dns/cloudflare@v0.2.2"];
|
||||||
hash = "sha256-biQdtiscdmrwP6VUsuXmZrvcdewl+g50kdmab5lhE0s=";
|
hash = "sha256-biQdtiscdmrwP6VUsuXmZrvcdewl+g50kdmab5lhE0s=";
|
||||||
};
|
};
|
||||||
@@ -65,13 +65,13 @@
|
|||||||
|
|
||||||
# --- Media ---
|
# --- Media ---
|
||||||
media = final: prev: {
|
media = final: prev: {
|
||||||
ddcbacklight = inputs.ddcbacklight.packages.${prev.system}.ddcbacklight;
|
ddcbacklight = inputs.ddcbacklight.packages.${prev.stdenv.hostPlatform.system}.ddcbacklight;
|
||||||
music-player-git = inputs.music-player.packages.${prev.system}.default;
|
music-player-git = inputs.music-player.packages.${prev.stdenv.hostPlatform.system}.default;
|
||||||
};
|
};
|
||||||
|
|
||||||
# --- macOS-specific ---
|
# --- macOS-specific ---
|
||||||
darwin = final: prev: {
|
darwin = final: prev: {
|
||||||
kitty = inputs.nixpkgs-stable.legacyPackages.${prev.system}.kitty;
|
kitty = inputs.nixpkgs-stable.legacyPackages.${prev.stdenv.hostPlatform.system}.kitty;
|
||||||
yabai = prev.yabai.overrideAttrs (oldAttrs: rec {
|
yabai = prev.yabai.overrideAttrs (oldAttrs: rec {
|
||||||
version = "7.1.16";
|
version = "7.1.16";
|
||||||
src = final.fetchzip {
|
src = final.fetchzip {
|
||||||
@@ -81,12 +81,19 @@
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
applications = final: prev: {
|
||||||
|
iamb = inputs.iamb.packages.${prev.stdenv.hostPlatform.system}.default;
|
||||||
|
hyprland = inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.hyprland;
|
||||||
|
xdg-desktop-portal-hyprland = prev.enableDebugging inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
|
||||||
|
xdph = inputs.nixpkgs-master.legacyPackages.${prev.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
|
||||||
|
};
|
||||||
|
|
||||||
# --- Themes and assets ---
|
# --- Themes and assets ---
|
||||||
themes = final: prev: {
|
themes = final: prev: {
|
||||||
catppuccinThemes = import ./themes/catppuccin.nix {pkgs = final.pkgs;};
|
catppuccinThemes = import ./themes/catppuccin.nix {pkgs = final.pkgs;};
|
||||||
nix-index-database = final.runCommandLocal "nix-index-database" {} ''
|
nix-index-database = final.runCommandLocal "nix-index-database" {} ''
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
ln -s ${inputs.nix-index-database.legacyPackages.${prev.system}.database} $out/files
|
ln -s ${inputs.nix-index-database.legacyPackages.${prev.stdenv.hostPlatform.system}.database} $out/files
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
@@ -99,6 +106,7 @@ in
|
|||||||
media
|
media
|
||||||
darwin
|
darwin
|
||||||
themes
|
themes
|
||||||
|
applications
|
||||||
|
|
||||||
# External input overlays
|
# External input overlays
|
||||||
inputs.deploy-rs.overlays.default
|
inputs.deploy-rs.overlays.default
|
||||||
|
|||||||
Reference in New Issue
Block a user