From ee901946e2f4c234f13570b14ed12a67fe24de76 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Tue, 18 Jun 2024 21:06:19 +0200 Subject: [PATCH 1/4] more bar --- modules/desktop-environment/default.nix | 3 + .../desktop-environment/home/sway/default.nix | 109 +++++++++++++++++- 2 files changed, 109 insertions(+), 3 deletions(-) diff --git a/modules/desktop-environment/default.nix b/modules/desktop-environment/default.nix index 3e149b8..59206a0 100644 --- a/modules/desktop-environment/default.nix +++ b/modules/desktop-environment/default.nix @@ -4,4 +4,7 @@ ./flatpak.nix ./home ]; + services.upower = { + enable = true; + }; } diff --git a/modules/desktop-environment/home/sway/default.nix b/modules/desktop-environment/home/sway/default.nix index 0aafe8e..7159b7c 100644 --- a/modules/desktop-environment/home/sway/default.nix +++ b/modules/desktop-environment/home/sway/default.nix @@ -7,6 +7,108 @@ programs.wofi.enable = true; programs.swaylock.enable = true; + 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 = { enable = true; systemd = { @@ -43,6 +145,7 @@ xkb_variant = "altgr-intl"; }; }; + bars = []; menu = "wofi -d"; modifier = "Mod4"; keybindings = with { @@ -73,8 +176,8 @@ # "${mod}+Shift+c" = "focus child"; # screenshot # "${mod}+w" = "exec window-screenshot.sh"; - # "${mod}+s" = "exec flameshot gui -c -p $HOME/Pictures/screenshots"; - # "${mod}+a" = "exec flameshot screen -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}+t" = "exec ocr-screenshot.sh"; # rofi fuckery @@ -169,7 +272,7 @@ window = { border = 2; - titlebar = true; + titlebar = false; }; }; }; From c64f321cc5d42695dbcd0675dfeb129bcb0d0b1b Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Sat, 29 Jun 2024 14:37:41 +0200 Subject: [PATCH 2/4] setup nushell plugins --- modules/shell/nu.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/shell/nu.nix b/modules/shell/nu.nix index f338d7e..88cf0d6 100644 --- a/modules/shell/nu.nix +++ b/modules/shell/nu.nix @@ -22,10 +22,11 @@ package = config.users.defaultUserShell; configFile.source = ../../other/config.nu; envFile.source = ../../other/env.nu; - # extraConfig = '' - # source ${pkgs.nu_scripts}/share/nu_scripts/modules/nix/nix.nu; - # use ${pkgs.nu_scripts}/share/nu_scripts/modules/background_task/job.nu; - # ''; + extraConfig = '' + plugin use ${pkgs.nushellPlugins.query}/bin/nu_plugin_query; + plugin use ${pkgs.nushellPlugins.polars}/bin/nu_plugin_polars; + plugin use ${pkgs.nushellPlugins.formats}/bin/nu_plugin_formats; + ''; }; programs.starship.enableNushellIntegration = true; programs.carapace.enableNushellIntegration = true; From f22a20b08c4709811783a34e1ec29026c3e0181f Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Sun, 28 Jul 2024 20:53:38 +0200 Subject: [PATCH 3/4] add some programs and set up nix auto gc --- common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/common.nix b/common.nix index dafa9d7..3f8212e 100644 --- a/common.nix +++ b/common.nix @@ -45,6 +45,8 @@ with builtins; { htmlq + prusa-slicer + zed-editor wget git neofetch @@ -158,4 +160,10 @@ with builtins; { }; users.defaultUserShell = pkgs.nushell; + + nix.gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 60d"; + }; } From 020a9276d550e0ae37ebfdd905059431cdcedc9c Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Sun, 28 Jul 2024 20:54:01 +0200 Subject: [PATCH 4/4] sway things (more or less successful) --- .../desktop-environment/home/sway/default.nix | 18 ++++++++++++++++++ modules/desktop/firefox.nix | 1 + 2 files changed, 19 insertions(+) diff --git a/modules/desktop-environment/home/sway/default.nix b/modules/desktop-environment/home/sway/default.nix index 7159b7c..3edfb31 100644 --- a/modules/desktop-environment/home/sway/default.nix +++ b/modules/desktop-environment/home/sway/default.nix @@ -7,6 +7,24 @@ programs.wofi.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 = { diff --git a/modules/desktop/firefox.nix b/modules/desktop/firefox.nix index 37c5cd6..bd06ae1 100644 --- a/modules/desktop/firefox.nix +++ b/modules/desktop/firefox.nix @@ -251,6 +251,7 @@ "app.shield.optoutstudies.enabled" = false; "app.normandy.enabled" = false; "app.normandy.api_url" = ""; + "dom.private-attribution.submission.enabled" = false; "browser.safebrowsing.malware.enabled" = false; "browser.safebrowsing.phishing.enabled" = false;