Compare commits

...

51 Commits

Author SHA1 Message Date
Renovate Bot
30226099e7 Lock file maintenance 2025-07-27 02:07:00 +00:00
Renovate Bot
991898884d Lock file maintenance 2025-07-26 02:07:07 +00:00
Renovate Bot
38e24429ea Update DeterminateSystems/update-flake-lock action to v27 2025-07-20 04:02:49 +02:00
Renovate Bot
44aa8c7ec4 Update DeterminateSystems/magic-nix-cache-action action to v13 2025-07-20 02:02:44 +00:00
Renovate Bot
4f71551caa Update DeterminateSystems/nix-installer-action action to v19 2025-07-19 02:09:21 +00:00
Renovate Bot
ff13963b35 Update DeterminateSystems/flake-checker-action action to v12 2025-07-16 02:07:28 +00:00
Renovate Bot
7c9b43cafa Lock file maintenance 2025-07-13 02:09:23 +00:00
Renovate Bot
7369d9157b Lock file maintenance 2025-07-12 02:04:00 +00:00
soraefir
ce239b5530 scad 2025-07-08 23:08:11 +02:00
Renovate Bot
3760180d73 Update DeterminateSystems/update-flake-lock action to v26 2025-07-06 02:02:48 +00:00
Renovate Bot
1968a1d4f6 Update DeterminateSystems/magic-nix-cache-action action to v12 2025-07-06 02:02:41 +00:00
Renovate Bot
d98f06b0b0 Update DeterminateSystems/nix-installer-action action to v18 2025-07-05 02:10:18 +00:00
Renovate Bot
6639999e9a Update DeterminateSystems/flake-checker-action action to v11 2025-07-04 02:09:28 +00:00
soraefir
aa34956969 cgal 2025-06-29 23:41:04 +02:00
Renovate Bot
6a7af294dd Lock file maintenance 2025-06-29 02:10:31 +00:00
Renovate Bot
46a6bf1fe1 Lock file maintenance 2025-06-28 02:04:20 +00:00
Renovate Bot
c62d093b19 Lock file maintenance 2025-06-22 02:03:52 +00:00
Renovate Bot
4f9b1630cd Lock file maintenance 2025-06-21 02:04:46 +00:00
Renovate Bot
dc350cd669 Update DeterminateSystems/magic-nix-cache-action action to v11 2025-06-17 02:01:37 +00:00
Renovate Bot
07df68fc19 Lock file maintenance 2025-06-15 02:04:15 +00:00
Renovate Bot
1cd9d6ccbf Lock file maintenance 2025-06-14 02:03:38 +00:00
Renovate Bot
56ed6f2fa8 Update DeterminateSystems/magic-nix-cache-action action to v10 2025-06-11 02:03:40 +00:00
soraefir
4c1ef61375 added mimes 2025-06-09 08:43:28 +02:00
soraefir
139d33ae2d pastelle default 2025-06-09 08:30:31 +02:00
soraefir
71443cfbc1 updated colors 2025-06-08 20:10:56 +02:00
soraefir
db69b419b6 Upgrade to 25.05 2025-06-08 16:01:29 +02:00
soraefir
4346ec7232 new colors ? 2025-06-08 15:34:49 +02:00
soraefir
49469b4962 New power & no bamboo & sh3d 2025-06-08 15:34:49 +02:00
Renovate Bot
a2ef475040 Lock file maintenance 2025-06-08 02:04:44 +00:00
Renovate Bot
42952cc19b Lock file maintenance 2025-06-07 02:04:51 +00:00
Renovate Bot
110ff51e9e Lock file maintenance 2025-06-01 02:03:48 +00:00
Renovate Bot
712f263c6c Lock file maintenance 2025-05-31 02:04:59 +00:00
Renovate Bot
cc3cd50852 Update DeterminateSystems/flake-checker-action action to v10 2025-05-31 02:03:42 +00:00
Renovate Bot
56533cfeb1 Lock file maintenance 2025-05-25 02:03:18 +00:00
Renovate Bot
272587d9ab Lock file maintenance 2025-05-24 02:04:20 +00:00
Renovate Bot
2629e7c873 Lock file maintenance 2025-05-18 02:03:47 +00:00
Renovate Bot
71d1f30920 Lock file maintenance 2025-05-17 02:10:23 +00:00
Renovate Bot
29027c39d6 Update DeterminateSystems/update-flake-lock action to v25 2025-05-17 02:08:56 +00:00
Renovate Bot
fde8c67d5b Lock file maintenance 2025-05-11 02:06:53 +00:00
Renovate Bot
209bc82941 Lock file maintenance 2025-05-10 02:08:25 +00:00
Renovate Bot
06d3c576ff Lock file maintenance 2025-05-04 02:04:08 +00:00
Renovate Bot
d29d622b54 Lock file maintenance 2025-05-03 02:04:42 +00:00
Renovate Bot
b05c1c9261 Lock file maintenance 2025-04-27 02:05:07 +00:00
Renovate Bot
6227d69f5c Lock file maintenance 2025-04-26 02:05:13 +00:00
Renovate Bot
e99f5df33a Update DeterminateSystems/nix-installer-action action to v17 2025-04-25 02:01:53 +00:00
Renovate Bot
7fa3301ad7 Lock file maintenance 2025-04-20 02:04:09 +00:00
Renovate Bot
e31da30d09 Lock file maintenance 2025-04-19 02:04:35 +00:00
Renovate Bot
833b7b35b1 Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Waiting to run
Nix Build / build-nixos (push) Failing after 5m31s
2025-04-13 02:04:40 +00:00
Renovate Bot
b94ce739b7 Lock file maintenance
Some checks failed
Nix Build / build-nixos (push) Has started running
Nix Build / build-nixos (pull_request) Failing after 4h46m56s
2025-04-12 02:04:11 +00:00
Renovate Bot
114831b04c Lock file maintenance
Some checks failed
Nix Build / build-nixos (pull_request) Failing after 1h11m39s
Nix Build / build-nixos (push) Has been cancelled
2025-04-11 02:03:58 +00:00
soraefir
e94516a8bc bambulab fix
Some checks failed
Nix Build / build-nixos (push) Failing after 1h10m40s
2025-04-10 19:37:04 +02:00
20 changed files with 169 additions and 151 deletions

View File

@@ -18,8 +18,8 @@ jobs:
uses: cachix/install-nix-action@v31 uses: cachix/install-nix-action@v31
# - uses: DeterminateSystems/nix-installer-action@v4 # - uses: DeterminateSystems/nix-installer-action@v4
- uses: DeterminateSystems/magic-nix-cache-action@v9 - uses: DeterminateSystems/magic-nix-cache-action@v13
- uses: DeterminateSystems/flake-checker-action@v9 - uses: DeterminateSystems/flake-checker-action@v12
- name: "Install Cachix ❄️" - name: "Install Cachix ❄️"
uses: cachix/cachix-action@v16 uses: cachix/cachix-action@v16

View File

@@ -15,13 +15,13 @@ jobs:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Install nix - name: Install nix
uses: DeterminateSystems/nix-installer-action@v16 uses: DeterminateSystems/nix-installer-action@v19
with: with:
github-token: ${{ secrets.GH_TOKEN_FOR_UPDATES }} github-token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
extra_nix_config: | extra_nix_config: |
experimental-features = nix-command flakes experimental-features = nix-command flakes
- name: Update flake.lock - name: Update flake.lock
uses: DeterminateSystems/update-flake-lock@v24 uses: DeterminateSystems/update-flake-lock@v27
with: with:
token: ${{ secrets.GT_TOKEN_FOR_UPDATES }} token: ${{ secrets.GT_TOKEN_FOR_UPDATES }}
pr-title: "[chore] Update flake.lock" pr-title: "[chore] Update flake.lock"

82
flake.lock generated
View File

@@ -9,11 +9,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733918465, "lastModified": 1745165725,
"narHash": "sha256-hSuGa8Hh67EHr2x812Ay6WFyFT2BGKn+zk+FJWeKXPg=", "narHash": "sha256-OnHV8Us04vRsWM0uL1cQez8DumhRi6yE+4K4VLtH6Ws=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "arion", "repo": "arion",
"rev": "f01c95c10f9d4f04bb08d97b3233b530b180f12e", "rev": "4f59059633b14364b994503b179a701f5e6cfb90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -45,11 +45,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743496612, "lastModified": 1751313918,
"narHash": "sha256-emPWa5lmKbnyuj8c1mSJUkzJNT+iJoU9GMcXwjp2oVM=", "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "73d59580d01e9b9f957ba749f336a272869c42dd", "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -103,11 +103,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1743420942, "lastModified": 1753122741,
"narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -139,16 +139,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743808813, "lastModified": 1753479839,
"narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=", "narHash": "sha256-E/rPVh7vyPMJUFl2NAew+zibNGfVbANr8BP8nLRbLkQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6", "rev": "0b9bf983db4d064764084cd6748efb1ab8297d1e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.11", "ref": "release-25.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -174,11 +174,11 @@
}, },
"nixUnstable": { "nixUnstable": {
"locked": { "locked": {
"lastModified": 1743689281, "lastModified": 1753432016,
"narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=", "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2bfc080955153be0be56724be6fa5477b4eefabb", "rev": "6027c30c8e9810896b92429f0092f624f7b1aace",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -190,16 +190,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1743703532, "lastModified": 1753345091,
"narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bdb91860de2f719b57eef819b5617762f7120c70", "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.11", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -221,11 +221,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1743583204, "lastModified": 1753429684,
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -238,15 +238,14 @@
"nur": { "nur": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2"
"treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1743818287, "lastModified": 1753562419,
"narHash": "sha256-5OPfiiQfULhteqjzI6FeIREqPjF2vOpykMBJsjOr7mY=", "narHash": "sha256-hSutp1wLoj2DBGdhkFUCy8gJHu7YJ8Nt/OgsYrQ/O50=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "ef2193401e96088b177a6779c20e7eb8adda28e8", "rev": "294f62a0da32efbda589682cc1f038e773530959",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -275,11 +274,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743756170, "lastModified": 1752544651,
"narHash": "sha256-2b11EYa08oqDmF3zEBLkG1AoNn9rB1k39ew/T/mSvbU=", "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "cff8437c5fe8c68fc3a840a21bf1f4dc801da40d", "rev": "2c8def626f54708a9c38a5861866660395bb3461",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -287,27 +286,6 @@
"repo": "sops-nix", "repo": "sops-nix",
"type": "github" "type": "github"
} }
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733222881,
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View File

@@ -3,12 +3,12 @@
inputs = { inputs = {
# Trick renovate into working: "github:NixOS/nixpkgs/nixpkgs-unstable" # Trick renovate into working: "github:NixOS/nixpkgs/nixpkgs-unstable"
nixUnstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixUnstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
hardware.url = "github:nixos/nixos-hardware"; hardware.url = "github:nixos/nixos-hardware";
nur.url = "github:nix-community/nur"; nur.url = "github:nix-community/nur";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.11"; url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

View File

@@ -14,7 +14,7 @@ in {
"ssh" = "TERM=xterm-256color ${pkgs.openssh}/bin/ssh"; "ssh" = "TERM=xterm-256color ${pkgs.openssh}/bin/ssh";
"top" = "btop"; "top" = "btop";
}; };
initExtra = '' initContent = ''
sopsu() {nix-shell -p sops --run "sops updatekeys $1";} sopsu() {nix-shell -p sops --run "sops updatekeys $1";}
sopsn() {nix-shell -p sops --run "sops $1";} sopsn() {nix-shell -p sops --run "sops $1";}
''; '';

View File

@@ -2,6 +2,6 @@
imports = [ ./vscodium ]; imports = [ ./vscodium ];
config = lib.mkIf (config.syscfg.make.develop) { config = lib.mkIf (config.syscfg.make.develop) {
home.packages = with pkgs; [ blender godot_4 openscad bambu-studio ]; home.packages = with pkgs; [ blender godot_4 openscad-unstable bambu-studio ];
}; };
} }

View File

@@ -5,7 +5,7 @@
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium;
#profiles.default = { #profiles.default = {
extensions = with pkgs.vscode-extensions; [ profiles.default.extensions = with pkgs.vscode-extensions; [
bbenoist.nix bbenoist.nix
esbenp.prettier-vscode esbenp.prettier-vscode
golang.go golang.go

View File

@@ -14,7 +14,9 @@
pavucontrol pavucontrol
keepassxc keepassxc
nextcloud-client nextcloud-client
gramps gramps
sweethome3d.application
]; ];
}; };
} }

View File

@@ -11,8 +11,8 @@ in pkgs.stdenv.mkDerivation rec {
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "vinceliuice"; owner = "vinceliuice";
repo = "Orchis-theme"; repo = "Orchis-theme";
rev = "be8b0aff92ed0741174b74c2ee10c74b15be0474"; rev = "5b73376721cf307101e22d7031c1f4b1344d1f63";
sha256 = "sha256-m7xh/1uIDh2BM0hTPA5QymXQt6yV7mM7Ivg5VaF2PvM="; sha256 = "sha256-+2/CsgJ+rdDpCp+r5B/zys3PtFgtnu+ohTEUOtJNd1Y=";
}; };
nativeBuildInputs = with pkgs; [ gtk3 sassc ]; nativeBuildInputs = with pkgs; [ gtk3 sassc ];
@@ -22,43 +22,43 @@ in pkgs.stdenv.mkDerivation rec {
preInstall = '' preInstall = ''
mkdir -p $out/share/themes mkdir -p $out/share/themes
cat > src/_sass/_color-palette-${scheme.slug}.scss << 'EOF' cat > src/_sass/_color-palette-${scheme.slug}.scss << 'EOF'
$red-light: #${scheme.palette.base0F}; $red-light: #${scheme.palette.low0F};
$red-dark: #${scheme.palette.base0F}; $red-dark: #${scheme.palette.high0F};
$pink-light: #${scheme.palette.base0E}; $pink-light: #${scheme.palette.low0E};
$pink-dark: #${scheme.palette.base0E}; $pink-dark: #${scheme.palette.high0E};
$purple-light: #${scheme.palette.base0D}; $purple-light: #${scheme.palette.low0D};
$purple-dark: #${scheme.palette.base0D}; $purple-dark: #${scheme.palette.high0D};
$blue-light: #${scheme.palette.base0C}; $blue-light: #${scheme.palette.low0C};
$blue-dark: #${scheme.palette.base0C}; $blue-dark: #${scheme.palette.high0C};
$teal-light: #${scheme.palette.base0B}; $teal-light: #${scheme.palette.low0B};
$teal-dark: #${scheme.palette.base0B}; $teal-dark: #${scheme.palette.high0B};
$green-light: #${scheme.palette.base0A}; $green-light: #${scheme.palette.low0A};
$green-dark: #${scheme.palette.base0A}; $green-dark: #${scheme.palette.high0A};
$sea-light: #${scheme.palette.base0B}; $sea-light: #${scheme.palette.alt_low0B};
$sea-dark: #${scheme.palette.base0B}; $sea-dark: #${scheme.palette.alt_high0B};
$yellow-light: #${scheme.palette.base09}; $yellow-light: #${scheme.palette.low09};
$yellow-dark: #${scheme.palette.base09}; $yellow-dark: #${scheme.palette.low09};
$orange-light: #${scheme.palette.base08}; $orange-light: #${scheme.palette.low08};
$orange-dark: #${scheme.palette.base08}; $orange-dark: #${scheme.palette.high08};
$grey-050: #${scheme.palette.base07}; $grey-050: #${scheme.palette.base07};
$grey-100: #${scheme.palette.base07}; $grey-100: #${scheme.palette.base07};
$grey-150: #${scheme.palette.base07}; $grey-150: #${scheme.palette.base06};
$grey-200: #${scheme.palette.base06}; $grey-200: #${scheme.palette.base06};
$grey-250: #${scheme.palette.base06}; $grey-250: #${scheme.palette.base05};
$grey-300: #${scheme.palette.base05}; $grey-300: #${scheme.palette.base05};
$grey-350: #${scheme.palette.base05}; $grey-350: #${scheme.palette.base04};
$grey-400: #${scheme.palette.base04}; $grey-400: #${scheme.palette.base04};
$grey-450: #${scheme.palette.base04}; $grey-450: #${scheme.palette.base03};
$grey-500: #${scheme.palette.base03}; $grey-500: #${scheme.palette.base03};
$grey-550: #${scheme.palette.base03}; $grey-550: #${scheme.palette.base02};
$grey-600: #${scheme.palette.base02}; $grey-600: #${scheme.palette.base02};
$grey-650: #${scheme.palette.base02}; $grey-650: #${scheme.palette.base02};
$grey-700: #${scheme.palette.base01}; $grey-700: #${scheme.palette.base01};

View File

@@ -42,6 +42,8 @@ in {
[ "discord-402572971681644545.desktop" ]; [ "discord-402572971681644545.desktop" ];
"x-scheme-handler/discord-696343075731144724" = "x-scheme-handler/discord-696343075731144724" =
[ "discord-696343075731144724.desktop" ]; [ "discord-696343075731144724.desktop" ];
"x-scheme-handler/tg" = [ "org.telegram.desktop.desktop" ];
"x-scheme-handler/tonsite" = [ "org.telegram.desktop.desktop" ];
"x-scheme-handler/http" = [ "firefox.desktop" ]; "x-scheme-handler/http" = [ "firefox.desktop" ];
"x-scheme-handler/https" = [ "firefox.desktop" ]; "x-scheme-handler/https" = [ "firefox.desktop" ];
"x-scheme-handler/chrome" = [ "firefox.desktop" ]; "x-scheme-handler/chrome" = [ "firefox.desktop" ];

View File

@@ -4,7 +4,7 @@ in {
config = lib.mkIf cfg { config = lib.mkIf cfg {
# sound.enable = true; # sound.enable = true;
security.rtkit.enable = true; security.rtkit.enable = true;
hardware.pulseaudio.enable = false; #25.05 change to services services.pulseaudio.enable = false; #25.05 change to services
services.pipewire = { services.pipewire = {
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;

View File

@@ -7,8 +7,24 @@
STOP_CHARGE_THRESH_BAT0 = 90; STOP_CHARGE_THRESH_BAT0 = 90;
CPU_SCALING_GOVERNOR_ON_AC = "performance"; CPU_SCALING_GOVERNOR_ON_AC = "performance";
CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
MEM_SLEEP_ON_BAT = "deep";
}; };
}; };
powerManagement.enable = true;
# suspend to RAM (deep) rather than `s2idle`
boot.kernelParams = [ "mem_sleep_default=deep" ];
# suspend-then-hibernate
systemd.sleep.extraConfig = ''
HibernateDelaySec=30m
SuspendState=mem
'';
services.logind.lidSwitch = "suspend-then-hibernate";
# Hibernate on power button pressed
services.logind.powerKey = "hibernate";
services.logind.powerKeyLongPress = "poweroff";
systemd.user.services.battery_monitor = { systemd.user.services.battery_monitor = {
wants = [ "display-manager.service" ]; wants = [ "display-manager.service" ];

View File

@@ -1,5 +1,5 @@
{ config, ... }: { { config, ... }: {
imports = [ ./sorahiro_soft.nix ]; imports = [ ./sorahiro.nix ];
colorScheme.palette.border-radius = "#8"; colorScheme.palette.border-radius = "#8";
colorScheme.palette.border-width = "#2"; colorScheme.palette.border-width = "#2";

View File

@@ -0,0 +1,67 @@
{ nix-colors, ... }:
let use_pastelle = true;
in{
# usage: a = "#${config.colorScheme.palette.base00}";
colorScheme = {
slug = "sorahiro";
name = "sorahiro";
author = "Soraefir @ Helcel";
variant = "dark";
palette = rec {
# Format: Name, Pantone, RAL
base00 = "#000000"; # Black / 419C / 9005
base01 = "#060a0f"; # Rich Black / 532C / 9005
base02 = "#212c38"; # Yankees Blue / 433C / 5011
base03 = "#3f5268"; # Police Blue / 432C / 5000
base04 = "#617b9a"; # Slate Gray / 5415C / 5014
base05 = "#90a7c1"; # Pewter Blue / 535C / 5024
base06 = "#c9d3df"; # Columbia Blue / 538C / 7047
base07 = "#fcfcfc"; # Lotion / 663C / 9016
alt00 = "#000000"; # Black / 419C / 9005
alt01 = "#0c0906"; # Vampire Black / 419C / 9005
alt02 = "#312920"; # Pine Tree / 440C / 6022
alt03 = "#5b4e3e"; # Olive Drab Camouflage / 411C / 7013
alt04 = "#887660"; # Shadow / 404C / 7002
alt05 = "#b8a083"; # Pale Taupe / 480C / 1019
alt06 = "#e1cfb9"; # Desert Sand / 482C / 1015
alt07 = "#fcfcfc"; # Lotion / 663C / 9016
base08 = if use_pastelle then low08 else high08;
base09 = if use_pastelle then low09 else high09;
base0A = if use_pastelle then low0A else high0A;
base0B = if use_pastelle then low0B else high0B;
base0C = if use_pastelle then low0C else high0C;
base0D = if use_pastelle then low0D else high0D;
base0E = if use_pastelle then low0E else high0E;
base0F = if use_pastelle then low0F else high0F;
high08 = "#f09732"; # Deep Saffron / 804C / 1033
high09 = "#f2d831"; # Dandelion / 114C / 1016
high0A = "#98f12f"; # Green Lizard / 375C / 6038
high0B = "#34f4f0"; # Fluorescent Blue / 3252C / 6027
high0C = "#3193f5"; # Brilliant Azure / 2727C / 5015
high0D = "#c156f6"; # Blue-Violet / 2592C / 4006
high0E = "#f62ac0"; # Royal Pink / 807C / 4010
high0F = "#f42060"; # Deep Carmine Pink / 1925C / 3018
alt_high08 = "#f66824"; # Orange-Red / 165C / 2008
alt_high0B = "#41f3a4"; # Eucalyptus / 3395C / 6037
alt_high0C = "#2abef8"; # Spiro Disco Ball / 298C / 5012
alt_high0D = "#837ff5"; # Violets Are Blue / 814C / 4005
low08 = "#ffac56"; # Rajah / 150C / 1017
low09 = "#feea74"; # Shandy / 127C / 1016
low0A = "#bffe8a"; # Menthol / 374C / 6018
low0B = "#4cfefa"; # Electric Blue / 3252C / 6027
low0C = "#62acfd"; # Blue Jeans / 279C / 5012
low0D = "#9b9bfd"; # Maximum Blue Purple / 2715C / 4005
low0E = "#fe9bda"; # Lavender Rose / 223C / 4003
low0F = "#fc8999"; # Tulip / 1775C / 3014
alt_low08 = "#fe946a"; # Atomic Tangerine / 811C / 1034
alt_low0B = "#87febf"; # Aquamarine / 353C / 6019
alt_low0C = "#38c3fd"; # Picton Blue / 298C / 5012
alt_low0D = "#dca2ff"; # Mauve / 2572C / 4005
};
};
}

View File

@@ -1,29 +0,0 @@
{ nix-colors, ... }: {
# usage: a = "#${config.colorScheme.palette.base00}";
colorScheme = {
slug = "sorahiro-hard";
name = "sorahiro-hard";
author = "Soraefir @ Helcel";
variant = "dark";
palette = {
# Format: Name, Pantone, RAL
base00 = "#030B12"; # Rich Black / 6C / 000-15-00
base01 = "#0C1D2E"; # Maastricht Blue / 5395C / 270-20-15
base02 = "#203A53"; # Japanese Indigo / 534C / 260-20-20
base03 = "#425F7C"; # Deep Space Sparkle / 7699C / 260-40-20
base04 = "#93A9BE"; # Pewter Blue / 535C / 260-70-15
base05 = "#B6C5D5"; # Pastel Blue / 5445C / 260-80-10
base06 = "#D6DFE8"; # Gainsboro / 642C / 260-90-05
base07 = "#F0F3F7"; # White / 656C / 290-92-05
base08 = "#F59331"; # Deep Saffron / 715C / 070-70-70
base09 = "#F5F531"; # Maximum Yellow / 394C / 100-80-80
base0A = "#93F531"; # French Lime / 7488C / 120-70-75
base0B = "#31F593"; # Eucalyptus / 3385C / 160-70-50
base0C = "#3193F5"; # Brilliant Azure / 2727C / 280-50-40
baseOD = "#9331F5"; # Blue-Violet / 7442C / 300-40-45
base0E = "#F53193"; # Royal Pink / 232C / 350-50-50
base0F = "#F53131"; # Deep Carmine Pink / 1788C / 040-50-70
};
};
}

View File

@@ -1,29 +0,0 @@
{ nix-colors, ... }: {
# usage: a = "#${config.colorScheme.palette.base00}";
colorScheme = {
slug = "sorahiro-soft";
name = "sorahiro-soft";
author = "Soraefir @ Helcel";
variant = "dark";
palette = {
# Format: Name, Pantone, RAL
base00 = "#030B12"; # Rich Black / 6C / 000-15-00
base01 = "#0C1D2E"; # Maastricht Blue / 5395C / 270-20-15
base02 = "#203A53"; # Japanese Indigo / 534C / 260-20-20
base03 = "#425F7C"; # Deep Space Sparkle / 7699C / 260-40-20
base04 = "#93A9BE"; # Pewter Blue / 535C / 260-70-15
base05 = "#B6C5D5"; # Pastel Blue / 5445C / 260-80-10
base06 = "#D6DFE8"; # Gainsboro / 642C / 260-90-05
base07 = "#F0F3F7"; # White / 656C / 290-92-05
base08 = "#F5B97D"; # Mellow Apricot / 156C / 070-80-40
base09 = "#F5F57D"; # Sunny / 393C / 100-90-50
base0A = "#B9F57D"; # Yellow-Green / 373C / 120-80-60
base0B = "#7DF5B9"; # Aquamarine / 3375C / 150-80-40
base0C = "#7DB9F5"; # Light Azure / 278C / 250-70-30
base0D = "#B97DF5"; # Lavender / 2572C / 310-60-35
base0E = "#F57DB9"; # Persian Pink / 211C / 350-60-45
base0F = "#F57D7D"; # Light Coral / 170C / 030-60-50
};
};
}

View File

@@ -0,0 +1,10 @@
{ final, prev, ... }:
prev.bambu-studio.overrideAttrs (oldAttrs: rec{
version = "02.00.01.50";
src = prev.fetchFromGitHub {
owner = "bambulab";
repo = "BambuStudio";
rev = "v${version}";
hash = "sha256-7mkrPl2CQSfc1lRjl1ilwxdYcK5iRU//QGKmdCicK30=";
};
})

View File

@@ -4,6 +4,7 @@
openttd-jgrpp = import ./openttd-jgrpp { inherit final prev; }; openttd-jgrpp = import ./openttd-jgrpp { inherit final prev; };
yarn-berry = import ./yarn-berry { inherit final prev; }; yarn-berry = import ./yarn-berry { inherit final prev; };
eww = import ./eww { inherit final prev; }; eww = import ./eww { inherit final prev; };
bambu-studio = import ./bambu-studio { inherit final prev; };
wine = final.unstable.wineWow64Packages.unstableFull; wine = final.unstable.wineWow64Packages.unstableFull;
unstable = import inputs.nixUnstable { unstable = import inputs.nixUnstable {
system = final.system; system = final.system;

View File

@@ -2,16 +2,16 @@
let old = prev.eww; let old = prev.eww;
in final.rustPlatform.buildRustPackage rec { in final.rustPlatform.buildRustPackage rec {
pname = "eww"; pname = "eww";
version = "8661abf2bf07f5a809fc995233d93810cc1ac871"; version = "98c220126d912b935987766f56650b55f3e226eb";
src = prev.fetchFromGitHub { src = prev.fetchFromGitHub {
owner = "elkowar"; owner = "elkowar";
repo = "eww"; repo = "eww";
rev = "${version}"; rev = "${version}";
hash = "sha256-q82u3/pcP5T++TMdDmaeDKYuCyky1Bo5BjHY1/NVHbY="; hash = "sha256-zi+5G05aakh8GBdfHL1qcNo/15VEm5mXtHGgKMAyp1U=";
}; };
cargoHash = "sha256-wKTaskKRyPfzKSLxhfyn6DybmUVFMHV5MrixKUBhno4="; cargoHash = "sha256-SEdr9nW5nBm1g6fjC5fZhqPbHQ7H6Kk0RL1V6OEQRdA=";
nativeBuildInputs = old.nativeBuildInputs; nativeBuildInputs = old.nativeBuildInputs;
buildInputs = old.buildInputs ++ [ final.libdbusmenu-gtk3 ]; buildInputs = old.buildInputs ++ [ final.libdbusmenu-gtk3 ];

View File

@@ -1,10 +1,10 @@
{ final, prev, ... }: { final, prev, ... }:
prev.openttd-jgrpp.overrideAttrs (old: rec { prev.openttd-jgrpp.overrideAttrs (old: rec {
version = "0.55.3"; version = "0.65.3";
src = prev.fetchFromGitHub rec { src = prev.fetchFromGitHub rec {
owner = "JGRennison"; owner = "JGRennison";
repo = "OpenTTD-patches"; repo = "OpenTTD-patches";
rev = "jgrpp-${version}"; rev = "jgrpp-${version}";
hash = "sha256-E1+pXpXNHOu9nPTGSY8baVaKf1Um6IGDjpi1MmENez8="; hash = "sha256-lmDkYrk7qjUSTtCQQCN/pbuLDt3+2RI1K8A1H1GJRjw=";
}; };
}) })