flake.nix

@@ -59,12 +59,6 @@
     discordrp-mpris.url = "github:yusdacra/discordrp-mpris-flake";
     discordrp-mpris.inputs.nixpkgs.follows = "nixpkgs";
 
-    s3s.url = "github:yusdacra/s3s-flake";
-    s3s.inputs.nixpkgs.follows = "nixpkgs";
-
-    naked-shell.url = "github:yusdacra/mk-naked-shell";
-    naked-shell.flake = false;
-
     # vfio.url = "github:yusdacra/nixos-vfio";
     # vfio.inputs.nixpkgs.follows = "nixpkgs";
 

hosts/tkaronto/default.nix

@@ -68,21 +68,9 @@
 
   services.xserver.videoDrivers = ["nvidia" "amdgpu"];
   hardware = {
-    nvidia = {
-      package = config.boot.kernelPackages.nvidiaPackages.production;
-      modesetting.enable = true;
-      powerManagement.enable = false;
-      powerManagement.finegrained = true;
-      open = false;
-      nvidiaSettings = true;
-      prime = {
-        offload = {
-          enable = true;
-          enableOffloadCmd = true;
-        };
-        amdgpuBusId = "PCI:5:0:0";
-        nvidiaBusId = "PCI:1:0:0";
-      };
+    nvidia.prime = {
+      amdgpuBusId = "PCI:5:0:0";
+      nvidiaBusId = "PCI:1:0:0";
     };
     opengl = {
       driSupport = true;

hosts/tkaronto/modules/budgie.nix.disabled

@@ -1 +0,0 @@
-../../../modules/de/budgie/default.nix

hosts/tkaronto/modules/joycond.nix

@@ -1,4 +0,0 @@
-{
-  services.joycond.enable = true;
-  hardware.xpadneo.enable = true;
-}

hosts/wolumonde/modules/atproto.nix

@@ -1,17 +0,0 @@
-{pkgs, ...}: let
-  _wellKnownFile =
-    pkgs.writeText "server" "did:plc:dfl62fgb7wtjj3fcbb72naae";
-  wellKnownFile = pkgs.runCommand "well-known" {} ''
-    mkdir -p $out
-    cp ${_wellKnownFile} $out/atproto-did
-  '';
-in
-{
-  services.nginx.virtualHosts."gaze.systems" = {
-    locations."/.well-known/".extraConfig = ''
-      add_header content-type text/plain;
-      add_header access-control-allow-origin *;
-      alias ${wellKnownFile}/;
-    '';
-  };
-}

hosts/wolumonde/modules/hedgedoc.nix

@@ -1,18 +0,0 @@
-{config, ...}: {
-  services.hedgedoc = {
-    enable = true;
-    settings = {
-      port = 3333;
-      domain = "doc.gaze.systems";
-      protocolUseSSL = true;
-      allowEmailRegister = false;
-      allowAnonymous = false;
-    };
-  };
-
-  services.nginx.virtualHosts."doc.gaze.systems" = {
-    useACMEHost = "gaze.systems";
-    forceSSL = true;
-    locations."/".proxyPass = "http://${config.services.hedgedoc.settings.host}:${toString config.services.hedgedoc.settings.port}";
-  };
-}

hosts/wolumonde/modules/nginx.nix

@@ -20,7 +20,6 @@
         "ms.gaze.systems"
         "mq.gaze.systems"
         "couchdb.gaze.systems"
-        "doc.gaze.systems"
       ];
     };
     certs."limbus.company" = {

modules/de/budgie/default.nix

@@ -1,33 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  services.xserver = {
-    enable = true;
-    desktopManager = {
-      budgie.enable = true;
-      xterm.enable = false;
-    };
-    displayManager = {
-      gdm = {
-        enable = true;
-        wayland = false;
-      };
-      startx.enable = false;
-    };
-  };
-  systemd.services = {
-    "getty@tty1".enable = false;
-    "autovt@tty1".enable = false;
-  };
-  services.power-profiles-daemon.enable = false;
-  environment.systemPackages = with pkgs; [
-    ffmpegthumbnailer
-    webp-pixbuf-loader
-    yaru-theme
-  ];
-  # environment.etc."environment.d/10-use-amd.conf".text = ''
-  #   __EGL_VENDOR_LIBRARY_FILENAMES=/run/opengl-driver/glvnd/egl_vendor.d/50_mesa.json
-  # '';
-}

modules/de/gnome/default.nix

@@ -19,7 +19,7 @@
   services.tumbler.enable = true;
   programs = {
     geary.enable = lib.mkForce false;
-    gnome-terminal.enable = true;
+    gnome-terminal.enable = lib.mkForce false;
     evince.enable = true;
   };
   services.xserver = {
@@ -29,9 +29,13 @@
       xterm.enable = false;
     };
     displayManager = {
+      autoLogin = {
+        enable = true;
+        user = "patriot";
+      };
       gdm = {
         enable = true;
-        wayland = false;
+        wayland = true;
       };
       startx.enable = false;
     };

modules/de/greetd/default.nix

@@ -1,10 +1,25 @@
-{pkgs, ...}: {
+{pkgs, ...}: let
+  run-sway = pkgs.writeText "run-sway.sh" ''
+    export _JAVA_AWT_WM_NONREPARENTING=1
+
+    export XDG_CURRENT_DESKTOP=sway
+
+    export QT_QPA_PLATFORM=wayland
+    export QT_QPA_PLATFORMTHEME=qt5ct
+    export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
+
+    export GDK_BACKEND=wayland
+    export WLR_DRM_DEVICES=/dev/dri/card0
+    export WL_DRM_DEVICES=/dev/dri/card0
+    sway --unsupported-gpu
+  '';
+in {
   services.greetd = {
     enable = true;
     settings = {
       terminal.vt = 1;
       default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --issue --time --cmd 'sway --unsupported-gpu'";
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --issue --time --cmd 'bash --login ${run-sway}'";
         user = "greeter";
       };
     };

modules/network/networkmanager/default.nix

@@ -1,10 +1,7 @@
-{config, ...}: {
+{
   imports = [../dns ../iwd];
   networking.networkmanager = {
     enable = true;
     wifi.powersave = true;
   };
-  environment.persistence."${config.system.persistDir}" = {
-    directories = ["/etc/NetworkManager/system-connections"];
-  };
 }

pkgs-set/default.nix

@@ -32,7 +32,6 @@
     inherit system;
     config.allowUnfree = true;
     config.allowBroken = true;
-    config.permittedInsecurePackages = ["electron-25.9.0"];
     overlays = overlays ++ newPkgs;
   };
   pkgsToExport = import ./pkgs-to-export.nix pkgs;

pkgs-set/overlays/nixpkgs-wayland.nix

@@ -0,0 +1,2 @@
+# {inputs}: (import "${inputs.nixpkgs-wayland}/overlay.nix")
+final: prev: prev

shells/default.nix

@@ -1,6 +1,5 @@
-{tlib, inputs, ...}:
+{tlib, ...}:
 tlib.genPkgs (pkgs: let
-  mkNakedShell = pkgs.callPackage inputs.naked-shell {};
   agenix-wrapped = pkgs.writeShellApplication {
     name = "agenix";
     runtimeInputs = [pkgs.agenix];
@@ -13,10 +12,10 @@ tlib.genPkgs (pkgs: let
     '';
   };
 in {
-  default =
-    mkNakedShell {
+  default = with pkgs;
+    mkShell {
       name = "prts";
-      packages = with pkgs; [git git-crypt alejandra helix agenix-wrapped rage];
+      buildInputs = [git git-crypt alejandra helix agenix-wrapped rage];
       shellHook = ''
         echo \"$(tput bold)welcome to PRTS, $USER$(tput sgr0)\"
       '';

users/modules/code/default.nix

@@ -12,12 +12,12 @@
       bbenoist.nix
       svelte.svelte-vscode
       bradlc.vscode-tailwindcss
-      # (rust-lang.rust-analyzer.overrideAttrs (old: {
-      #   src = old.src.overrideAttrs (old: {
-      #     outputHash = "sha256-k9eDTY9y2ejg4jTApji8X6UmKYK/eCLMZJbiYuoTuyY=";
-      #   });
-      # }))
-      rust-lang.rust-analyzer
+      (rust-lang.rust-analyzer.overrideAttrs (old: {
+        src = old.src.overrideAttrs (old: {
+          outputHash = "sha256-k9eDTY9y2ejg4jTApji8X6UmKYK/eCLMZJbiYuoTuyY=";
+        });
+      }))
+      # explodingcamera."1am"
     ];
     userSettings = {
       "files.associations" = {

users/modules/discord/default.nix

@@ -33,4 +33,18 @@
         # '';
       });
   in [pkg];
+  systemd.user.services.premid = {
+    Install = {
+      WantedBy = ["default.target"];
+    };
+    Unit = {
+      Description = "premid";
+      After = "network.target";
+    };
+    Service = {
+      ExecStart = "${pkgs.premid}/bin/premid";
+      Restart = "on-failure";
+      RestartSec = 5;
+    };
+  };
 }

users/modules/discordrp-mpris/config.toml

@@ -1,39 +0,0 @@
-[global]
-# Enable debug level logging or configure level directly
-debug = false
-log_level = "WARNING"
-
-poll_interval = 10
-reconnect_wait = 1
-
-# The following can be overridden per player.
-[options]
-# Whether to show status for paused players.
-show_paused = true
-# Whether to show status for previously active and now stopped player.
-show_stopped = false
-# Available values are: "elapsed", "remaining" or "none".
-show_time = "elapsed"
-# Upload images to the host
-# Note: if this set to true, valid image_host must be set.
-# meant to be set to true with all online players
-upload_images = true
-# Use image host to show local album covers
-# There is two conditions to use host:
-# 1) image is sent via HTTP POST
-# 2) The response will be a text which only contains URL of the uploaded image.
-image_host = "https://0x0.st"
-# Whether to ignore a player. Supposed to be overridden.
-ignore = false
-# Maximum number of bytes in the title field
-max_title_len = 64
-# informational string, usually is just artist and title
-# you can use theese formatters here: artist, albumArtist, title, album, position, length, player, state
-details = "{title}\nby {artist}"
-
-# You can override any of the [options] options
-# for each player individually.
-# The player name to use as the key
-# is shown in your Discord Rich Presence (hover the icons).
-[player.Spotify]
-ignore = true

users/modules/discordrp-mpris/default.nix

@@ -12,5 +12,4 @@
       RestartSec = 5;
     };
   };
-  xdg.configFile."discordrp-mpris/config.toml".source = ./config.toml;
 }

users/modules/firefox/default.nix

@@ -10,7 +10,7 @@
   home.packages = [(pkgs.lib.hiPrio pkgs.floorp)];
   programs.firefox = {
     enable = true;
-    package = pkgs.firefox.override {
+    package = pkgs.firefox-wayland.override {
       extraPrefs = ''
         lockPref("privacy.resistFingerprinting.letterboxing", false);
         lockPref("browser.startup.homepage", "about:home");

users/modules/fluxbox/default.nix

@@ -1,10 +0,0 @@
-{pkgs, ...}: {
-  xsession.enable = true;
-  xsession.windowManager.fluxbox = {
-    enable = true;
-    menu = ''
-      [exec] (Floorp) {/etc/profiles/per-user/patriot/bin/floorp}
-      [exec] (urxvt) {/etc/profiles/per-user/patriot/bin/urxvt}
-    '';
-  };
-}

users/modules/premid/default.nix

@@ -1,15 +0,0 @@
-{pkgs, ...}: {
-  systemd.user.services.premid = {
-    Install = {
-      WantedBy = ["default.target"];
-    };
-    Unit = {
-      Description = "premid";
-    };
-    Service = {
-      ExecStart = "${pkgs.premid}/bin/premid";
-      Restart = "on-failure";
-      RestartSec = 5;
-    };
-  };
-}

users/modules/s3s/default.nix

@@ -1,4 +0,0 @@
-{config, inputs, ...}: {
-  imports = [inputs.s3s.homeManagerModule];
-  services.s3s.enable = true;
-}

users/modules/sway/default.nix

@@ -69,9 +69,9 @@
               exec export SFILE="${shotFile}.png" && mkdir -p ${shotDir} && ${grim} -g "$(${slurp})" "$SFILE" && ${cat} "$SFILE" | ${wl-copy} -t image/png
             '';
             # Record screen
-            "Mod1+r" = ''exec mkdir -p ${shotDir} && ${wf-recorder} -x yuv420p -f "${shotFile}.mp4"'';
+            "Mod1+r" = ''exec mkdir -p ${shotDir} && ${wf-recorder} -f "${shotFile}.mp4"'';
             # Record an area
-            "Mod1+Shift+r" = ''exec mkdir -p ${shotDir} && ${wf-recorder} -x yuv420p -g "$(${slurp})" -f "${shotFile}.mp4"'';
+            "Mod1+Shift+r" = ''exec mkdir -p ${shotDir} && ${wf-recorder} -g "$(${slurp})" -f "${shotFile}.mp4"'';
             # Stop recording
             "Mod1+c" = "exec pkill -INT wf-recorder";
             "XF86AudioRaiseVolume" = "exec ${pactl} set-sink-volume 0 +5%";
@@ -111,7 +111,7 @@
             adaptive_sync = "on";
           };
           "HDMI-A-1" = {
-            mode = "1920x1080@74.973Hz";
+            mode = "1920x1080@60.000Hz";
           };
         };
       };

users/modules/urxvt/default.nix

@@ -1,9 +0,0 @@
-{...}: {
-  programs.urxvt = {
-    enable = true;
-    keybindings = {
-      "Shift-Control-C" = "eval:selection_to_clipboard";
-      "Shift-Control-V" = "eval:paste_clipboard";
-    };
-  };
-}

users/patriot/default.nix

@@ -107,7 +107,6 @@ in {
         # wm
         # ["hyprland" "foot"]
         ["sway" "wayland" "foot"]
-        # ["fluxbox" "urxvt"]
         # desktop stuff
         # ["wayland" "foot"]
         ["obsidian" "firefox"]
@@ -115,10 +114,9 @@ in {
         ["zoxide" "zsh" "fzf" "starship" "direnv"]
         # dev stuff
         ["helix" "git" "ssh"]
-        # ["godot"]
+        ["godot"]
         ["musikcube" "musikcubed"]
-        ["arrpc"]
-        ["s3s"]
+        ["arrpc" "discordrp-mpris"]
       ];
     in
       l.flatten [
@@ -162,7 +160,6 @@ in {
           "dconf"
           "retroarch"
           "yuzu"
-          "blender"
         ];
       files = l.flatten [
         ".config/gnome-initial-setup-done"
@@ -189,16 +186,16 @@ in {
     gtk.theme.package = pkgs.yaru-theme;
     gtk.theme.name = "Yaru-dark";
 
-    # home.sessionVariables.QT_QPA_PLATFORMTHEME = "qt5ct";
-    # xdg.configFile = {
-    #   "environment.d/20-apply-qtct.conf".text = ''
-    #     QT_QPA_PLATFORMTHEME=qt5ct
-    #   '';
-    # };
-    # qt.enable = true;
-    # qt.platformTheme = "qtct";
-    # qt.style.name = "phantom";
-    # qt.style.package = pkgs.phantom;
+    home.sessionVariables.QT_QPA_PLATFORMTHEME = "qt5ct";
+    xdg.configFile = {
+      "environment.d/20-apply-qtct.conf".text = ''
+        QT_QPA_PLATFORMTHEME=qt5ct
+      '';
+    };
+    qt.enable = true;
+    qt.platformTheme = "qtct";
+    qt.style.name = "phantom";
+    qt.style.package = pkgs.phantom;
 
     stylix.targets.gnome.enable = lib.mkForce false;
     stylix.targets.gtk.enable = lib.mkForce false;
@@ -220,34 +217,31 @@ in {
         mupdf
         xdg-utils
         protontricks
+        # fractal-next
+        # obs-studio
         libreoffice-fresh
         helvum
         nix-output-monitor
         inputs.nh.packages.${pkgs.system}.default
+        prismlauncher
         # steamPackages.steamcmd
         # steam-tui
-        # fractal-next
-        # gtkcord4
-        # gh
+        gtkcord4
+        gh
         transmission_4-gtk
-        kdenlive
-        ### music prod
         yabridge
         yabridgectl
         bitwig-studio
-        ### stream / record
-        obs-studio
-        ### gayming
-        # prismlauncher
-        # (retroarch.override {
-        #   cores = with libretro; [desmume citra];
-        # })
-        # yuzu
+        # reaper
+        # ardour
+        (retroarch.override {
+          cores = with libretro; [desmume citra];
+        })
+        yuzu
         # wineWowPackages.stagingFull
         # lutris
-        # distrobox
+        distrobox
         bottles
-        blender
       ];
     };
     programs = {