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"; + }; } diff --git a/flake.lock b/flake.lock index 1b02b89..f419783 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1718078026, - "narHash": "sha256-LbQabH6h86ZzTvDnaZHmMwedRZNB2jYtUQzmoqWQoJ8=", + "lastModified": 1721842668, + "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", "owner": "ipetkov", "repo": "crane", - "rev": "a3f0c63eed74a516298932b9b1627dd80b9c3892", + "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", "type": "github" }, "original": { @@ -28,11 +28,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1717827974, - "narHash": "sha256-ixopuTeTouxqTxfMuzs6IaRttbT8JqRW5C9Q/57WxQw=", + "lastModified": 1722148092, + "narHash": "sha256-5QS64rfIFDzU1jmZrOK6wyZOCi6Vn/90apWRI6Hy+xk=", "owner": "nix-community", "repo": "fenix", - "rev": "ab655c627777ab5f9964652fe23bbb1dfbd687a8", + "rev": "b39d8959f286dc7b9da91ae92f6af56de0169e87", "type": "github" }, "original": { @@ -104,11 +104,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1717871542, - "narHash": "sha256-eUB9gt3Hva7atNOv/Vel1bchD/9Pziz0C/r9K0vh+qQ=", + "lastModified": 1721054193, + "narHash": "sha256-xonM9t7oZ8YiwcEXuVlhs+8FsMSXI42djzUgpDt1n/w=", "owner": "pascalkuthe", "repo": "helix", - "rev": "418ac237bf1e162b866a873d6cd33bb69f5d1bb4", + "rev": "386fa371d708f8e91a83762dfc7a58971681e091", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1717931644, - "narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=", + "lastModified": 1722119539, + "narHash": "sha256-2kU90liMle0vKR8exJx1XM4hZh9CdNgZGHCTbeA9yzY=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d65009effd77cb0d6e7520b68b039836a7606cf", + "rev": "d0240a064db3987eb4d5204cf2400bc4452d9922", "type": "github" }, "original": { @@ -167,11 +167,11 @@ ] }, "locked": { - "lastModified": 1717647344, - "narHash": "sha256-m8XYt8NU2T4gvkien7H7LFGXHhSA5z4tHOeuXQ3DJi4=", + "lastModified": 1720695775, + "narHash": "sha256-8Oqzl9QPjEe/n8y0R2tC6+2v/H6xBgABHXOJwxmnBg0=", "ref": "refs/heads/main", - "rev": "4e25f1ab68f2270f9cff59216056c21073db0164", - "revCount": 87, + "rev": "d70318fb946a0e720dfdd1fb10b0645c14e2a02a", + "revCount": 94, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -183,7 +183,7 @@ "mac-brcm-fw": { "flake": false, "locked": { - "lastModified": 1709065070, + "lastModified": 1701030348, "narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=", "path": "/home/jade/nix-configs/mac-brcm-fw", "type": "path" @@ -211,11 +211,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717974879, - "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", + "lastModified": 1722062969, + "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", + "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", "type": "github" }, "original": { @@ -226,11 +226,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1718060059, - "narHash": "sha256-9XKFni8VMXo81RTq9XygCyaO3I/7UKpwIlM/yn0MdcM=", + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c8d64ba846725f040582b2d3b875466d2115bd", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", "type": "github" }, "original": { @@ -241,11 +241,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1718083092, - "narHash": "sha256-EQsPXycAbmby4meQUNLYfFaGOiqz2J9AlwFRV4UiHnY=", + "lastModified": 1722179153, + "narHash": "sha256-ZJ75T0GWpLI4hoaL+YxueHD2pXG+VYpYtPJdwbkERVs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa1ebdaf49a606e21c06e0f6ed7aece9a41831c3", + "rev": "dcfb2878c687e5eb5fcbc5116969c45c85be34e2", "type": "github" }, "original": { @@ -272,11 +272,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1717583671, - "narHash": "sha256-+lRAmz92CNUxorqWusgJbL9VE1eKCnQQojglRemzwkw=", + "lastModified": 1722099723, + "narHash": "sha256-61f+rvQAObm/TuBEqYFNUTngm/wXcuNhGtQbAmfZVvY=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "48bbdd6a74f3176987d5c809894ac33957000d19", + "rev": "a46788318cce3b62e14606f70a14896b223ee5ec", "type": "github" }, "original": { diff --git a/hosts/monosodium-glutamate-g/configuration.nix b/hosts/monosodium-glutamate-g/configuration.nix index b6cb3d9..43e62b7 100644 --- a/hosts/monosodium-glutamate-g/configuration.nix +++ b/hosts/monosodium-glutamate-g/configuration.nix @@ -9,18 +9,14 @@ ]; jade = { - flatpak.enable = true; desktop = { - compositing.enable = true; syncthing.enable = true; kdeconnect.enable = true; cloud.enable = true; social.enable = true; gaming.enable = true; mail.enable = true; - evremap.enable = false; }; - terminal.enable = true; }; boot = { loader = { @@ -59,11 +55,6 @@ # missing: menu-qalc picom-jonaburg environment.systemPackages = with pkgs; [ # TODO: clean up. - libGL - libreoffice-fresh - wireshark - awesomebump - zenstates zenmonitor nvtop-amd 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..3edfb31 100644 --- a/modules/desktop-environment/home/sway/default.nix +++ b/modules/desktop-environment/home/sway/default.nix @@ -7,6 +7,126 @@ 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 = { + 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 +163,7 @@ xkb_variant = "altgr-intl"; }; }; + bars = []; menu = "wofi -d"; modifier = "Mod4"; keybindings = with { @@ -73,8 +194,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 +290,7 @@ window = { border = 2; - titlebar = true; + titlebar = false; }; }; }; 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; 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;