common.nix

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

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721842668,
+        "lastModified": 1718078026,
-        "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=",
+        "narHash": "sha256-LbQabH6h86ZzTvDnaZHmMwedRZNB2jYtUQzmoqWQoJ8=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf",
+        "rev": "a3f0c63eed74a516298932b9b1627dd80b9c3892",
         "type": "github"
       },
       "original": {
@@ -28,11 +28,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1722148092,
+        "lastModified": 1717827974,
-        "narHash": "sha256-5QS64rfIFDzU1jmZrOK6wyZOCi6Vn/90apWRI6Hy+xk=",
+        "narHash": "sha256-ixopuTeTouxqTxfMuzs6IaRttbT8JqRW5C9Q/57WxQw=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "b39d8959f286dc7b9da91ae92f6af56de0169e87",
+        "rev": "ab655c627777ab5f9964652fe23bbb1dfbd687a8",
         "type": "github"
       },
       "original": {
@@ -104,11 +104,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1721054193,
+        "lastModified": 1717871542,
-        "narHash": "sha256-xonM9t7oZ8YiwcEXuVlhs+8FsMSXI42djzUgpDt1n/w=",
+        "narHash": "sha256-eUB9gt3Hva7atNOv/Vel1bchD/9Pziz0C/r9K0vh+qQ=",
         "owner": "pascalkuthe",
         "repo": "helix",
-        "rev": "386fa371d708f8e91a83762dfc7a58971681e091",
+        "rev": "418ac237bf1e162b866a873d6cd33bb69f5d1bb4",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722119539,
+        "lastModified": 1717931644,
-        "narHash": "sha256-2kU90liMle0vKR8exJx1XM4hZh9CdNgZGHCTbeA9yzY=",
+        "narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d0240a064db3987eb4d5204cf2400bc4452d9922",
+        "rev": "3d65009effd77cb0d6e7520b68b039836a7606cf",
         "type": "github"
       },
       "original": {
@@ -167,11 +167,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720695775,
+        "lastModified": 1717647344,
-        "narHash": "sha256-8Oqzl9QPjEe/n8y0R2tC6+2v/H6xBgABHXOJwxmnBg0=",
+        "narHash": "sha256-m8XYt8NU2T4gvkien7H7LFGXHhSA5z4tHOeuXQ3DJi4=",
         "ref": "refs/heads/main",
-        "rev": "d70318fb946a0e720dfdd1fb10b0645c14e2a02a",
+        "rev": "4e25f1ab68f2270f9cff59216056c21073db0164",
-        "revCount": 94,
+        "revCount": 87,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/nixos-module"
       },
@@ -183,7 +183,7 @@
     "mac-brcm-fw": {
       "flake": false,
       "locked": {
-        "lastModified": 1701030348,
+        "lastModified": 1709065070,
         "narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=",
         "path": "/home/jade/nix-configs/mac-brcm-fw",
         "type": "path"
@@ -211,11 +211,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1722062969,
+        "lastModified": 1717974879,
-        "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=",
+        "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3",
+        "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
         "type": "github"
       },
       "original": {
@@ -226,11 +226,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1720535198,
+        "lastModified": 1718060059,
-        "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
+        "narHash": "sha256-9XKFni8VMXo81RTq9XygCyaO3I/7UKpwIlM/yn0MdcM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
+        "rev": "a3c8d64ba846725f040582b2d3b875466d2115bd",
         "type": "github"
       },
       "original": {
@@ -241,11 +241,11 @@
     },
     "nixpkgs-unstable-small": {
       "locked": {
-        "lastModified": 1722179153,
+        "lastModified": 1718083092,
-        "narHash": "sha256-ZJ75T0GWpLI4hoaL+YxueHD2pXG+VYpYtPJdwbkERVs=",
+        "narHash": "sha256-EQsPXycAbmby4meQUNLYfFaGOiqz2J9AlwFRV4UiHnY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dcfb2878c687e5eb5fcbc5116969c45c85be34e2",
+        "rev": "aa1ebdaf49a606e21c06e0f6ed7aece9a41831c3",
         "type": "github"
       },
       "original": {
@@ -272,11 +272,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1722099723,
+        "lastModified": 1717583671,
-        "narHash": "sha256-61f+rvQAObm/TuBEqYFNUTngm/wXcuNhGtQbAmfZVvY=",
+        "narHash": "sha256-+lRAmz92CNUxorqWusgJbL9VE1eKCnQQojglRemzwkw=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "a46788318cce3b62e14606f70a14896b223ee5ec",
+        "rev": "48bbdd6a74f3176987d5c809894ac33957000d19",
         "type": "github"
       },
       "original": {

hosts/monosodium-glutamate-g/configuration.nix

@@ -9,14 +9,18 @@
   ];
 
   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 = {
@@ -55,6 +59,11 @@
   # missing: menu-qalc picom-jonaburg
   environment.systemPackages = with pkgs; [
     # TODO: clean up.
+    libGL
+    libreoffice-fresh
+    wireshark
+    awesomebump
+
     zenstates
     zenmonitor
     nvtop-amd

modules/desktop-environment/default.nix

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

modules/desktop-environment/home/sway/default.nix

@@ -7,126 +7,6 @@
   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 = {
@@ -163,7 +43,6 @@
           xkb_variant = "altgr-intl";
         };
       };
-      bars = [];
       menu = "wofi -d";
       modifier = "Mod4";
       keybindings = with {
@@ -194,8 +73,8 @@
           # "${mod}+Shift+c" = "focus child";
           # screenshot
           # "${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";
 
           # rofi fuckery
@@ -290,7 +169,7 @@
 
       window = {
         border = 2;
-        titlebar = false;
+        titlebar = true;
       };
     };
   };

modules/desktop/firefox.nix

@@ -251,7 +251,6 @@
           "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;

modules/shell/nu.nix

@@ -22,11 +22,10 @@
       package = config.users.defaultUserShell;
       configFile.source = ../../other/config.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.carapace.enableNushellIntegration = true;