push
This commit is contained in:
Generated
+21
@@ -1200,6 +1200,26 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"noctalia": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1787540539,
|
||||||
|
"narHash": "sha256-q6ewgZm6eAgdHWIaOV+dwR5/x711AfDUsao3nQ/CdyA=",
|
||||||
|
"owner": "noctalia-dev",
|
||||||
|
"repo": "noctalia",
|
||||||
|
"rev": "a4324409f4f07001d33fbf902be49377ee6b62e2",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "noctalia-dev",
|
||||||
|
"repo": "noctalia",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": [
|
"flake-parts": [
|
||||||
@@ -1253,6 +1273,7 @@
|
|||||||
"nixpkgs-lib": [
|
"nixpkgs-lib": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
|
"noctalia": "noctalia",
|
||||||
"stylix": "stylix",
|
"stylix": "stylix",
|
||||||
"systems": "systems_5"
|
"systems": "systems_5"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -79,7 +79,14 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
niri.url = "github:sodiboo/niri-flake";
|
niri = {
|
||||||
|
url = "github:sodiboo/niri-flake";
|
||||||
|
};
|
||||||
|
|
||||||
|
noctalia = {
|
||||||
|
url = "github:noctalia-dev/noctalia";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
|
nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
|
||||||
|
|
||||||
|
|||||||
@@ -1,20 +1,146 @@
|
|||||||
{ inputs, ... }: {
|
{ inputs, ... }: {
|
||||||
den.aspects.niri = {
|
den.aspects.niri = {
|
||||||
|
nixos = { pkgs, lib, ... }: {
|
||||||
|
services.displayManager = {
|
||||||
|
sessionPackages = [ pkgs.niri ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
homeManager = { pkgs, lib, ... }: {
|
homeManager = { pkgs, lib, ... }: {
|
||||||
imports = [ inputs.niri.nixosModules.niri ];
|
imports = [ inputs.niri.homeModules.niri ];
|
||||||
|
nixpkgs.overlays = [ inputs.niri.overlays.niri ];
|
||||||
|
|
||||||
programs.niri = {
|
programs.niri = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = pkgs.niri;
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
|
spawn-at-startup = [
|
||||||
|
{ argv = [ "noctalia" "--daemon" ]; }
|
||||||
|
];
|
||||||
|
|
||||||
input.keyboard = {
|
input.keyboard = {
|
||||||
xkb.layout = "us,ua";
|
xkb.layout = "us,ua";
|
||||||
};
|
};
|
||||||
|
|
||||||
layout.gaps = 5;
|
layout = {
|
||||||
|
gaps = 10;
|
||||||
|
border.enable = false;
|
||||||
|
focus-ring = {
|
||||||
|
enable = true;
|
||||||
|
width = 2;
|
||||||
|
active.color = "#cba6f7";
|
||||||
|
};
|
||||||
|
preset-column-widths = [
|
||||||
|
{ proportion = 0.50; }
|
||||||
|
{ proportion = 1.00; }
|
||||||
|
];
|
||||||
|
default-column-width = { proportion = 1.00; };
|
||||||
|
};
|
||||||
|
window-rules = [
|
||||||
|
{
|
||||||
|
geometry-corner-radius = {
|
||||||
|
top-left = 12.0;
|
||||||
|
top-right = 12.0;
|
||||||
|
bottom-left = 12.0;
|
||||||
|
bottom-right = 12.0;
|
||||||
|
};
|
||||||
|
clip-to-geometry = true;
|
||||||
|
draw-border-with-background = true;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
matches = [
|
||||||
|
{ app-id = "dev.noctalia.Noctalia"; }
|
||||||
|
];
|
||||||
|
open-floating = true;
|
||||||
|
default-column-width = {
|
||||||
|
fixed = 1080;
|
||||||
|
};
|
||||||
|
default-window-height = {
|
||||||
|
fixed = 920;
|
||||||
|
};
|
||||||
|
geometry-corner-radius = {
|
||||||
|
top-left = 12.0;
|
||||||
|
top-right = 12.0;
|
||||||
|
bottom-left = 12.0;
|
||||||
|
bottom-right = 12.0;
|
||||||
|
};
|
||||||
|
clip-to-geometry = true;
|
||||||
|
draw-border-with-background = true;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
binds = {
|
binds = {
|
||||||
"Mod+T".spawn-sh = lib.getExe pkgs.cosmic-term;
|
"Mod+T".action.spawn = "cosmic-term";
|
||||||
"Mod+Q".close-window = null;
|
"Mod+D".action.spawn-sh = "noctalia msg panel-toggle launcher";
|
||||||
|
"Mod+V".action.spawn-sh = "noctalia msg panel-toggle clipboard";
|
||||||
|
"Mod+N".action.spawn-sh = "noctalia msg panel-toggle control-center";
|
||||||
|
"Mod+Comma".action.spawn-sh = "noctalia msg settings-toggle";
|
||||||
|
"Control+Alt+Delete".action.spawn-sh = "noctalia msg panel-toggle session";
|
||||||
|
"XF86AudioRaiseVolume".action.spawn-sh = "noctalia msg volume-up";
|
||||||
|
"XF86AudioLowerVolume".action.spawn-sh = "noctalia msg volume-down";
|
||||||
|
"XF86AudioMute".action.spawn-sh = "noctalia msg volume-mute";
|
||||||
|
"XF86MonBrightnessUp".action.spawn-sh = "noctalia msg brightness-up";
|
||||||
|
"XF86MonBrightnessDown".action.spawn-sh = "noctalia msg brightness-down";
|
||||||
|
# Media
|
||||||
|
"XF86AudioPlay".action.spawn = [ "playerctl" "play-pause" ];
|
||||||
|
"XF86AudioNext".action.spawn = [ "playerctl" "next" ];
|
||||||
|
"XF86AudioPrev".action.spawn = [ "playerctl" "previous" ];
|
||||||
|
"XF86AudioStop".action.spawn = [ "playerctl" "stop" ];
|
||||||
|
"Mod+W".action.spawn-sh = "noctalia msg panel-toggle wallpaper";
|
||||||
|
# Window management
|
||||||
|
"Mod+Q".action.close-window = {};
|
||||||
|
"Mod+Space".action.toggle-window-floating = {};
|
||||||
|
"Mod+Shift+Space".action.switch-focus-between-floating-and-tiling = {};
|
||||||
|
"Mod+F".action.switch-preset-column-width = {};
|
||||||
|
"Mod+Shift+F".action.fullscreen-window = {};
|
||||||
|
# Focus
|
||||||
|
"Mod+H".action.focus-column-left = {};
|
||||||
|
"Mod+J".action.focus-window-down = {};
|
||||||
|
"Mod+K".action.focus-window-up = {};
|
||||||
|
"Mod+L".action.focus-column-right = {};
|
||||||
|
# Move windows
|
||||||
|
"Mod+Shift+H".action.set-column-width = "-10%";
|
||||||
|
"Mod+Shift+L".action.set-column-width = "+10%";
|
||||||
|
"Mod+Shift+J".action.set-window-height = "+10%";
|
||||||
|
"Mod+Shift+K".action.set-window-height = "-10%";
|
||||||
|
"Mod+Control+H".action.consume-or-expel-window-left = {};
|
||||||
|
"Mod+Control+L".action.consume-or-expel-window-right = {};
|
||||||
|
"Mod+Control+K".action.move-window-up = {};
|
||||||
|
"Mod+Control+J".action.move-window-down = {};
|
||||||
|
# Screenshots
|
||||||
|
"Mod+Shift+S".action.spawn = [ "noctalia" "msg" "screenshot-region" ];
|
||||||
|
# Workspaces
|
||||||
|
"Mod+1".action.focus-workspace = 1;
|
||||||
|
"Mod+2".action.focus-workspace = 2;
|
||||||
|
"Mod+3".action.focus-workspace = 3;
|
||||||
|
"Mod+4".action.focus-workspace = 4;
|
||||||
|
"Mod+5".action.focus-workspace = 5;
|
||||||
|
"Mod+6".action.focus-workspace = 6;
|
||||||
|
"Mod+7".action.focus-workspace = 7;
|
||||||
|
"Mod+8".action.focus-workspace = 8;
|
||||||
|
"Mod+9".action.focus-workspace = 9;
|
||||||
|
"Mod+0".action.focus-workspace = 10;
|
||||||
|
"Mod+Shift+1".action.move-window-to-workspace = [ { focus = false; } 1 ];
|
||||||
|
"Mod+Shift+2".action.move-window-to-workspace = [ { focus = false; } 2 ];
|
||||||
|
"Mod+Shift+3".action.move-window-to-workspace = [ { focus = false; } 3 ];
|
||||||
|
"Mod+Shift+4".action.move-window-to-workspace = [ { focus = false; } 4 ];
|
||||||
|
"Mod+Shift+5".action.move-window-to-workspace = [ { focus = false; } 5 ];
|
||||||
|
"Mod+Shift+6".action.move-window-to-workspace = [ { focus = false; } 6 ];
|
||||||
|
"Mod+Shift+7".action.move-window-to-workspace = [ { focus = false; } 7 ];
|
||||||
|
"Mod+Shift+8".action.move-window-to-workspace = [ { focus = false; } 8 ];
|
||||||
|
"Mod+Shift+9".action.move-window-to-workspace = [ { focus = false; } 9 ];
|
||||||
|
"Mod+Shift+0".action.move-window-to-workspace = [ { focus = false; } 10 ];
|
||||||
|
"Mod+Ctrl+1".action.move-window-to-workspace = 1;
|
||||||
|
"Mod+Ctrl+2".action.move-window-to-workspace = 2;
|
||||||
|
"Mod+Ctrl+3".action.move-window-to-workspace = 3;
|
||||||
|
"Mod+Ctrl+4".action.move-window-to-workspace = 4;
|
||||||
|
"Mod+Ctrl+5".action.move-window-to-workspace = 5;
|
||||||
|
"Mod+Ctrl+6".action.move-window-to-workspace = 6;
|
||||||
|
"Mod+Ctrl+7".action.move-window-to-workspace = 7;
|
||||||
|
"Mod+Ctrl+8".action.move-window-to-workspace = 8;
|
||||||
|
"Mod+Ctrl+9".action.move-window-to-workspace = 9;
|
||||||
|
"Mod+Ctrl+0".action.move-window-to-workspace = 10;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,3 +1,9 @@
|
|||||||
{
|
{ inputs, ...}: {
|
||||||
|
den.aspects.noctalia = {
|
||||||
|
nixos = { ... }: {
|
||||||
|
imports = [ inputs.noctalia.nixosModules.default ];
|
||||||
|
|
||||||
|
programs.noctalia.enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,8 @@
|
|||||||
|
|
||||||
#nix7
|
#nix7
|
||||||
|
|
||||||
#niri
|
niri
|
||||||
|
noctalia
|
||||||
];
|
];
|
||||||
|
|
||||||
nixos = {
|
nixos = {
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
{
|
{
|
||||||
den.aspects.fish = {
|
den.aspects.fish = {
|
||||||
nixos = { pkgs, ...}: {
|
nixos = { pkgs, ...}: {
|
||||||
environment.sessionVariables.SHELL = "${pkgs.fish}";
|
|
||||||
|
|
||||||
programs.fish = {
|
programs.fish = {
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
fetch = "fastfetch --file ~/nix/nix.ans";
|
fetch = "fastfetch --file ~/nix/nix.ans";
|
||||||
|
|||||||
@@ -2,13 +2,13 @@
|
|||||||
den.aspects.llama = {
|
den.aspects.llama = {
|
||||||
nixos = { pkgs, lib, ... }: {
|
nixos = { pkgs, lib, ... }: {
|
||||||
environment.systemPackages = [ pkgs.cloudflared ];
|
environment.systemPackages = [ pkgs.cloudflared ];
|
||||||
environment.etc."cloudflared/9c1a18f9-a2c4-41bd-9a64-86ebb3e3283d.json".source = "/home/bug/.cloudflared/9c1a18f9-a2c4-41bd-9a64-86ebb3e3283d.json";
|
environment.etc."cloudflared/608ba37a-1be8-49e8-be2d-abeb8b77081d.json".source = "/home/bug/.cloudflared/608ba37a-1be8-49e8-be2d-abeb8b77081d.json";
|
||||||
|
|
||||||
services.cloudflared = {
|
services.cloudflared = {
|
||||||
enable = true;
|
enable = true;
|
||||||
tunnels = {
|
tunnels = {
|
||||||
"9c1a18f9-a2c4-41bd-9a64-86ebb3e3283d" = {
|
"608ba37a-1be8-49e8-be2d-abeb8b77081d" = {
|
||||||
credentialsFile = "/etc/cloudflared/9c1a18f9-a2c4-41bd-9a64-86ebb3e3283d.json";
|
credentialsFile = "/etc/cloudflared/608ba37a-1be8-49e8-be2d-abeb8b77081d.json";
|
||||||
|
|
||||||
ingress = {
|
ingress = {
|
||||||
"llama.bug.tools" = "http://127.0.0.1:8080";
|
"llama.bug.tools" = "http://127.0.0.1:8080";
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services."cloudflared-tunnel-9c1a18f9-a2c4-41bd-9a64-86ebb3e3283d".environment = {
|
systemd.services."cloudflared-tunnel-608ba37a-1be8-49e8-be2d-abeb8b77081d".environment = {
|
||||||
TUNNEL_TRANSPORT_PROTOCOL = pkgs.lib.mkForce "http2";
|
TUNNEL_TRANSPORT_PROTOCOL = pkgs.lib.mkForce "http2";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -9,16 +9,16 @@ let
|
|||||||
npm = "@ai-sdk/openai-compatible";
|
npm = "@ai-sdk/openai-compatible";
|
||||||
name = "llama.cpp";
|
name = "llama.cpp";
|
||||||
options.baseURL = "https://llama.bug.tools/v1";
|
options.baseURL = "https://llama.bug.tools/v1";
|
||||||
models.qwen3.6-35b-a3b.name = "qwen3.6-35b-a3b";
|
models."qwen3.6-35b-a3b".name = "qwen3.6-35b-a3b";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
in {
|
in {
|
||||||
den.aspects.opencode = {
|
den.aspects.opencode = {
|
||||||
nixos = { ... }: {
|
nixos = { pkgs, ... }: {
|
||||||
# opencode config: ${opencode-json}
|
environment.systemPackages = [ pkgs.opencode ];
|
||||||
};
|
};
|
||||||
home-manager = { ... }: {
|
homeManager = { ... }: {
|
||||||
home.file.".config/opencode/opencode.json".source = opencode-json;
|
home.file.".config/opencode/opencode.json".source = opencode-json;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -85,7 +85,7 @@
|
|||||||
|
|
||||||
disableCallIdle.enable = true;
|
disableCallIdle.enable = true;
|
||||||
|
|
||||||
ClearURLs.enable = true;
|
clearUrls.enable = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,13 +1,9 @@
|
|||||||
{ den, ... }: {
|
{ den, ... }: {
|
||||||
den.aspects.bug = {
|
den.aspects.bug = {
|
||||||
includes = [
|
includes = [
|
||||||
|
den.batteries.host-aspects
|
||||||
den.provides.primary-user
|
den.provides.primary-user
|
||||||
(den.provides.user-shell "fish")
|
(den.provides.user-shell "fish")
|
||||||
den.aspects.stylix
|
|
||||||
den.aspects.librewolf
|
|
||||||
den.aspects.catppuccin
|
|
||||||
#den.provides.home-manager
|
|
||||||
#den.aspects.niri
|
|
||||||
];
|
];
|
||||||
|
|
||||||
homeManager = {
|
homeManager = {
|
||||||
|
|||||||
Reference in New Issue
Block a user