a lot of work

2025-12-30 16:35:44 +00:00
parent a1b117c408
commit f029d5fedd
18 changed files with 201 additions and 92 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -1072,7 +1072,8 @@
        "rsRPC": "rsRPC",
        "sops-nix": "sops-nix",
        "spicetify-nix": "spicetify-nix",
-        "stylix": "stylix"
+        "stylix": "stylix",
+        "zen-browser": "zen-browser"
      }
    },
    "rsRPC": {
@@ -1379,6 +1380,29 @@
        "repo": "xdg-desktop-portal-hyprland",
        "type": "github"
      }
+    },
+    "zen-browser": {
+      "inputs": {
+        "home-manager": [
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1766897152,
+        "narHash": "sha256-mD1GDg1eIHYUwk536j4uJX1IfQArsLQm2SL7rTQwAPI=",
+        "owner": "0xc000022070",
+        "repo": "zen-browser-flake",
+        "rev": "fe8d1a61a904b336f453d7ab5ae7d691a21c5cbf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "0xc000022070",
+        "repo": "zen-browser-flake",
+        "type": "github"
+      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@@ -20,6 +20,15 @@
      url = "git+https://git.scug.io/nikkuss/pkgs";
      # inputs.nixpkgs.follows = "nixpkgs";
    };
+    zen-browser = {
+      url = "github:0xc000022070/zen-browser-flake";
+      inputs = {
+        # IMPORTANT: we're using "libgbm" and is only available in unstable so ensure
+        # to have it up-to-date or simply don't specify the nixpkgs input
+        nixpkgs.follows = "nixpkgs";
+        home-manager.follows = "home-manager";
+      };
+    };
    sops-nix = {
      url = "github:Mic92/sops-nix";
      inputs.nixpkgs.follows = "nixpkgs";
--- a/hosts/doloro-laptop/home.nix
+++ b/hosts/doloro-laptop/home.nix
@@ -19,7 +19,11 @@
    # chromium.enable = true;
    wivrn.enable = false;
    helium.enable = true;
+    sops.enable = true;
+    wakatime.enable = false;
+    # remoteBuild.use-remote-builders = true;
    nixvim.enable = true;
+    zen-browser.enable = true;
    kitty.enable = true;
    helix.enable = false;
    stylix.enable = true;
--- a/hosts/doloro-laptop/nixos.nix
+++ b/hosts/doloro-laptop/nixos.nix
@@ -24,7 +24,7 @@ in
    stylix.enable = true;
    steam.enable = true;
    Hyprland.enable = true;
-    remoteBuild.use-remote-builders = true;
+    # remoteBuild.use-remote-builders = true;
    wivrn.enable = false;
    fonts.enable = true;
  };
@@ -71,19 +71,6 @@ in
      # intel-compute-runtime # OpenCL (NEO) + Level Zero for Arc/Xe
    ];
  };
-  programs.ssh = {
-    # enable = true;
-    startAgent = true;
-
-    matchBlocks = {
-      "*" = {
-        addKeysToAgent = "yes";
-        identityFile = [
-          "~/.ssh/id_ed25519"
-        ];
-      };
-    };
-  };
  services.openssh = {
    enable = true;
    settings = {
--- a/hosts/doloro/home.nix
+++ b/hosts/doloro/home.nix
@@ -6,22 +6,6 @@
  ...
 }:
 {
-  # imports = [
-  #   ../../modules/hyprland/home.nix
-  #   ../../modules/quickshell/home.nix
-  #   ../../modules/chromium/home.nix
-  #   #./modules/neovim/home.nix
-  #   ../../modules/stylix/home.nix
-  #   ../../modules/nixvim/home.nix
-  #   ../../modules/tmux/home.nix
-  #   ../../modules/theme/home.nix
-  #   # ./modules/spicetify/home.nix
-  #   ../../modules/obs/home.nix
-  #   ../../modules/blender/home.nix
-  #   ../../modules/fish/home.nix
-  #   ../../modules/ytm/home.nix
-  #   ../../overlays.nix
-  # ];
  modules = {
    Hyprland = {
      enable = true;
@@ -30,6 +14,7 @@
    quickshell.enable = true;
    # chromium.enable = true;
    wivrn.enable = true;
+    sops.enable = true;
    helium.enable = true;
    nixvim.enable = true;
    helix.enable = false;
--- a/modules/builder/default.nix
+++ b/modules/builder/default.nix
@@ -1,4 +1,4 @@
 _: {
-  # home = ./home.nix;
+  home = ./home.nix;
  nixos = ./nixos.nix;
 }
--- a/modules/builder/home.nix
+++ b/modules/builder/home.nix
@@ -1,48 +1,39 @@
-# {
-#   config,
-#   lib,
-#   pkgs,
-#   fetchFromGitHub,
-#   ...
-# }:
-# let
-#   cfg = config.modules.fish;
-# in
-# {
-#   options.modules.fish = {
-#     enable = lib.mkEnableOption "Fish";
-#   };
-#   config = lib.mkIf cfg.enable {
-#     home.shell.enableFishIntegration = true;
-#     programs = {
-#       fish = {
-#         enable = true;
-#         shellInit = ''
-#                               set -g theme_nerd_fonts yes
-#                               set -g theme_color_scheme nord
-#                               set -g theme_display_user yes
-#                     set -g fish_color_autosuggestion 6F6578
-#           					alias nik 'nix'
-#                     					'';
-#         plugins = [
-#           {
-#             name = "bobthefish";
-#             src = pkgs.fetchFromGitHub {
-#               owner = "oh-my-fish";
-#               repo = "theme-bobthefish";
-#               rev = "e3b4d4eafc23516e35f162686f08a42edf844e40";
-#               sha256 = "sha256-cXOYvdn74H4rkMWSC7G6bT4wa9d3/3vRnKed2ixRnuA=";
-#             };
-#           }
-#         ];
-#       };
-#       eza = {
-#         enable = true;
-#         enableFishIntegration = true;
-#         icons = "auto";
-#         git = true;
-#         extraOptions = [ ];
-#       };
-#     };
-#   };
-# }
+{
+  config,
+  lib,
+  pkgs,
+  fetchFromGitHub,
+  ...
+}:
+let
+  cfg = config.modules.remoteBuild;
+in
+{
+  options.modules.remoteBuild = {
+    use-remote-builders = lib.mkEnableOption "remoteBuild";
+  };
+  config = lib.mkIf cfg.use-remote-builders {
+    nix.package = pkgs.nix;
+    nix.distributedBuilds = true;
+    nix.settings.builders-use-substitutes = true;
+
+    # Define every build machine here..
+    nix.buildMachines = [
+      {
+        # Main desktop pc
+        # ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKqsFEgtcTDw89GaZJg8P/FE1xngIXmiUZl8j0b+V7n+ root@doloroo-main
+        hostName = "doloroo-main";
+        sshUser = "remotebuild";
+        sshKey = "/root/.ssh/remotebuild";
+        # protocol = "ssh-ng";
+        maxJobs = 8;
+        speedFactor = 2;
+        supportedFeatures = [
+          "nixos-test"
+          "big-parallel"
+          "kvm"
+        ];
+      }
+    ];
+  };
+}
--- a/modules/builder/nixos.nix
+++ b/modules/builder/nixos.nix
@@ -33,6 +33,7 @@ let
    nix.settings.builders-use-substitutes = true;

    # Define every build machine here..
+    # also define in home manager (TODO make a single file with all builders)
    nix.buildMachines = [
      {
        # Main desktop pc
--- a/modules/quickshell/quickshell/bar/Bar.qml
+++ b/modules/quickshell/quickshell/bar/Bar.qml
@@ -16,7 +16,7 @@ PanelWindow {
    property var modelData
    screen: modelData.values[0]

-    color: Common.Colors.colors.mainBackground
+    color: Qt.rgba(0, 0, 0, 0) // Fully transparent via zero alpha
    anchors {
        top: true
        left: true
@@ -25,6 +25,7 @@ PanelWindow {

    implicitHeight: 31
    RowLayout {
+        visible: true
        height: 30
        anchors {
            top: parent.top
--- a/modules/quickshell/quickshell/bar/widgets/Battery.qml
+++ b/modules/quickshell/quickshell/bar/widgets/Battery.qml
@@ -32,7 +32,7 @@ Rectangle {
        anchors.centerIn: parent
        Text {
            // anchors.centerIn: parent
-            text: UPower.displayDevice.percentage * 100 + "%"
+            text: Math.round(UPower.displayDevice.percentage * 100) + "%"
            color: Common.Colors.colors.primary
            font.weight: Font.DemiBold
            font.pointSize: 12
--- a/modules/quickshell/quickshell/bar/widgets/common/Colors.qml
+++ b/modules/quickshell/quickshell/bar/widgets/common/Colors.qml
@@ -6,16 +6,22 @@ import Quickshell.Io
 Singleton {
    id: root

-		// XX (alpha) XXXXXX (color)
+    // XX (alpha) XXXXXX (color)

-		// For oled screen that risk burn in, set up these colors as semi-transparent and have a rotating wallpaper (!!)
+    // For oled screen that risk burn in, set up these colors as semi-transparent and have a rotating wallpaper (!!)
    readonly property var colors: ({
-        primary: "#59b1b2b5", // Icons & Text colors
-				secondary: "#BF2a2a2a", // Pill container colors
-				background: "#BF000000", // Background of containers
-				mainBackground: "#20ffffff", // Color of the main bar
-				warning: "#E9D502", // (i.e battery nearing low)
-				critial: "#e53b3c", // (i.e battery is low)
-				critial2: "#e53b3c", // (Speaker and Mic being off)
-    })
+            primary: "#59b1b2b5" // Icons & Text colors
+            ,
+            secondary: "#BF2a2a2a" // Pill container colors
+            ,
+            background: "#BF000000" // Background of containers
+            ,
+            mainBackground: "#20ffffff" // Color of the main bar
+            ,
+            warning: "#E9D502" // (i.e battery nearing low)
+            ,
+            critial: "#e53b3c" // (i.e battery is low)
+            ,
+            critial2: "#e53b3c" // (Speaker and Mic being off)
+        })
 }
--- a/modules/sops/default.nix
+++ b/modules/sops/default.nix
@@ -0,0 +1,4 @@
+_: {
+  nixos = ./nixos.nix;
+  home = ./home.nix;
+}
--- a/modules/sops/home.nix
+++ b/modules/sops/home.nix
@@ -0,0 +1,30 @@
+{
+  config,
+  lib,
+  inputs,
+  pkgs,
+  home,
+  system,
+  nix-meow,
+  ...
+}:
+let
+  cfg = config.modules.sops;
+in
+{
+
+  imports = [
+    inputs.sops-nix.homeManagerModules.sops
+  ];
+  options.modules.sops = {
+    enable = lib.mkEnableOption "sops configuration module";
+  };
+  config = lib.mkIf cfg.enable {
+    sops = {
+      age.keyFile = "/home/doloro/.config/sops/age/key.txt"; # must have no password!
+      defaultSopsFile = "${nix-meow.flakeRoot}/secrets/users.yaml";
+      secrets."wakatime-scug-io-api-key" = {
+      };
+    };
+  };
+}
--- a/modules/sops/nixos.nix
+++ b/modules/sops/nixos.nix
@@ -0,0 +1,19 @@
+{
+  config,
+  lib,
+  inputs,
+  pkgs,
+  home,
+  system,
+  ...
+}:
+let
+  cfg = config.modules.sops;
+in
+{
+  options.modules.sops = {
+    enable = lib.mkEnableOption "sops configuration module";
+  };
+  config = lib.mkIf cfg.enable {
+  };
+}
--- a/modules/zen-browser/default.nix
+++ b/modules/zen-browser/default.nix
@@ -0,0 +1,4 @@
+_: {
+  home = ./home.nix;
+  # nixos = ./nixos.nix;
+}
--- a/modules/zen-browser/home.nix
+++ b/modules/zen-browser/home.nix
@@ -0,0 +1,26 @@
+{
+  config,
+  inputs,
+  lib,
+  pkgs,
+  fetchFromGitHub,
+  ...
+}:
+let
+  cfg = config.modules.zen-browser;
+in
+{
+  imports = [
+    # inputs.zen-browser.homeModules.beta
+    # inputs.zen-browser.homeModules.twilight
+    inputs.zen-browser.homeModules.twilight-official
+  ];
+  options.modules.zen-browser = {
+    enable = lib.mkEnableOption "zen";
+  };
+  config = lib.mkIf cfg.enable {
+    programs.zen-browser = {
+      enable = true;
+    };
+  };
+}
--- a/modules/zen-browser/nixos.nix
+++ b/modules/zen-browser/nixos.nix
@@ -0,0 +1,17 @@
+# Disabled in default
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.modules.zen-browser;
+in
+{
+  options.modules.zen-browser = {
+    enable = lib.mkEnableOption "zen";
+  };
+  config = lib.mkIf cfg.enable {
+  };
+}
--- a/1
+++ b/1
@@ -0,0 +1 @@
+/nix/store/fmxnvfib50cwy1jkr8l8jqy0z93k82kz-depotdownloader-2.7.4-unstable-2024-12-01
				`@@ -0,0 +1 @@`
				`/nix/store/fmxnvfib50cwy1jkr8l8jqy0z93k82kz-depotdownloader-2.7.4-unstable-2024-12-01`