Compare commits

..

10 Commits

Author SHA1 Message Date
edb6e6fac1 Added qutebrowser 2026-02-22 11:14:47 +02:00
c06ca8a6cd Removed Yggdrasil from puter 2026-02-17 16:53:26 +02:00
469d8d7fce remove post-install weathr 2026-02-17 13:00:29 +02:00
da935b4ccf Removed gaming shit 2026-02-17 12:41:03 +02:00
b68ff35b8e Weathr made thinner 2026-02-17 11:26:08 +02:00
6fcc233103 Corrected weathr call, made weathr smaller, update 2026-02-17 11:24:58 +02:00
3c2fe7775b Added weathr app support + added to utils 2026-02-17 11:20:57 +02:00
c40a2ac98b Removed experimental boot entry; using native boot instead 2026-02-07 18:08:38 +02:00
7286a6e6c1 Removed facetimehd since doesnt build 2026-02-07 17:52:47 +02:00
62b27043f1 Essentially more sw + GRUB live usb trial
Installed and configured Yggdrasil; ported rustnet and install; GRUB
trial of USB Live stick
2026-02-07 17:40:21 +02:00
9 changed files with 60 additions and 23 deletions

6
flake.lock generated
View File

@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1769170682,
"narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
"lastModified": 1771008912,
"narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c5296fdd05cfa2c187990dd909864da9658df755",
"rev": "a82ccc39b39b621151d6732718e3e250109076fa",
"type": "github"
},
"original": {

View File

@@ -2,8 +2,7 @@
config,
pkgs,
...
}:
{
}: {
imports = [
./hardware-configuration.nix
./syncthing.nix
@@ -17,16 +16,16 @@
../../modules/de/gnome.nix
../../modules/common/pipewire.nix
../../modules/userapps/kondo_timer.nix
../../modules/userapps/gaming.nix
#../../modules/userapps/gaming.nix
../../modules/common/nix.nix
../../modules/common/networking.nix
../../modules/common/shell.nix
../../modules/common/security.nix
../../modules/common/wine.nix
#../../modules/common/wine.nix
../../modules/common/libvirt.nix
../../modules/common/keyd.nix
../../modules/common/unbound-cloud.nix
../../modules/common/yggdrasil.nix
#../../modules/common/yggdrasil.nix
];
networking.hostName = "puter";
# This will be overridden by system/default.nix

View File

@@ -61,10 +61,11 @@
environment.sessionVariables = {LIBVA_DRIVER_NAME = "i965";};
hardware.facetimehd = {
enable = true;
withCalibration = true;
};
# seems to be EOL "NixOS has built-in facetimehd support starting 16.03."
#hardware.facetimehd = {
# enable = true;
# withCalibration = true;
#};
#services.logind = {
# lidSwitch = "ignore";

View File

@@ -2,8 +2,7 @@
config,
pkgs,
...
}:
{
}: {
nixpkgs.config.permittedInsecurePackages = [
"qtwebengine-5.15.19"
"electron-36.9.5"

View File

@@ -1,5 +1,4 @@
{pkgs ? import <nixpkgs> {}}:
pkgs.stdenv.mkDerivation rec {
pname = "rustnet";
version = "0.18.0";

39
modules/common/weathr.nix Normal file
View File

@@ -0,0 +1,39 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
}:
rustPlatform.buildRustPackage rec {
pname = "weathr";
version = "1.3.0"; # Use the latest version from the repository
src = fetchFromGitHub {
owner = "veirt";
repo = "weathr";
rev = "v${version}"; # Tags are in the format "v1.3.0"
hash = "sha256-JwI5a+O5Nu39Nr0st5yBLTM5kPLC8UIGAoBMqxnOOl4="; # Replace with the actual hash after the first build attempt
};
# Use this for the initial build to let Nix tell you the correct hash
cargoHash = "sha256-Yj1WxpOLL8GiVpCebPZQgdw+L9g+4CNY7n2z8PJQz4k=";
nativeBuildInputs = [
pkg-config
];
doCheck = false;
#postInstall = ''
#'';
meta = with lib; {
description = "A terminal weather app with ASCII animations driven by real-time weather data";
homepage = "https://github.com/veirt/weathr";
#changelog = "https://github.com/veirt/weathr/blob/v${version}/CHANGELOG.md"; # Check if a CHANGELOG.md exists
license = licenses.gpl3Only;
# maintainers = with maintainers; [ ]; # Add your handle if you plan to upstream
mainProgram = "weathr";
};
}

View File

@@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
services.yggdrasil = {
enable = true;
persistentKeys = false;

View File

@@ -12,6 +12,7 @@
ungoogled-chromium
tor-browser
librewolf
qutebrowser
transmission_4-gtk
bitwarden-desktop
];

View File

@@ -2,11 +2,10 @@
config,
pkgs,
...
}:
let
}: let
rustnet = pkgs.callPackage ../../modules/common/rustnet.nix {};
in
{
weathr = pkgs.callPackage ../common/weathr.nix {};
in {
programs.neovim = {defaultEditor = true;};
environment.systemPackages = with pkgs; [
parallel-disk-usage
@@ -32,5 +31,6 @@ in
nh
tty-clock
rustnet
weathr
];
}