Skip to content

Commit 6278fd5

Browse files
romek-codesromek-codes
committed
chore(update): update and fix issues
1 parent 2c1d01b commit 6278fd5

12 files changed

Lines changed: 239 additions & 268 deletions

File tree

‎flake.lock‎

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

‎flake.nix‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
overlays = [
4949
(final: prev: {
5050
# [0814/143805.904351:FATAL:v8_initializer.cc(620)] Error mapping V8 startup snapshot file ?
51-
inherit (inputs.nixpkgs-old.legacyPackages.x86_64-linux) dbgate;
51+
inherit (inputs.nixpkgs-old.legacyPackages.x86_64-linux)
52+
dbgate rpcs3;
5253
# Both of these are being overlayed to have support for --sensitive flag, to not save passwords to cliphist.
5354
# Just take latest commit as release
5455
# github.com/bugaevc/wl-clipboard/issues/260

‎home/essentials.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@
5252
peazip # for zip and rar files
5353
qdirstat # Storage management
5454
resources # Task manager
55-
notepadqq # Notepad++
55+
# notepadqq # Notepad++
5656
];
5757
}

‎home/gaming.nix‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
{ pkgs, config, lib, ... }: {
22
config = lib.mkIf (config.var.withGames or false) {
3-
home.packages = with pkgs;
4-
[
5-
(lutris.override { extraPkgs = pkgs: [ fuse ]; })
6-
pcsx2
7-
rpcs3
8-
# TODO: Should be fixed after next update.
9-
# waydroid # android emulator
10-
# linux-wallpaperengine # wallpaper engine for linux
11-
# godot_4 # Gamedev
12-
] ++ lib.optionals (config.var.gpu.type == "amd") [ amdvlk ];
3+
home.packages = with pkgs; [
4+
(lutris.override { extraPkgs = pkgs: [ fuse ]; })
5+
pcsx2
6+
rpcs3
7+
# linux-wallpaperengine # wallpaper engine for linux
8+
# godot_4 # Gamedev
9+
]; # ++ lib.optionals (config.var.gpu.type == "amd") [ # amdvlk # deprecated ];
1310
};
1411
}

‎home/programs/editors/nvim/lua/custom/plugins/init.lua‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ return {
181181
"L3MON4D3/LuaSnip",
182182
"saadparwaiz1/cmp_luasnip",
183183
"ray-x/cmp-sql",
184+
"adalessa/laravel.nvim",
184185
},
185186

186187
config = function()
@@ -189,6 +190,7 @@ return {
189190
cmp.setup({
190191
sources = {
191192
{ group_index = 0, name = "lazydev" },
193+
{ name = "laravel" },
192194
{ name = "nvim_lsp" },
193195
{ name = "nvim_lsp_document_symbol" },
194196
{ name = "nvim_lsp_signature_help" },

‎home/system/hyprland/bindings.nix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"$mod,V,exec,rofi-cliphist" # Clipboard history with rofi
4747
"$shiftMod,E, exec, rofimoji -f geometric_shapes geometric_shapes_extended nerd_font emojis" # Nerdfont and emoji picker with rofi
4848
"$mod,F2, exec, blue-light-filter" # Toggle blue light
49+
", gesture:3:horizontal, workspace, e+1"
4950
] ++ (builtins.concatLists (builtins.genList (i:
5051
let
5152
ws = i + 1;

‎home/system/hyprland/default.nix‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,6 @@ in {
148148
smart_resizing = true;
149149
};
150150

151-
gestures = { workspace_swipe = true; };
152-
153151
misc = {
154152
vfr = true;
155153
disable_hyprland_logo = true;

‎home/system/hyprpanel/default.nix‎

Lines changed: 109 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -49,40 +49,6 @@ in {
4949
};
5050
};
5151

52-
theme.font.name = font;
53-
theme.font.size = fontSizeForHyprpanel;
54-
55-
theme.bar.outer_spacing =
56-
if floating && transparent then "8px" else "8px";
57-
theme.bar.buttons.y_margins =
58-
if floating && transparent then "8px" else "8px";
59-
theme.bar.buttons.spacing = "0.3em";
60-
theme.bar.buttons.radius =
61-
(if transparent then toString rounding else toString rounding) + "px";
62-
theme.bar.floating = floating;
63-
theme.bar.buttons.padding_x = "0.8rem";
64-
theme.bar.buttons.padding_y = "0.4rem";
65-
66-
theme.bar.margin_top =
67-
(if position == "top" then toString (gaps-in) else "0") + "px";
68-
theme.bar.margin_bottom =
69-
(if position == "top" then "0" else toString (gaps-in)) + "px";
70-
theme.bar.margin_sides = toString gaps-out + "px";
71-
72-
theme.bar.border_radius = toString rounding + "px";
73-
theme.bar.transparent = transparent;
74-
theme.bar.location = position;
75-
theme.bar.dropdownGap = "4.5em";
76-
theme.bar.menus.shadow =
77-
if transparent then "0 0 0 0" else "0px 0px 3px 1px #16161e";
78-
theme.bar.buttons.style = "default";
79-
theme.bar.buttons.monochrome = true;
80-
theme.bar.menus.monochrome = true;
81-
theme.bar.menus.card_radius = toString rounding + "px";
82-
theme.bar.menus.border.size = toString border-size + "px";
83-
theme.bar.menus.border.radius = toString rounding + "px";
84-
theme.bar.menus.menu.media.card.tint = 90;
85-
8652
bar.launcher.icon = "";
8753
bar.workspaces.workspaces = 1;
8854
bar.workspaces.numbered_active_indicator = "color";
@@ -107,16 +73,6 @@ in {
10773

10874
notifications.position = "top right";
10975
notifications.showActionsOnHover = true;
110-
theme.notification.opacity = notificationOpacity;
111-
theme.notification.enableShadow = true;
112-
theme.notification.border_radius = toString rounding + "px";
113-
114-
theme.osd.enable = true;
115-
theme.osd.orientation = "vertical";
116-
theme.osd.location = "left";
117-
theme.osd.radius = toString rounding + "px";
118-
theme.osd.margins = "0px 0px 0px 10px";
119-
theme.osd.muted_zero = true;
12076

12177
menus.clock.weather.location = location;
12278
menus.clock.weather.unit = "metric";
@@ -174,68 +130,115 @@ in {
174130

175131
wallpaper.enable = false;
176132

177-
theme.bar.buttons.workspaces.hover = accent-alt;
178-
theme.bar.buttons.workspaces.active = accent;
179-
theme.bar.buttons.workspaces.available = accent-alt;
180-
theme.bar.buttons.workspaces.occupied = accent-alt;
181-
182-
theme.bar.menus.background = background;
183-
theme.bar.menus.cards = background-alt;
184-
theme.bar.menus.label = foreground;
185-
theme.bar.menus.text = foreground;
186-
theme.bar.menus.border.color = accent;
187-
theme.bar.menus.popover.text = foreground;
188-
theme.bar.menus.popover.background = background-alt;
189-
theme.bar.menus.listitems.active = accent;
190-
theme.bar.menus.icons.active = accent;
191-
theme.bar.menus.switch.enabled = accent;
192-
theme.bar.menus.check_radio_button.active = accent;
193-
theme.bar.menus.buttons.default = accent;
194-
theme.bar.menus.buttons.active = accent;
195-
theme.bar.menus.iconbuttons.active = accent;
196-
theme.bar.menus.progressbar.foreground = accent;
197-
theme.bar.menus.slider.primary = accent;
198-
theme.bar.menus.tooltip.background = background-alt;
199-
theme.bar.menus.tooltip.text = foreground;
200-
theme.bar.menus.dropdownmenu.background = background-alt;
201-
theme.bar.menus.dropdownmenu.text = foreground;
202-
203-
theme.bar.background = background
204-
+ (if transparentButtons && transparent then "00" else "");
205-
theme.bar.buttons.text = if transparent && transparentButtons then
206-
foregroundOnWallpaper
207-
else
208-
foreground;
209-
theme.bar.buttons.background =
210-
(if transparent then background else background-alt)
211-
+ (if transparentButtons then "00" else "");
212-
theme.bar.buttons.icon = accent;
213-
214-
theme.bar.buttons.notifications.background = background-alt;
215-
theme.bar.buttons.hover = background;
216-
theme.bar.buttons.notifications.hover = background;
217-
theme.bar.buttons.notifications.total = accent;
218-
theme.bar.buttons.notifications.icon = accent;
219-
220-
theme.osd.bar_color = accent;
221-
theme.osd.bar_overflow_color = accent-alt;
222-
theme.osd.icon = background;
223-
theme.osd.icon_container = accent;
224-
theme.osd.label = accent;
225-
theme.osd.bar_container = background-alt;
226-
227-
theme.bar.menus.menu.media.background.color = background-alt;
228-
theme.bar.menus.menu.media.card.color = background-alt;
229-
230-
theme.notification.background = background-alt;
231-
theme.notification.actions.background = accent;
232-
theme.notification.actions.text = foreground;
233-
theme.notification.label = accent;
234-
theme.notification.border = background-alt;
235-
theme.notification.text = foreground;
236-
theme.notification.labelicon = accent;
237-
theme.notification.close_button.background = background-alt;
238-
theme.notification.close_button.label = "#f38ba8";
133+
theme = lib.mkForce {
134+
135+
font.name = font;
136+
font.size = fontSizeForHyprpanel;
137+
138+
bar.outer_spacing = if floating && transparent then "8px" else "8px";
139+
bar.buttons.y_margins =
140+
if floating && transparent then "8px" else "8px";
141+
bar.buttons.spacing = "0.3em";
142+
bar.buttons.radius =
143+
(if transparent then toString rounding else toString rounding) + "px";
144+
bar.floating = floating;
145+
bar.buttons.padding_x = "0.8rem";
146+
bar.buttons.padding_y = "0.4rem";
147+
148+
bar.margin_top = (if position == "top" then toString (gaps-in) else "0")
149+
+ "px";
150+
bar.margin_bottom =
151+
(if position == "top" then "0" else toString (gaps-in)) + "px";
152+
bar.margin_sides = toString gaps-out + "px";
153+
154+
bar.border_radius = toString rounding + "px";
155+
bar.transparent = transparent;
156+
bar.location = position;
157+
bar.dropdownGap = "4.5em";
158+
bar.menus.shadow =
159+
if transparent then "0 0 0 0" else "0px 0px 3px 1px #16161e";
160+
bar.buttons.style = "default";
161+
bar.buttons.monochrome = true;
162+
bar.menus.monochrome = true;
163+
bar.menus.card_radius = toString rounding + "px";
164+
bar.menus.border.size = toString border-size + "px";
165+
bar.menus.border.radius = toString rounding + "px";
166+
bar.menus.menu.media.card.tint = 90;
167+
168+
notification.opacity = notificationOpacity;
169+
notification.enableShadow = true;
170+
notification.border_radius = toString rounding + "px";
171+
172+
osd.enable = true;
173+
osd.orientation = "vertical";
174+
osd.location = "left";
175+
osd.radius = toString rounding + "px";
176+
osd.margins = "0px 0px 0px 10px";
177+
osd.muted_zero = true;
178+
179+
bar.buttons.workspaces.hover = accent-alt;
180+
bar.buttons.workspaces.active = accent;
181+
bar.buttons.workspaces.available = accent-alt;
182+
bar.buttons.workspaces.occupied = accent-alt;
183+
184+
bar.menus.background = background;
185+
bar.menus.cards = background-alt;
186+
bar.menus.label = foreground;
187+
bar.menus.text = foreground;
188+
bar.menus.border.color = accent;
189+
bar.menus.popover.text = foreground;
190+
bar.menus.popover.background = background-alt;
191+
bar.menus.listitems.active = accent;
192+
bar.menus.icons.active = accent;
193+
bar.menus.switch.enabled = accent;
194+
bar.menus.check_radio_button.active = accent;
195+
bar.menus.buttons.default = accent;
196+
bar.menus.buttons.active = accent;
197+
bar.menus.iconbuttons.active = accent;
198+
bar.menus.progressbar.foreground = accent;
199+
bar.menus.slider.primary = accent;
200+
bar.menus.tooltip.background = background-alt;
201+
bar.menus.tooltip.text = foreground;
202+
bar.menus.dropdownmenu.background = background-alt;
203+
bar.menus.dropdownmenu.text = foreground;
204+
205+
bar.background = background
206+
+ (if transparentButtons && transparent then "00" else "");
207+
bar.buttons.text = if transparent && transparentButtons then
208+
foregroundOnWallpaper
209+
else
210+
foreground;
211+
bar.buttons.background =
212+
(if transparent then background else background-alt)
213+
+ (if transparentButtons then "00" else "");
214+
bar.buttons.icon = accent;
215+
216+
bar.buttons.notifications.background = background-alt;
217+
bar.buttons.hover = background;
218+
bar.buttons.notifications.hover = background;
219+
bar.buttons.notifications.total = accent;
220+
bar.buttons.notifications.icon = accent;
221+
222+
osd.bar_color = accent;
223+
osd.bar_overflow_color = accent-alt;
224+
osd.icon = background;
225+
osd.icon_container = accent;
226+
osd.label = accent;
227+
osd.bar_container = background-alt;
228+
229+
bar.menus.menu.media.background.color = background-alt;
230+
bar.menus.menu.media.card.color = background-alt;
231+
232+
notification.background = background-alt;
233+
notification.actions.background = accent;
234+
notification.actions.text = foreground;
235+
notification.label = accent;
236+
notification.border = background-alt;
237+
notification.text = foreground;
238+
notification.labelicon = accent;
239+
notification.close_button.background = background-alt;
240+
notification.close_button.label = "#f38ba8";
241+
};
239242
};
240243
};
241244
}

‎home/system/rofi/default.nix‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
stylix.targets.rofi.enable = false;
66
programs.rofi = {
77
enable = true;
8-
package = pkgs.rofi-wayland;
98
plugins = with pkgs; [ rofi-calc ]; # rofi-emoji
109

1110
extraConfig = {

‎nixos/shared.nix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@
2323
./steam.nix
2424
./gamemode.nix
2525
./stylix.nix
26+
./waydroid.nix
2627
];
2728
}

0 commit comments

Comments
 (0)