mirror of
https://forge.katzen.cafe/schrottkatze/nix-configs.git
synced 2025-11-17 09:09:42 +01:00
Compare commits
4 commits
5521d3f479
...
4b9a8323e9
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4b9a8323e9 |
||
|
|
cc43283675 |
||
|
|
e61519b3c1 |
||
|
|
fa9a5caea6 |
9 changed files with 50 additions and 48 deletions
52
flake.lock
generated
52
flake.lock
generated
|
|
@ -2,11 +2,11 @@
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"crane": {
|
"crane": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1734808813,
|
"lastModified": 1736566337,
|
||||||
"narHash": "sha256-3aH/0Y6ajIlfy7j52FGZ+s4icVX0oHhqBzRdlOeztqg=",
|
"narHash": "sha256-SC0eDcZPqISVt6R0UfGPyQLrI0+BppjjtQ3wcSlk0oI=",
|
||||||
"owner": "ipetkov",
|
"owner": "ipetkov",
|
||||||
"repo": "crane",
|
"repo": "crane",
|
||||||
"rev": "72e2d02dbac80c8c86bf6bf3e785536acf8ee926",
|
"rev": "9172acc1ee6c7e1cbafc3044ff850c568c75a5a3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -23,11 +23,11 @@
|
||||||
"rust-analyzer-src": "rust-analyzer-src"
|
"rust-analyzer-src": "rust-analyzer-src"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1735626869,
|
"lastModified": 1736577158,
|
||||||
"narHash": "sha256-hWGkpAWB59YWAOtBC6AE3DDnhMrBaqtiOaw1g+/mdLU=",
|
"narHash": "sha256-ngnAENZ+vmzOFgnj0EDtHj22nuH7MQB+EqzUmdbvaqA=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "fenix",
|
"repo": "fenix",
|
||||||
"rev": "120e688c881f2233f053dca5a5ddb8945d8ca5d7",
|
"rev": "05dcdb02ea657f81b13d99bd0ca36b09d25f4c43",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -99,11 +99,11 @@
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1735674113,
|
"lastModified": 1736602937,
|
||||||
"narHash": "sha256-X2+0+s6qNxrD+ySlD15jr5H314jOKMKJHBzbtNw1cBk=",
|
"narHash": "sha256-KVw1PMrxlC1m+FT99BQxOO2nG2zQ5xDCoDgH7u3kO8A=",
|
||||||
"owner": "helix-editor",
|
"owner": "helix-editor",
|
||||||
"repo": "helix",
|
"repo": "helix",
|
||||||
"rev": "b1759f998d527b7014b6be1eb26a518e1b5927c4",
|
"rev": "b26903cd13fdf8976bda43abbc5e85a50130d12f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -119,11 +119,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1735381016,
|
"lastModified": 1736508663,
|
||||||
"narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=",
|
"narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2",
|
"rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -172,7 +172,7 @@
|
||||||
"mac-brcm-fw": {
|
"mac-brcm-fw": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1735699162,
|
"lastModified": 1727366922,
|
||||||
"narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=",
|
"narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=",
|
||||||
"path": "/home/jade/nix-configs/mac-brcm-fw",
|
"path": "/home/jade/nix-configs/mac-brcm-fw",
|
||||||
"type": "path"
|
"type": "path"
|
||||||
|
|
@ -200,11 +200,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1735471104,
|
"lastModified": 1736344531,
|
||||||
"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
|
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
|
"rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -215,26 +215,26 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1735563628,
|
"lastModified": 1736200483,
|
||||||
"narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
|
"narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
|
"rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"id": "nixpkgs",
|
"id": "nixpkgs",
|
||||||
"ref": "nixos-24.05",
|
"ref": "nixos-24.11",
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable-small": {
|
"nixpkgs-unstable-small": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1735667141,
|
"lastModified": 1736603572,
|
||||||
"narHash": "sha256-OdxSR4u4QQ/cnBWJBdbg9gMHQkJ2AQaOFif9965iciE=",
|
"narHash": "sha256-yOZxepSF/z6ZDAOlJ3VZRIGOKfroa6CmOm2x6ud8S3s=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ffd125e27fecc4e5b935413276143a97449fcfd8",
|
"rev": "376250fab39653e93864b4dfd9ab161751fbe430",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -260,11 +260,11 @@
|
||||||
"rust-analyzer-src": {
|
"rust-analyzer-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1735570005,
|
"lastModified": 1736517563,
|
||||||
"narHash": "sha256-ekN1mLeHM9upiAXykoNm646ctsm0qcS8+G2SjGtXp5k=",
|
"narHash": "sha256-YJ5ajpMsyXITc91ZfnI0Mdocd+tmCFkZ3BLozUkB44M=",
|
||||||
"owner": "rust-lang",
|
"owner": "rust-lang",
|
||||||
"repo": "rust-analyzer",
|
"repo": "rust-analyzer",
|
||||||
"rev": "1c6b83852b0d3bc129a3558386663373f126337e",
|
"rev": "4f35021ca9a8e7f9ed4344139b9eaf770a2e5725",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "nixpkgs/nixos-unstable";
|
nixpkgs.url = "nixpkgs/nixos-unstable";
|
||||||
nixpkgs-stable.url = "nixpkgs/nixos-24.05";
|
nixpkgs-stable.url = "nixpkgs/nixos-24.11";
|
||||||
nixpkgs-unstable-small.url = "nixpkgs/nixos-unstable-small";
|
nixpkgs-unstable-small.url = "nixpkgs/nixos-unstable-small";
|
||||||
helix-inline-diags = {
|
helix-inline-diags = {
|
||||||
url = "github:helix-editor/helix";
|
url = "github:helix-editor/helix";
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,11 @@
|
||||||
# Edit this configuration file to define what should be installed on
|
# Edit this configuration file to define what should be installed on
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
# your system. Help is available in the configuration.nix(5) man page
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||||
{pkgs, ...}: {
|
{
|
||||||
|
pkgs,
|
||||||
|
pkgs-stable,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
../../common.nix
|
../../common.nix
|
||||||
|
|
@ -34,8 +38,6 @@
|
||||||
|
|
||||||
networking.hostName = "monosodium-glutamate-g";
|
networking.hostName = "monosodium-glutamate-g";
|
||||||
services = {
|
services = {
|
||||||
# monitor control
|
|
||||||
ddccontrol.enable = true;
|
|
||||||
xserver = {
|
xserver = {
|
||||||
layout = "us";
|
layout = "us";
|
||||||
xkbVariant = "altgr-intl";
|
xkbVariant = "altgr-intl";
|
||||||
|
|
|
||||||
|
|
@ -15,9 +15,7 @@
|
||||||
volumeicon
|
volumeicon
|
||||||
playerctl
|
playerctl
|
||||||
|
|
||||||
pulseaudioFull
|
|
||||||
helvum
|
helvum
|
||||||
];
|
];
|
||||||
hardware.pulseaudio.enable = pkgs.lib.mkForce false;
|
|
||||||
# sound.mediaKeys.enable = true;
|
# sound.mediaKeys.enable = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -40,11 +40,7 @@ def get_bat_charging_status [
|
||||||
] {
|
] {
|
||||||
let status = open $"/sys/class/power_supply/($path)/status";
|
let status = open $"/sys/class/power_supply/($path)/status";
|
||||||
|
|
||||||
if ($status == Charging) {
|
$status like Charging
|
||||||
true
|
|
||||||
} else {
|
|
||||||
false
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
def get_bat_icon [
|
def get_bat_icon [
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,10 @@
|
||||||
gimp
|
gimp
|
||||||
inkscape-with-extensions
|
inkscape-with-extensions
|
||||||
obs-studio
|
obs-studio
|
||||||
kdenlive
|
kdePackages.kdenlive
|
||||||
|
glaxnimate
|
||||||
|
|
||||||
|
pixelorama
|
||||||
|
|
||||||
scribus
|
scribus
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,7 @@
|
||||||
"return-youtube-dislikes"
|
"return-youtube-dislikes"
|
||||||
"multi-account-containers"
|
"multi-account-containers"
|
||||||
"tabby-cat-friend"
|
"tabby-cat-friend"
|
||||||
|
"indie-wiki-buddy"
|
||||||
];
|
];
|
||||||
Extensions.Uninstall = [
|
Extensions.Uninstall = [
|
||||||
"google@search.mozilla.org"
|
"google@search.mozilla.org"
|
||||||
|
|
|
||||||
|
|
@ -31,15 +31,15 @@
|
||||||
bufferline = "multiple";
|
bufferline = "multiple";
|
||||||
color-modes = true;
|
color-modes = true;
|
||||||
cursorline = true;
|
cursorline = true;
|
||||||
auto-save = {
|
# auto-save = {
|
||||||
focus-lost = true;
|
# focus-lost = true;
|
||||||
after-delay.enable = true;
|
# after-delay.enable = true;
|
||||||
after-delay.timeout = 10000;
|
# after-delay.timeout = 10000;
|
||||||
};
|
# };
|
||||||
auto-format = true;
|
auto-format = true;
|
||||||
end-of-line-diagnostics = "hint";
|
end-of-line-diagnostics = "hint";
|
||||||
# slightly optimized based on my layout
|
# slightly optimized based on my layout
|
||||||
jump-label-alphabet = "jfkdaslghwenuiopbcmyzqrtvx";
|
jump-label-alphabet = "jfkdhaslgwenuiopbcmyzqrtvx";
|
||||||
clipboard-provider = "wayland";
|
clipboard-provider = "wayland";
|
||||||
inline-diagnostics = {
|
inline-diagnostics = {
|
||||||
cursor-line = "hint";
|
cursor-line = "hint";
|
||||||
|
|
@ -75,20 +75,19 @@
|
||||||
indent-guides = {
|
indent-guides = {
|
||||||
render = true;
|
render = true;
|
||||||
character = "│";
|
character = "│";
|
||||||
skip-levels = 2;
|
skip-levels = 3;
|
||||||
};
|
};
|
||||||
soft-wrap = {
|
soft-wrap = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
whitespace = {
|
whitespace = {
|
||||||
render = {
|
render = {
|
||||||
space = "all";
|
space = "none";
|
||||||
tab = "all";
|
tab = "all";
|
||||||
newline = "none";
|
newline = "none";
|
||||||
};
|
};
|
||||||
characters = {
|
characters = {
|
||||||
space = "·";
|
nbsp = "·";
|
||||||
nbsp = "⍽";
|
|
||||||
tab = "→";
|
tab = "→";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -32,3 +32,6 @@ alias guni = cd ~/Docs/uni/info1;
|
||||||
alias gunids = cd ~/Docs/uni/design;
|
alias gunids = cd ~/Docs/uni/design;
|
||||||
alias gunida = cd ~/Docs/uni/dramaturgie;
|
alias gunida = cd ~/Docs/uni/dramaturgie;
|
||||||
alias gunm = cd ~/Docs/uni/mathe1-3;
|
alias gunm = cd ~/Docs/uni/mathe1-3;
|
||||||
|
|
||||||
|
# typos
|
||||||
|
alias juts = just;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue