Compare commits

..

No commits in common. "67e4051a2df2451a4030dc2ab3b5bc09376149d7" and "c2db155794f1f285951ec09ec1299c67f47935ed" have entirely different histories.

6 changed files with 14 additions and 109 deletions

View file

@ -1,8 +0,0 @@
{ config, lib ,... }:
{
hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true;
services.blueman.enable = true;
}

View file

@ -10,11 +10,6 @@
hyfetch hyfetch
sway-contrib.grimshot sway-contrib.grimshot
discord discord
pamixer
];
fonts.packages = [
pkgs.nerd-fonts.fira-code
]; ];
environment.sessionVariables.NIXOS_OZONE_WL = "1"; environment.sessionVariables.NIXOS_OZONE_WL = "1";

View file

@ -20,7 +20,6 @@ in
programs.sway = { programs.sway = {
enable = true; enable = true;
wrapperFeatures.gtk = true; wrapperFeatures.gtk = true;
package = pkgs.swayfx;
}; };
environment.sessionVariables = { environment.sessionVariables = {

View file

@ -1,4 +1,4 @@
{ config, pkgs, system, inputs, lib, ... }: { config, pkgs, system, inputs, ... }:
{ {
home.username = "regent"; home.username = "regent";
@ -13,8 +13,6 @@
};*/ };*/
ghostty.enable = true; ghostty.enable = true;
ghostty.flavor = "mocha"; ghostty.flavor = "mocha";
nvim.enable = true;
nvim.flavor = "mocha";
}; };
programs.ghostty.enable = true; programs.ghostty.enable = true;
@ -23,20 +21,7 @@
theme = "catppuccin-mocha"; theme = "catppuccin-mocha";
}; };
programs.neovim.enable = true; home.pointerCursor = {
programs.neovim = {
extraPackages = with pkgs; [
lua-language-server
stylua
ripgrep
];
plugins = with pkgs.vimPlugins; [
lazy-nvim
];
};
home.pointerCursor = {
gtk.enable = true; gtk.enable = true;
package = pkgs.phinger-cursors; package = pkgs.phinger-cursors;
name = "Phinger-cursors-light"; name = "Phinger-cursors-light";
@ -76,7 +61,7 @@
* { * {
font-family: 'Fira Code', monospace; font-family: FantasqueSansMono Nerd Font;
font-size: 17px; font-size: 17px;
min-height: 0; min-height: 0;
} }
@ -86,7 +71,7 @@ window#waybar {
margin: 0px; margin: 0px;
border: 0px; border: 0px;
/*background-color:rgb(0, 0, 0);*/ /*background-color:rgb(0, 0, 0);*/
background-color: @base; background-color: rgba(0, 0, 0, 0.9);
color: @text; color: @text;
} }
@ -97,10 +82,11 @@ window#waybar {
#workspaces { #workspaces {
border-radius: 1rem; border-radius: 1rem;
margin: 5px; margin: 5px;
background-color: @surface0;
margin-left: 1rem; margin-left: 1rem;
background-color: rgba(0, 0, 0, 0.21);
} }
#workspaces button { #workspaces button {
color: @lavender; color: @lavender;
border-radius: 1rem; border-radius: 1rem;
@ -110,7 +96,6 @@ window#waybar {
#workspaces button.active { #workspaces button.active {
color: @sky; color: @sky;
border-radius: 1rem; border-radius: 1rem;
background-color: rgba(255, 255, 255, 0.5);
} }
#workspaces button:hover { #workspaces button:hover {
@ -126,88 +111,35 @@ window#waybar {
#pulseaudio, #pulseaudio,
#custom-lock, #custom-lock,
#custom-power { #custom-power {
background-color: @surface0;
padding: 0.5rem 1rem; padding: 0.5rem 1rem;
margin: 5px 0; margin: 5px 0;
color: @text;
} }
#clock { #clock {
color: @text; color: @blue;
border-radius: 0px 1rem 1rem 0px; border-radius: 0px 1rem 1rem 0px;
margin-right: 1rem; margin-right: 1rem;
} }
''; '';
settings = { settings = {
mainBar = { mainBar = {
layer = "top"; layer = "top";
position = "top"; position = "top";
mod = "dock"; height = 34;
exclusive = true;
passthrough = false;
#gtk-layer-shell = true;
height = 0;
output = [ output = [
"HDMI-A-1" "HDMI-A-1"
"DP-1" "DP-2"
];
modules-left = [
"sway/workspaces"
]; ];
modules-left = [ "sway/workspaces" ];
modules-center = [ "sway/window" ]; modules-center = [ "sway/window" ];
modules-right = [ modules-right = [ "clock" ];
"pulseaudio"
"clock"
];
"sway/workspaces" = { "sway/workspaces" = {
disable-scroll = true; disable-scroll = true;
sort-by-name = true; sort-by-name = true;
}; };
tray = {
icon-size = 13;
tooltip = false;
spacing = 10;
};
network = {
format = "󰖩 {essid}";
format-disconnected = "󰖪 disconnected";
};
clock = {
format = " {:%I:%M %p %m/%d} ";
tooltip-format = ''
<big>{:%Y %B}</big>
<tt><small>{calendar}</small></tt>'';
};
pulseaudio = {
format = "{icon} {volume}%";
tooltip = false;
format-muted = " Muted";
on-click = "pamixer -t";
on-scroll-up = "pamixer -i 5";
on-scroll-down = "pamixer -d 5";
scroll-step = 5;
format-icons = {
headphone = "";
hands-free = "";
headset = "";
phone = "";
portable = "";
car = "";
default = [ "" "" "" ];
};
};
"pulseaudio#microphone" = {
format = "{format_source}";
tooltip = false;
format-source = " {volume}%";
format-source-muted = " Muted";
on-click = "pamixer --default-source -t";
on-scroll-up = "pamixer --default-source -i 5";
on-scroll-down = "pamixer --default-source -d 5";
scroll-step = 5;
};
}; };
}; };
}; };

View file

@ -13,7 +13,6 @@
../../common/users.nix ../../common/users.nix
../../common/services.nix ../../common/services.nix
../../common/efi.nix ../../common/efi.nix
../../common/bluetooth.nix
# Desktop modules # Desktop modules
../../common/desktop/core.nix ../../common/desktop/core.nix
@ -65,8 +64,6 @@
}; };
}; };
programs.steam.enable = true;
/*networking = { /*networking = {
firewall.enable = false; firewall.enable = false;
firewall.trustedInterfaces = [ firewall.trustedInterfaces = [
@ -94,15 +91,6 @@
services.vscode-server.enable = true; services.vscode-server.enable = true;
services.vscode-server.nodejsPackage = pkgs.nodejs_20; services.vscode-server.nodejsPackage = pkgs.nodejs_20;
programs.obs-studio = {
enable = true;
enableVirtualCamera = true;
plugins = with pkgs.obs-studio-plugins; [
droidcam-obs
];
};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
#lm_sensors #lm_sensors
#code-server #code-server

View file

@ -55,8 +55,7 @@ if [[ "$GUEST_NAME" != "win11" ]]; then
fi fi
if [[ "$HOOK_NAME" == "prepare" && "$STATE_NAME" == "begin" ]]; then if [[ "$HOOK_NAME" == "prepare" && "$STATE_NAME" == "begin" ]]; then
#start_hook start_hook
echo "do nothing"
elif [[ "$HOOK_NAME" == "release" && "$STATE_NAME" == "end" ]]; then elif [[ "$HOOK_NAME" == "release" && "$STATE_NAME" == "end" ]]; then
revert_hook revert_hook
fi fi