schrottkatze/nix-configs
1
2
Fork 0
Code Issues Pull requests Activity

Compare commits

base: schrottkatze:06117eee83b497a01e650ef980b53a4ac19c7ac5
Branches Tags
schrottkatze:main
schrottkatze:push-pqvqptxrrmyk
..
compare: schrottkatze:4a3848ec5a5e2c8591479e405c249a8494f8bcf8
Branches Tags
schrottkatze:main
schrottkatze:push-pqvqptxrrmyk

No commits in common. "06117eee83b497a01e650ef980b53a4ac19c7ac5" and "4a3848ec5a5e2c8591479e405c249a8494f8bcf8" have entirely different histories.
06117eee83 ... 4a3848ec5a

11 changed files with 74 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -689,9 +689,9 @@ dependencies = [
[[package]]
name = "niri-ipc"
version = "25.5.1"
version = "25.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc3e165f7854b2f83054a2e8f7024baa49666ad25cdb95b8fb9fd17c48045605"
checksum = "01515d0a7e73f1f3bd0347100542c4c3f6ebc280688add12e7ed2af4c35af4fb"
dependencies = [
"serde",
"serde_json",

116
flake.lock generated
View file

@ -69,11 +69,11 @@
},
"crane": {
"locked": {
"lastModified": 1750266157,
"narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=",
"lastModified": 1748970125,
"narHash": "sha256-UDyigbDGv8fvs9aS95yzFfOKkEjx1LO3PL3DsKopohA=",
"owner": "ipetkov",
"repo": "crane",
"rev": "e37c943371b73ed87faf33f7583860f81f1d5a48",
"rev": "323b5746d89e04b22554b061522dfce9e4c49b18",
"type": "github"
},
"original": {
@ -105,11 +105,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1750747360,
"narHash": "sha256-0JEUva5TOJMLDHTUMY4uHQTqEC+esw5n61CfCilOynE=",
"lastModified": 1750142293,
"narHash": "sha256-D2IwLkYYgsaXu8asJdGoNGhYkRgmW7fvxi4BmVUrkys=",
"owner": "nix-community",
"repo": "fenix",
"rev": "1390245c00b82dc83e057701c8d01657c5077279",
"rev": "a266cb2d1beda20f750fc8e484e57224c8671926",
"type": "github"
},
"original": {
@ -363,11 +363,11 @@
]
},
"locked": {
"lastModified": 1750730235,
"narHash": "sha256-rZErlxiV7ssvI8t7sPrKU+fRigNc2KvoKZG3gtUtK50=",
"lastModified": 1750127463,
"narHash": "sha256-K2xFtlD3PcKAZriOE3LaBLYmVfGQu+rIF4Jr1RFYR0Q=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d07e9cceb4994ed64a22b9b36f8b76923e87ac38",
"rev": "28eef8722d1af18ca13e687dbf485e1c653a0402",
"type": "github"
},
"original": {
@ -400,15 +400,15 @@
"lix": {
"flake": false,
"locked": {
"lastModified": 1746827285,
"narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=",
"rev": "47aad376c87e2e65967f17099277428e4b3f8e5a",
"lastModified": 1746827286,
"narHash": "sha256-qCRBy8Bbh5XhPalPkhonxNgfsbw3lP0UIXBLSrhxAvI=",
"rev": "dcb0a97000d50b2868ed4f8d9fd465c5a5b8eb3a",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a"
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/dcb0a97000d50b2868ed4f8d9fd465c5a5b8eb3a.tar.gz?rev=dcb0a97000d50b2868ed4f8d9fd465c5a5b8eb3a"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz"
"url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
}
},
"lix-module": {
@ -421,15 +421,17 @@
]
},
"locked": {
"lastModified": 1746838955,
"narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=",
"rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc"
"lastModified": 1747667424,
"narHash": "sha256-7EICjbmG6lApWKhFtwvZovdcdORY1CEe6/K7JwtpYfs=",
"ref": "refs/heads/main",
"rev": "3c23c6ae2aecc1f76ae7993efe1a78b5316f0700",
"revCount": 144,
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
}
},
"niri": {
@ -442,11 +444,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1750735687,
"narHash": "sha256-pscxcZpLGcEEJGVjFAM7X77cARABc7M+zVyUN6qsEmU=",
"lastModified": 1750146866,
"narHash": "sha256-Eu3/uTRnenjCJUY76T3zDWiUtIGG+RMQoDu1QdIU8AI=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "a581a91b7406a0b9039ef22e37e5166bd3b1a139",
"rev": "e2401ec11b2ed71337931aa1123faf469c4df327",
"type": "github"
},
"original": {
@ -475,11 +477,11 @@
"niri-unstable": {
"flake": false,
"locked": {
"lastModified": 1750684365,
"narHash": "sha256-BqtoSRCgmutJXnQFZs+KFMNvp3LuX6POIHjXIxWdlTE=",
"lastModified": 1750142220,
"narHash": "sha256-5gUJXh0/mm1YIsLhWgaGitUtGsQvrYRsT4zmGmRHn9M=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "4c02f3bba451747c3f337f4c131b0c7f9ef41bb7",
"rev": "e53f8527b0517cf965961ae729b7dd631ed76db5",
"type": "github"
},
"original": {
@ -495,11 +497,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1750728484,
"narHash": "sha256-DdVB1KLJNpzC1aYqpywAZn84PQ7hU2s5Llxpf/Nw7ls=",
"lastModified": 1750156995,
"narHash": "sha256-EPOixl8BVnBuR9jlzYiFP0blX/5Sm7ZguNGCSKJXSkQ=",
"owner": "kaylorben",
"repo": "nixcord",
"rev": "a4f3b2eae0efd7b8b1dcae8ef92dac5a6ce221a6",
"rev": "4a025970ae640ba2137e1b883697f9513f5125f0",
"type": "github"
},
"original": {
@ -510,11 +512,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1750431636,
"narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=",
"lastModified": 1750083401,
"narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712",
"rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad",
"type": "github"
},
"original": {
@ -524,11 +526,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1750506804,
"narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
"lastModified": 1749794982,
"narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4206c4cb56751df534751b058295ea61357bbbaa",
"rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
"type": "github"
},
"original": {
@ -567,11 +569,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1750622754,
"narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=",
"lastModified": 1750005367,
"narHash": "sha256-h/aac1dGLhS3qpaD2aZt25NdKY7b+JT0ZIP2WuGsJMU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1",
"rev": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3",
"type": "github"
},
"original": {
@ -583,11 +585,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1750646418,
"narHash": "sha256-4UAN+W0Lp4xnUiHYXUXAPX18t+bn6c4Btry2RqM9JHY=",
"lastModified": 1749995256,
"narHash": "sha256-LEGfcombb0otUf23oAmYCXR4+lMQKa49XmU0G5HItGI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1f426f65ac4e6bf808923eb6f8b8c2bfba3d18c5",
"rev": "daa45f10955cc2207ac9c5f0206774d2f757c162",
"type": "github"
},
"original": {
@ -598,11 +600,11 @@
},
"nixpkgs-unstable-small": {
"locked": {
"lastModified": 1750752886,
"narHash": "sha256-pP1ZBxEo44HbLDyXVPPK8BQO882eGKpW9zzXliGFA/8=",
"lastModified": 1750093821,
"narHash": "sha256-rumKjLR6VSoDG8eCiCLmwbuWDI+JnDzxaEWVF7F95OU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "83685a4ccd44d2d4c09f2e5f7773d2f3f2156121",
"rev": "526945c5798687e32d4a6f8a93660fe2ca152ae2",
"type": "github"
},
"original": {
@ -629,11 +631,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1750506804,
"narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
"lastModified": 1749794982,
"narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4206c4cb56751df534751b058295ea61357bbbaa",
"rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
"type": "github"
},
"original": {
@ -719,11 +721,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1750703256,
"narHash": "sha256-tTsX1kLWgeDtOSzahAW6WMkBY7ZjQeqdJ8pmqPyEGLo=",
"lastModified": 1750093996,
"narHash": "sha256-Nw/TcDo3OgsEgyZ651iCcTILGaQRxBfCdgI9pVOD6rk=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "96be3788a67552b6fde780061fac2889793eafe3",
"rev": "2c25e436c717d5f6b264dbb9b8f459d65384a253",
"type": "github"
},
"original": {
@ -784,11 +786,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1750688934,
"narHash": "sha256-nOWOzcB/U9QE8MZ5NV1eRwrsWnsqtcPA88v0SKwKmxA=",
"lastModified": 1750023464,
"narHash": "sha256-gBsstni5rgh1vt2SNThh51GNvxMDCjEBfpPksS0ig/c=",
"owner": "danth",
"repo": "stylix",
"rev": "67a6479c1aa95210a346a227743f074b82471432",
"rev": "a14e525723c1c837b2ceacd8a37cba1f0b5e76c2",
"type": "github"
},
"original": {
@ -988,11 +990,11 @@
"xwayland-satellite-unstable": {
"flake": false,
"locked": {
"lastModified": 1750686869,
"narHash": "sha256-FS/rYXd96VBtKNJRTV2xTpTk8CgrYP+lFsFj0+VKgoY=",
"lastModified": 1749315541,
"narHash": "sha256-bEik1BfVOFnWvtOrcOHluos/edJ8f+G2y1QySbt/0Ak=",
"owner": "Supreeeme",
"repo": "xwayland-satellite",
"rev": "117af56a83e2d1d25016fbd504a2a040babe586a",
"rev": "da2ecb5be816de35e2efe23a408a1c49fe8b11ba",
"type": "github"
},
"original": {

2
flake.nix
View file

@ -11,7 +11,7 @@
crane.url = "github:ipetkov/crane";
nixcord.url = "github:kaylorben/nixcord";
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
url = "git+https://git.lix.systems/lix-project/nixos-module";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = {

2
hosts/monosodium-glutamate-g/configuration.nix
View file

@ -68,8 +68,6 @@
seahorse.enable = true;
};
systemd.services.easyroam.enable = false;
environment.pathsToLink = [
"/share/nix-direnv"
];

10
modules/desktop/home/browser.nix
View file

@ -53,11 +53,7 @@
profiles.jade = {
search = {
force = true;
default = "Kagi";
order = [
"Kagi"
"ddg"
];
default = "ddg";
engines = {
"Nix Packages" = {
urls = [
@ -305,8 +301,8 @@
"browser.urlbar.speculativeConnect.enabled" = false;
"browser.urlbar.suggest.quicksuggest.nonsponsored" = false;
"browser.urlbar.suggest.quicksuggest.sponsored" = false;
"browser.search.suggest.enabled" = true;
"browser.urlbar.suggest.searches" = true;
"browser.search.suggest.enabled" = false;
"browser.urlbar.suggest.searches" = false;
"browser.urlbar.trending.featureGate" = false;
"security.ssl.require_safe_negotiation" = true;

10
modules/desktop/home/niri/binds.nix
View file

@ -57,10 +57,6 @@
"Mod+Shift+Slash".action.show-hotkey-overlay = [ ];
"Mod+Shift+C".action.set-dynamic-cast-window = [ ];
"Mod+Ctrl+C".action.set-dynamic-cast-monitor = [ ];
"Mod+Shift+Ctrl+C".action.clear-dynamic-cast-target = [ ];
# window/columns controls
"Mod+H".action.focus-column-left = [ ];
"Mod+J".action.focus-window-down = [ ];
@ -113,6 +109,8 @@
"Mod+BracketLeft".action.consume-or-expel-window-left = [ ];
"Mod+BracketRight".action.consume-or-expel-window-right = [ ];
"Mod+F".action.maximize-column = [ ];
"Mod+Shift+F".action.expand-column-to-available-width = [ ];
"Mod+Ctrl+F".action.fullscreen-window = [ ];
"Mod+C".action.center-column = [ ];
"Mod+Minus".action.set-column-width = "-5%";
"Mod+Equal".action.set-column-width = "+5%";
@ -120,10 +118,6 @@
"Mod+Shift+Equal".action.set-window-height = "+10%";
"Mod+W".action.toggle-column-tabbed-display = [ ];
"Mod+Shift+F".action.expand-column-to-available-width = [ ];
"Mod+Ctrl+F".action.fullscreen-window = [ ];
"Mod+Shift+Ctrl+F".action.toggle-windowed-fullscreen = [ ];
# media keys
"XF86AudioRaiseVolume".action.spawn = [
"wpctl"

19
modules/desktop/home/niri/style.nix
View file

@ -81,25 +81,6 @@
};
clip-to-geometry = true;
}
{
matches = [ { is-window-cast-target = true; } ];
border = {
inactive.gradient = {
from = "#64de50";
to = "#ff9a56";
in' = "oklch shorter hue";
relative-to = "window";
angle = 135;
};
active.gradient = {
from = "#64de50";
to = "#5bcefa";
in' = "oklch shorter hue";
relative-to = "window";
angle = 135;
};
};
}
];
};
}

6
modules/shell/default.nix
View file

@ -14,12 +14,6 @@
home-manager.users.jade =
{ ... }:
{
programs.broot = {
enable = true;
settings = {
modal = true;
};
};
programs.carapace.enable = true;
programs.direnv.enable = true;
};

2
modules/shell/nu/aliases.nu
View file

@ -2,8 +2,6 @@ alias gnix = cd ~/nix-configs;
alias grepo = cd ~/Documents/repos;
alias wh = wormhole-rs;
alias b = broot;
alias gg = gitui;
alias ga = git add;
alias gc = git commit;

2
programs/bar-ws-monitor/Cargo.toml
View file

@ -6,4 +6,4 @@ edition = "2021"
[dependencies]
serde = { version = "1.0.209", features = [ "derive" ] }
serde_json = "1.0.127"
niri-ipc = "25.5.1"
niri-ipc = "25.2.0"

23
programs/bar-ws-monitor/src/main.rs
View file

@ -21,24 +21,13 @@ const COLORS: [[&str; 2]; 7] = [
fn main() -> Result<(), std::io::Error> {
let mut state = EventStreamState::default();
let mut sock = Socket::connect()?;
// let mut func = sock.send(Request::EventStream).and_then(|it| match it {
// (Ok(Response::Handled), func) => Ok(func),
// _ => unreachable!(),
// })?;
// let mut func = sock.send(Request::EventStream).and_then(|it| match it {
// Ok(Response::Handled) => {}
// Ok(_) => panic!("???"),
// Err(e) => panic!("e"),
// });
let r = sock.send(Request::EventStream)?;
match r {
Ok(Response::Handled) => {}
e => panic!("unexpected {e:?}"),
}
let sock = Socket::connect()?;
let mut func = sock.send(Request::EventStream).and_then(|it| match it {
(Ok(Response::Handled), func) => Ok(func),
_ => unreachable!(),
})?;
let mut receiver = sock.read_events();
while let Ok(ev) = receiver() {
while let Ok(ev) = (func)() {
// check only relevant later, only done here to avoid a clone
let ev_is_ws_related = matches!(
&ev,