Skip to content

Commit 23d6d3f

Browse files
committed
feat: use noctalia for as much as possible
1 parent c6d93b7 commit 23d6d3f

15 files changed

Lines changed: 32 additions & 76 deletions

File tree

flake.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

home/gabe/shared.nix

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
float = true;
4848
}
4949
{
50-
class = "discord|vesktop";
50+
class = "discord|vesktop|equibop";
5151
wsNum = 3;
5252
tile = true;
5353
follow = false;
@@ -124,13 +124,18 @@
124124
class = "Minecraft*?(.*)";
125125
tile = true;
126126
}
127+
{
128+
class = ".qemu-system-x86_64-wrapped";
129+
wsNum = 4;
130+
}
127131
]
128132
++ (map
129133
(class: {
130134
inherit class;
131135
float = true;
132136
})
133137
[
138+
"dev.noctalia.noctalia-qs"
134139
"obsidian"
135140
"org.pulseaudio.pavucontrol"
136141
".piper-wrapped"
@@ -141,14 +146,12 @@
141146

142147
autostart = with pkgs; {
143148
desktop = [
144-
"vesktop.desktop"
149+
"equibop.desktop"
145150
"spotify.desktop"
146151
];
147152
services = [
148-
"${noctalia-shell}/bin/noctalia-shell"
153+
(lib.getExe config.programs.noctalia-shell.package)
149154
"${thunar}/bin/thunar --daemon"
150-
"${pkgs.mako}/bin/mako"
151-
"${swww}/bin/swww-daemon"
152155
"${wl-clipboard}/bin/wl-paste --type text --watch cliphist store"
153156
"${wl-clipboard}/bin/wl-paste --type image --watch cliphist store"
154157

hosts/quasar/services/home-assistant/default.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ in
3535

3636
http = {
3737
use_x_forwarded_for = true;
38-
server_host = [
39-
"0.0.0.0"
40-
"::1"
41-
];
4238
trusted_proxies = [
4339
"127.0.0.1"
4440
"::1"

modules/flake/nix.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
"https://nix-community.cachix.org"
2525
"https://gabedunn.cachix.org"
2626
"https://hyprland.cachix.org"
27-
"https://vicinae.cachix.org"
2827
# "https://cache.garnix.io"
2928
# "https://devenv.cachix.org"
3029
];
@@ -33,7 +32,6 @@
3332
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
3433
"gabedunn.cachix.org-1:wLWTKadNjpr2Op3rBnDZMUmUEPPIoKG87oY4PmBP8qU="
3534
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
36-
"vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc="
3735
# "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
3836
# "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
3937
];

modules/home-manager/cli/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ in
268268

269269
sessionVariables = {
270270
DIRENV_LOG_FORMAT = "";
271-
ENTE_CLI_CONFIG_PATH = "${config.xdg.configHome}/ente/config.yaml";
271+
ENTE_CLI_CONFIG_DIR = "${config.xdg.configHome}/ente";
272272
FFSEND_HOST = "send.super.fish";
273273
KUBECONFIG = "${config.xdg.configHome}/kube/config";
274274
PF_INFO = "ascii title os kernel uptime shell term desktop scheme palette";

modules/home-manager/desktop/apps/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ in
6060
arandr # arrange and resize
6161
bitwarden-desktop # password manager
6262
discord # chat app
63+
equibop # better discord client
6364
feishin # music player
6465
firefox-devedition
6566
stable.jellyfin-mpv-shim # jellyfin mpv integration

modules/home-manager/desktop/apps/spotify.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ in
3030
betterGenres
3131
fullAlbumDate
3232
fullAppDisplayMod
33+
history
3334
goToSong
3435
groupSession
3536
hidePodcasts

modules/home-manager/desktop/audio.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,4 @@ in
8585
]
8686
'';
8787
};
88-
8988
}

modules/home-manager/desktop/monitors.nix

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -145,52 +145,6 @@ with types;
145145
# expose primary monitor name
146146
desktop.primaryMonitor = (head primaryMonitors).name;
147147

148-
# autorandr config
149-
programs.autorandr =
150-
let
151-
inherit (builtins) toString listToAttrs map;
152-
153-
mkAutorandrConf =
154-
{
155-
name,
156-
enable,
157-
primary,
158-
height,
159-
width,
160-
rate,
161-
x,
162-
y,
163-
...
164-
}:
165-
{
166-
inherit name;
167-
value = {
168-
inherit enable primary;
169-
mode = "${toString width}x${toString height}";
170-
rate = "${toString rate}.00";
171-
position = "${toString x}x${toString y}";
172-
};
173-
};
174-
175-
mkAutorandrFingerprint =
176-
{ name, fingerprint, ... }:
177-
{
178-
inherit name;
179-
value = fingerprint;
180-
};
181-
182-
autorandrConf = listToAttrs (map mkAutorandrConf cfg.monitors);
183-
autorandrFpts = listToAttrs (map mkAutorandrFingerprint cfg.monitors);
184-
in
185-
mkIf isX11 {
186-
enable = (length cfg.monitors) != 0;
187-
188-
profiles.default = {
189-
config = autorandrConf;
190-
fingerprint = autorandrFpts;
191-
};
192-
};
193-
194148
services.kanshi =
195149
let
196150
mkKanshiOutput =

modules/home-manager/desktop/wm/bar/noctalia.nix

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@ let
1111
in
1212
{
1313
config = lib.mkIf cfg.wm.enable {
14-
home.packages = [
15-
inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default
16-
pkgs.gpu-screen-recorder
14+
home.packages = with pkgs; [
15+
inputs.noctalia.packages.${stdenv.hostPlatform.system}.default
16+
17+
fastfetch
18+
gpu-screen-recorder
19+
qt6.qtwebsockets
1720
];
1821

1922
programs.noctalia-shell = {
2023
enable = true;
24+
package = inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default;
2125
};
2226
};
2327
}

0 commit comments

Comments
 (0)