mirror of
https://git.sr.ht/~rouven/nixos-config
synced 2024-11-15 05:13:10 +01:00
Compare commits
3 commits
1821fe37c8
...
d200c92200
Author | SHA1 | Date | |
---|---|---|---|
Rouven Seifert | d200c92200 | ||
Rouven Seifert | 44240a38d7 | ||
Rouven Seifert | 738e94e366 |
31
flake.lock
31
flake.lock
|
@ -216,11 +216,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713453913,
|
"lastModified": 1713479476,
|
||||||
"narHash": "sha256-vbXq52VRlL1defMHrwhsoeHm95O3mFefsSSJyNEghbA=",
|
"narHash": "sha256-kTww3Hd+R95AB6J+Y1zvXrhUScgMzf0vV5hN6+wFPXE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "178e26895b3aef028a00a32fb7e7ed0fc660645c",
|
"rev": "ffc3600f4009ca39b6cb63b24127ca4f93792854",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -332,11 +332,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713248628,
|
"lastModified": 1713297878,
|
||||||
"narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
|
"narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
|
"rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -447,24 +447,6 @@
|
||||||
"type": "sourcehut"
|
"type": "sourcehut"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"river": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1713357595,
|
|
||||||
"narHash": "sha256-LGqP2HBrMKGGTnqFDjmZRKXN88SQMgfLm2plVAzan8c=",
|
|
||||||
"ref": "refs/heads/master",
|
|
||||||
"rev": "6b86af4f85f66697a0ffc504c4fcc1db05bfbb80",
|
|
||||||
"revCount": 1246,
|
|
||||||
"submodules": true,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://codeberg.org/river/river"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"submodules": true,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://codeberg.org/river/river"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
|
@ -477,7 +459,6 @@
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"pfersel": "pfersel",
|
"pfersel": "pfersel",
|
||||||
"purge": "purge",
|
"purge": "purge",
|
||||||
"river": "river",
|
|
||||||
"trucksimulatorbot": "trucksimulatorbot"
|
"trucksimulatorbot": "trucksimulatorbot"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -45,14 +45,6 @@
|
||||||
url = "github:nix-community/lanzaboote/v0.3.0";
|
url = "github:nix-community/lanzaboote/v0.3.0";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
river = {
|
|
||||||
url = "https://codeberg.org/river/river";
|
|
||||||
flake = false;
|
|
||||||
type = "git";
|
|
||||||
submodules = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
|
|
|
@ -29,8 +29,12 @@
|
||||||
};
|
};
|
||||||
networks."10-wired" = {
|
networks."10-wired" = {
|
||||||
matchConfig.Name = "eno1";
|
matchConfig.Name = "eno1";
|
||||||
|
address = [ "192.168.42.2/24" ];
|
||||||
|
routes = [{
|
||||||
|
routeConfig.Gateway = "192.168.42.1";
|
||||||
|
}];
|
||||||
networkConfig = {
|
networkConfig = {
|
||||||
DHCP = "yes";
|
DNS = "192.168.42.1";
|
||||||
LLDP = true;
|
LLDP = true;
|
||||||
EmitLLDP = "nearest-bridge";
|
EmitLLDP = "nearest-bridge";
|
||||||
DNSSEC = false;
|
DNSSEC = false;
|
||||||
|
|
|
@ -38,6 +38,7 @@
|
||||||
identity="r5"
|
identity="r5"
|
||||||
password="@AGDSN_WIFI_AUTH@"
|
password="@AGDSN_WIFI_AUTH@"
|
||||||
phase2="auth=PAP"
|
phase2="auth=PAP"
|
||||||
|
bssid_ignore=b8:3a:5a:8b:96:c2
|
||||||
'';
|
'';
|
||||||
authProtocols = [ "WPA-EAP" ];
|
authProtocols = [ "WPA-EAP" ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,15 +1,7 @@
|
||||||
{ pkgs, lib, river, ... }:
|
{ pkgs, lib, ... }:
|
||||||
{
|
{
|
||||||
wayland.windowManager.river = {
|
wayland.windowManager.river = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = with pkgs; pkgs.river.overrideAttrs (old: {
|
|
||||||
src = river;
|
|
||||||
buildInputs = lib.lists.remove wlroots_0_16 old.buildInputs ++ [
|
|
||||||
(wlroots.overrideAttrs (_: {
|
|
||||||
version = "0.17.2";
|
|
||||||
}))
|
|
||||||
];
|
|
||||||
});
|
|
||||||
systemd. extraCommands = [ "systemctl --user start river-session.target" ];
|
systemd. extraCommands = [ "systemctl --user start river-session.target" ];
|
||||||
settings = {
|
settings = {
|
||||||
focus-follows-cursor = "always";
|
focus-follows-cursor = "always";
|
||||||
|
|
Loading…
Reference in a new issue