Compare commits

..

No commits in common. "020a9276d550e0ae37ebfdd905059431cdcedc9c" and "737bdba9121d40bde860f7a34b318da79833f6d9" have entirely different histories.

5 changed files with 7 additions and 141 deletions

View file

@ -45,8 +45,6 @@ with builtins; {
htmlq htmlq
prusa-slicer
zed-editor
wget wget
git git
neofetch neofetch
@ -160,10 +158,4 @@ with builtins; {
}; };
users.defaultUserShell = pkgs.nushell; users.defaultUserShell = pkgs.nushell;
nix.gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 60d";
};
} }

View file

@ -4,7 +4,4 @@
./flatpak.nix ./flatpak.nix
./home ./home
]; ];
services.upower = {
enable = true;
};
} }

View file

@ -7,126 +7,6 @@
programs.wofi.enable = true; programs.wofi.enable = true;
programs.swaylock.enable = true; programs.swaylock.enable = true;
xdg.portal = {
enable = true;
extraPortals = [pkgs.xdg-desktop-portal-wlr];
# sway = {
# default = ["wlr"];
# };
};
services.swayidle = {
enable = true;
events = [
{
event = "lock";
command = "swaylock -c 441144";
}
];
};
programs.waybar = {
enable = true;
systemd = {
enable = true;
target = "sway-session.target";
};
settings = {
infobar = {
layer = "top";
position = "top";
modules-left = ["memory" "cpu" "network" "group/bats"];
modules-center = ["sway/window"];
modules-right = ["clock"];
"group/bats" = {
orientation = "inherit";
modules = ["battery#bat0" "battery#bat1" "upower#headphones"];
};
"battery#bat0" = {
adapter = "AC";
bat = "BAT0";
interval = 2;
format = "{icon} {capacity}% {time}";
format-charging = "󱐋{icon} {capacity}% {time}";
format-time = "{h}:{m}";
format-icons = [
"󰁺"
"󰁻"
"󰁼"
"󰁽"
"󰁾"
"󰁿"
"󰂀"
"󰂁"
"󰂂"
"󰁹"
];
tooltip = true;
tooltip-format = "BAT0: {cycles} cycles";
};
"battery#bat1" = {
adapter = "AC";
bat = "BAT1";
interval = 2;
format = "󱐋{icon} {capacity}% {time}";
format-time = "{H}:{M}";
format-icons = [
"󰁺"
"󰁻"
"󰁼"
"󰁽"
"󰁾"
"󰁿"
"󰂀"
"󰂁"
"󰂂"
"󰁹"
];
tooltip = true;
tooltip-format = "BAT1: {cycles} cycles";
};
"upower#headphones" = {
native-path = "/org/bluez/hci0/dev_4C_87_5D_29_B3_76";
format = "󰋋 {percentage} {time}";
hide-if-empty = true;
show-icon = false;
};
};
interactiveBar = {
layer = "top";
position = "bottom";
modules-left = ["sway/workspaces" "sway/mode"];
modules-center = ["tray"];
modules-right = ["wlr/taskbar"];
};
# mainBar = {
# layer = "top";
# position = "top";
# height = 30;
# output = [
# "eDP-1"
# "HDMI-A-1"
# ];
# modules-left = ["sway/workspaces" "sway/mode" "wlr/taskbar"];
# modules-center = ["sway/window" "custom/hello-from-waybar"];
# modules-right = ["mpd" "custom/mymodule#with-css-id" "temperature"];
# "sway/workspaces" = {
# disable-scroll = true;
# all-outputs = true;
# };
# "custom/hello-from-waybar" = {
# format = "hello {}";
# max-length = 40;
# interval = "once";
# exec = pkgs.writeShellScript "hello-from-waybar" ''
# echo "from within waybar"
# '';
# };
# };
};
};
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
systemd = { systemd = {
@ -163,7 +43,6 @@
xkb_variant = "altgr-intl"; xkb_variant = "altgr-intl";
}; };
}; };
bars = [];
menu = "wofi -d"; menu = "wofi -d";
modifier = "Mod4"; modifier = "Mod4";
keybindings = with { keybindings = with {
@ -194,8 +73,8 @@
# "${mod}+Shift+c" = "focus child"; # "${mod}+Shift+c" = "focus child";
# screenshot # screenshot
# "${mod}+w" = "exec window-screenshot.sh"; # "${mod}+w" = "exec window-screenshot.sh";
"${mod}+s" = "exec flameshot gui -c -p $HOME/Pictures/screenshots"; # "${mod}+s" = "exec flameshot gui -c -p $HOME/Pictures/screenshots";
"${mod}+a" = "exec flameshot screen -c -p $HOME/Pictures/screenshots"; # "${mod}+a" = "exec flameshot screen -c -p $HOME/Pictures/screenshots";
# "${mod}+t" = "exec ocr-screenshot.sh"; # "${mod}+t" = "exec ocr-screenshot.sh";
# rofi fuckery # rofi fuckery
@ -290,7 +169,7 @@
window = { window = {
border = 2; border = 2;
titlebar = false; titlebar = true;
}; };
}; };
}; };

View file

@ -251,7 +251,6 @@
"app.shield.optoutstudies.enabled" = false; "app.shield.optoutstudies.enabled" = false;
"app.normandy.enabled" = false; "app.normandy.enabled" = false;
"app.normandy.api_url" = ""; "app.normandy.api_url" = "";
"dom.private-attribution.submission.enabled" = false;
"browser.safebrowsing.malware.enabled" = false; "browser.safebrowsing.malware.enabled" = false;
"browser.safebrowsing.phishing.enabled" = false; "browser.safebrowsing.phishing.enabled" = false;

View file

@ -22,11 +22,10 @@
package = config.users.defaultUserShell; package = config.users.defaultUserShell;
configFile.source = ../../other/config.nu; configFile.source = ../../other/config.nu;
envFile.source = ../../other/env.nu; envFile.source = ../../other/env.nu;
extraConfig = '' # extraConfig = ''
plugin use ${pkgs.nushellPlugins.query}/bin/nu_plugin_query; # source ${pkgs.nu_scripts}/share/nu_scripts/modules/nix/nix.nu;
plugin use ${pkgs.nushellPlugins.polars}/bin/nu_plugin_polars; # use ${pkgs.nu_scripts}/share/nu_scripts/modules/background_task/job.nu;
plugin use ${pkgs.nushellPlugins.formats}/bin/nu_plugin_formats; # '';
'';
}; };
programs.starship.enableNushellIntegration = true; programs.starship.enableNushellIntegration = true;
programs.carapace.enableNushellIntegration = true; programs.carapace.enableNushellIntegration = true;