Compare commits

..

8 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
6 changed files with 48 additions and 13 deletions

6
flake.lock generated
View File

@@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1770197578, "lastModified": 1771008912,
"narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -16,16 +16,16 @@
../../modules/de/gnome.nix ../../modules/de/gnome.nix
../../modules/common/pipewire.nix ../../modules/common/pipewire.nix
../../modules/userapps/kondo_timer.nix ../../modules/userapps/kondo_timer.nix
../../modules/userapps/gaming.nix #../../modules/userapps/gaming.nix
../../modules/common/nix.nix ../../modules/common/nix.nix
../../modules/common/networking.nix ../../modules/common/networking.nix
../../modules/common/shell.nix ../../modules/common/shell.nix
../../modules/common/security.nix ../../modules/common/security.nix
../../modules/common/wine.nix #../../modules/common/wine.nix
../../modules/common/libvirt.nix ../../modules/common/libvirt.nix
../../modules/common/keyd.nix ../../modules/common/keyd.nix
../../modules/common/unbound-cloud.nix ../../modules/common/unbound-cloud.nix
../../modules/common/yggdrasil.nix #../../modules/common/yggdrasil.nix
]; ];
networking.hostName = "puter"; networking.hostName = "puter";
# This will be overridden by system/default.nix # This will be overridden by system/default.nix

View File

@@ -42,13 +42,6 @@
lib.mkDefault config.hardware.enableRedistributableFirmware; lib.mkDefault config.hardware.enableRedistributableFirmware;
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.systemd-boot.extraEntries = {
"usb-live.conf" = "
title USB Live Boot
efi /EFI/boot/bootx64.efi
options root=/dev/sdb2
";
};
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.initrd.luks.devices."luks-d27fc6c5-7edd-4c18-ab70-3ca02a28abcc".device = "/dev/disk/by-uuid/d27fc6c5-7edd-4c18-ab70-3ca02a28abcc"; boot.initrd.luks.devices."luks-d27fc6c5-7edd-4c18-ab70-3ca02a28abcc".device = "/dev/disk/by-uuid/d27fc6c5-7edd-4c18-ab70-3ca02a28abcc";

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

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

View File

@@ -4,6 +4,7 @@
... ...
}: let }: let
rustnet = pkgs.callPackage ../../modules/common/rustnet.nix {}; rustnet = pkgs.callPackage ../../modules/common/rustnet.nix {};
weathr = pkgs.callPackage ../common/weathr.nix {};
in { in {
programs.neovim = {defaultEditor = true;}; programs.neovim = {defaultEditor = true;};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@@ -30,5 +31,6 @@ in {
nh nh
tty-clock tty-clock
rustnet rustnet
weathr
]; ];
} }