a lot of work

This commit is contained in:
2025-12-30 16:35:44 +00:00
parent a1b117c408
commit f029d5fedd
18 changed files with 201 additions and 92 deletions

View File

@@ -1,4 +1,4 @@
_: {
# home = ./home.nix;
home = ./home.nix;
nixos = ./nixos.nix;
}

View File

@@ -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"
];
}
];
};
}

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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)
})
}

4
modules/sops/default.nix Normal file
View File

@@ -0,0 +1,4 @@
_: {
nixos = ./nixos.nix;
home = ./home.nix;
}

30
modules/sops/home.nix Normal file
View File

@@ -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" = {
};
};
};
}

19
modules/sops/nixos.nix Normal file
View File

@@ -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 {
};
}

View File

@@ -0,0 +1,4 @@
_: {
home = ./home.nix;
# nixos = ./nixos.nix;
}

View File

@@ -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;
};
};
}

View File

@@ -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 {
};
}