mirror of
https://forge.katzen.cafe/schrottkatze/nix-configs.git
synced 2024-12-05 02:38:44 +01:00
Compare commits
No commits in common. "9657b8771f90c394c55966462e09f7161f91aeea" and "efcf81af5f9bb68dc3648afa3ab6fd790336e4b2" have entirely different histories.
9657b8771f
...
efcf81af5f
|
|
@ -60,11 +60,6 @@ with builtins; {
|
|||
btop
|
||||
nodejs
|
||||
|
||||
cmatrix
|
||||
sl
|
||||
lolcat
|
||||
cool-retro-term
|
||||
|
||||
maven
|
||||
jetbrains.idea-ultimate
|
||||
jetbrains.rust-rover
|
||||
|
|
|
|||
74
flake.lock
74
flake.lock
|
|
@ -2,11 +2,11 @@
|
|||
"nodes": {
|
||||
"crane": {
|
||||
"locked": {
|
||||
"lastModified": 1732407143,
|
||||
"narHash": "sha256-qJOGDT6PACoX+GbNH2PPx2ievlmtT1NVeTB80EkRLys=",
|
||||
"lastModified": 1731098351,
|
||||
"narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "f2b4b472983817021d9ffb60838b2b36b9376b20",
|
||||
"rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -23,11 +23,11 @@
|
|||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732689334,
|
||||
"narHash": "sha256-yKI1KiZ0+bvDvfPTQ1ZT3oP/nIu3jPYm4dnbRd6hYg4=",
|
||||
"lastModified": 1731133750,
|
||||
"narHash": "sha256-gZ3m8e176ai+akwiayg7Mve73rcUCD0+l6OMMFhGEYI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "a8a983027ca02b363dfc82fbe3f7d9548a8d3dce",
|
||||
"rev": "87e4581cdfecbac602220fe76c67b37d2d1ee995",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -59,11 +59,11 @@
|
|||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"lastModified": 1726560853,
|
||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -99,11 +99,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732735497,
|
||||
"narHash": "sha256-qaiRKT4T+kRAMwfFf1fIJ5pwCcaLp2dfNpT65C4uWuE=",
|
||||
"lastModified": 1730790589,
|
||||
"narHash": "sha256-xJ6bQ4VmdTB7A+dMbmOMaZ8a6erB6rkZkB+yzqD7gd4=",
|
||||
"owner": "helix-editor",
|
||||
"repo": "helix",
|
||||
"rev": "e1d1a5c5a12127ded88dfcf66dd74aad1650977c",
|
||||
"rev": "b53dafe326d51b7f64a1c52379e3d4150cd2991e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -119,11 +119,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732793095,
|
||||
"narHash": "sha256-6TrknJ8CpvSSF4gviQSeD+wyj3siRcMvdBKhOXkEMKU=",
|
||||
"lastModified": 1730837930,
|
||||
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "2f7739d01080feb4549524e8f6927669b61c6ee3",
|
||||
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -135,11 +135,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1731683711,
|
||||
"narHash": "sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE=",
|
||||
"rev": "c859d03013712b349d82ee6223948d6d03e63a8d",
|
||||
"lastModified": 1731164513,
|
||||
"narHash": "sha256-WnT6MpgrMKgqV2Rs+MfU88+KO+/njELPOtGoNhoX2oA=",
|
||||
"rev": "b967f1d5fe9d1bf58e6159e9b426c5b341489397",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c859d03013712b349d82ee6223948d6d03e63a8d.tar.gz?rev=c859d03013712b349d82ee6223948d6d03e63a8d"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/b967f1d5fe9d1bf58e6159e9b426c5b341489397.tar.gz?rev=b967f1d5fe9d1bf58e6159e9b426c5b341489397"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
|
@ -156,11 +156,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732603698,
|
||||
"narHash": "sha256-Jw2MhzgCCrKV2MJytehG0cCLIAosBX71p8qmQ6XQlR4=",
|
||||
"lastModified": 1731185731,
|
||||
"narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "15b999f9c958c475f71fb8c543b9fc2f36ae8730",
|
||||
"revCount": 123,
|
||||
"rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34",
|
||||
"revCount": 117,
|
||||
"type": "git",
|
||||
"url": "https://git.lix.systems/lix-project/nixos-module"
|
||||
},
|
||||
|
|
@ -172,7 +172,7 @@
|
|||
"mac-brcm-fw": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1709065070,
|
||||
"lastModified": 1727366922,
|
||||
"narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=",
|
||||
"path": "/home/jade/nix-configs/mac-brcm-fw",
|
||||
"type": "path"
|
||||
|
|
@ -200,11 +200,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1732521221,
|
||||
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
|
||||
"lastModified": 1730785428,
|
||||
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
|
||||
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -215,26 +215,26 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1732749044,
|
||||
"narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=",
|
||||
"lastModified": 1720535198,
|
||||
"narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685",
|
||||
"rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-24.05",
|
||||
"ref": "nixos-23.11",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable-small": {
|
||||
"locked": {
|
||||
"lastModified": 1732780316,
|
||||
"narHash": "sha256-NskLIz0ue4Uqbza+1+8UGHuPVr8DrUiLfZu5VS4VQxw=",
|
||||
"lastModified": 1731136819,
|
||||
"narHash": "sha256-qGmBFnq3/9AiiLZUOVxDsU5j6ysL3PXA8KRp7muJWMs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "226216574ada4c3ecefcbbec41f39ce4655f78ef",
|
||||
"rev": "4a2c7def574d031cbf3d7110969f2ca5f38f8ed7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -260,11 +260,11 @@
|
|||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1732633904,
|
||||
"narHash": "sha256-7VKcoLug9nbAN2txqVksWHHJplqK9Ou8dXjIZAIYSGc=",
|
||||
"lastModified": 1731056261,
|
||||
"narHash": "sha256-TPeXChHVcaCBAoE349K7OZH4We5/2ys1GgG4IiwjwOs=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "8d5e91c94f80c257ce6dbdfba7bd63a5e8a03fa6",
|
||||
"rev": "dd9cd22514cb1001a0a2374b36a85eb75245f27b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
inputs = {
|
||||
nixpkgs.url = "nixpkgs/nixos-unstable";
|
||||
nixpkgs-stable.url = "nixpkgs/nixos-24.05";
|
||||
nixpkgs-stable.url = "nixpkgs/nixos-23.11";
|
||||
nixpkgs-unstable-small.url = "nixpkgs/nixos-unstable-small";
|
||||
helix-inline-diags = {
|
||||
url = "github:helix-editor/helix";
|
||||
|
|
@ -117,13 +117,13 @@
|
|||
}
|
||||
];
|
||||
};
|
||||
denkbrett = nixpkgs.lib.nixosSystem {
|
||||
catbook-j = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {
|
||||
inherit inputs pkgs-unstable-small pkgs-stable rs-programs lix-module helix-inline-diags;
|
||||
};
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
./hosts/denkbrett/configuration.nix
|
||||
./hosts/catbook-j/configuration.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@
|
|||
|
||||
# networking
|
||||
networking.networkmanager.enable = true;
|
||||
networking.hostName = "denkbrett";
|
||||
networking.hostName = "catbook-j";
|
||||
|
||||
i18n.extraLocaleSettings = {
|
||||
LC_ADDRESS = "de_DE.UTF-8";
|
||||
3
justfile
3
justfile
|
|
@ -6,9 +6,6 @@ test:
|
|||
build:
|
||||
sudo nixos-rebuild switch --flake . --impure --fast --log-format multiline
|
||||
|
||||
tbuild:
|
||||
sudo nixos-rebuild switch --flake . --impure --fast --log-format multiline-with-logs --show-trace
|
||||
|
||||
update:
|
||||
nix flake update --commit-lock-file --log-format multiline
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
./flatpak.nix
|
||||
./home
|
||||
./dm.nix
|
||||
./tlp.nix
|
||||
];
|
||||
services.upower = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
./notifications.nix
|
||||
./terminal.nix
|
||||
./compositing.nix
|
||||
./typst.nix
|
||||
./panels
|
||||
./xmonad
|
||||
./sway
|
||||
|
|
|
|||
|
|
@ -3,32 +3,10 @@
|
|||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
# stolen: https://github.com/MultisampledNight/core/blob/678f176cb24f5dc4b5dc629cfd3e643487be01bb/system/packages/layaway/default.nix#L7-L25
|
||||
layaway = pkgs.rustPlatform.buildRustPackage rec {
|
||||
pname = "layaway";
|
||||
version = "0.2.0";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "MultisampledNight";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SzAuVFEy56svasO3+1p6ysBRrIQd0UZX++/P4ZuwWm0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-liWP6AI72xG1O+MbCZ0cjJ2llHj/iv3hR/U3BLv5fKA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Layout creation for Sway via a relative and human-readable DSL.";
|
||||
homepage = "https://github.com/MultisampledNight/layaway";
|
||||
maintainers = [maintainers.multisn8];
|
||||
};
|
||||
};
|
||||
in {
|
||||
}: {
|
||||
programs.wofi.enable = true;
|
||||
programs.swaylock.enable = true;
|
||||
services.network-manager-applet.enable = true;
|
||||
home.packages = [layaway];
|
||||
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
packages = {
|
||||
typst-configs = pkgs.fetchFromGitea {
|
||||
domain = "forge.katzen.cafe";
|
||||
owner = "schrottkatze";
|
||||
repo = "typst-configs";
|
||||
rev = "3a09cd374f0508c8e0c5d95f5ad7358adc50bafa";
|
||||
};
|
||||
flow = pkgs.fetchFromGithub {
|
||||
owner = "MultisampledNight";
|
||||
repo = "flow";
|
||||
rev = "f5c653c706d80145165ec684b217b803a0246e8c";
|
||||
};
|
||||
};
|
||||
mkTypstPath = name: ".local/share/typst/packages/local/${name}/0.1.0";
|
||||
in {
|
||||
home.file = {
|
||||
typst-configs = {
|
||||
target = mkTypstPath "typst-configs";
|
||||
source = packages.typst-configs;
|
||||
recursive = true;
|
||||
};
|
||||
flow = {
|
||||
target = mkTypstPath "flow";
|
||||
source = packages.flow;
|
||||
recursive = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
{...}: {
|
||||
services.tlp = {
|
||||
enable = true;
|
||||
settings = {
|
||||
START_CHARGE_THRESH_BAT0 = "70";
|
||||
STOP_CHARGE_TRESH_BAT0 = "85";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -65,6 +65,7 @@ in
|
|||
};
|
||||
services.smartd = {
|
||||
enable = true;
|
||||
notifications.x11.enable = true;
|
||||
notifications.test = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -204,6 +204,7 @@
|
|||
"devtools.toolbox.host" = "right";
|
||||
"devtools.theme" = "dark";
|
||||
"webgl.disabled" = false;
|
||||
"image.jxl.enabled" = true;
|
||||
"browser.urlbar.decodeURLsOnCopy" = true;
|
||||
"browser.urlbar.unitConversion.enabled" = true;
|
||||
"browser.urlbar.suggest.calculator" = true;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{pkgs, ...}: {
|
||||
fonts.packages = with pkgs; [
|
||||
(nerdfonts.override {fonts = ["FiraCode" "AnonymousPro"];})
|
||||
google-fonts
|
||||
montserrat
|
||||
noto-fonts
|
||||
atkinson-hyperlegible
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
s = "status";
|
||||
};
|
||||
signing = {
|
||||
key = "${pkgs.writeText "blue_nk3.pub" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILg7hhAKxIAbokHHcIj9HBgbkgoKGCG2R+gx7HZKL+iz cardno:000F_93C6A612"}";
|
||||
key = "${pkgs.writeText "red_nk3.pub" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOaE8TFsIazpn4OnHvHcRpOFr9FfvMaWOiEjmHsmnAoE cardno:000F_70CD7D05"}";
|
||||
signByDefault = true;
|
||||
};
|
||||
extraConfig = {
|
||||
|
|
|
|||
|
|
@ -232,7 +232,7 @@ $env.config = {
|
|||
}
|
||||
|
||||
color_config: $dark_theme # if you want a more interesting theme, you can replace the empty record with `$dark_theme`, `$light_theme` or another custom record
|
||||
footer_mode: 25 # always, never, number_of_rows, auto
|
||||
footer_mode: "25" # always, never, number_of_rows, auto
|
||||
float_precision: 2 # the precision for displaying floats in tables
|
||||
buffer_editor: "" # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.EDITOR and $env.VISUAL
|
||||
use_ansi_coloring: true
|
||||
|
|
@ -882,17 +882,6 @@ def nev [ unit = day ] {
|
|||
| format duration $unit
|
||||
}
|
||||
|
||||
# TODO: intermediate stations
|
||||
def bx [from: string to: string] {
|
||||
let map = open ~/Docs/ril100map.json;
|
||||
let start = $map | get ($from | str upcase) | first;
|
||||
let dest = $map | get ($to | str upcase) | first;
|
||||
|
||||
let url = $"https://bahn.expert/routing/($start)/($dest)/0/";
|
||||
print $url;
|
||||
^bash -c $"nohup chromium '($url)' &";
|
||||
}
|
||||
|
||||
alias gnix = cd ~/nix-configs;
|
||||
alias grepo = cd ~/Documents/repos;
|
||||
alias wh = wormhole-rs;
|
||||
|
|
@ -918,5 +907,3 @@ alias bash = echo $"(ansi red)no, fuck that shit!";
|
|||
alias sh = echo $"(ansi red)no, fuck that shit!";
|
||||
alias zsh = echo $"(ansi red)no, fuck that shit!";
|
||||
alias fish = echo $"(ansi red)no, fuck that shit!";
|
||||
|
||||
alias px = pulsemixer;
|
||||
|
|
|
|||
|
|
@ -17,10 +17,12 @@ pub fn list_entries(path: PathBuf) -> io::Result<()> {
|
|||
let l = format!(" {} ", crate::utils::format_datetime(entry.timestamp));
|
||||
|
||||
let fuck_you_debugging = cols as usize - (n.len() + r.chars().count() + l.len());
|
||||
dbg!(fuck_you_debugging);
|
||||
let padding = " ".repeat(fuck_you_debugging);
|
||||
|
||||
println!("{}{r}{padding}{}", n.cyan(), l.white())
|
||||
}
|
||||
println!("d");
|
||||
Ok(())
|
||||
} else {
|
||||
eprintln!("Parsing error...");
|
||||
|
|
|
|||
Loading…
Reference in a new issue