SebastianStork/nixos-config
1
0
Fork 0
mirror of https://github.com/SebastianStork/nixos-config.git synced 2026-01-21 15:11:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update

Browse source
This commit is contained in:
SebastianStork 2024-05-05 19:55:38 +02:00
parent 4e7f3abfe7
commit ec62701a29
5 changed files with 54 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

131
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714405407, "lastModified": 1714612856,
"narHash": "sha256-h3pOvHCXkSdp1KOZqtkQmHgkR7VaOJXDhqhumk7sZLY=", "narHash": "sha256-W7+rtMzRmdovzndN2NYUv5xzkbMudtQ3jbyFuGk0O1E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "5eaf747af38dd272e1ab28a8ec4bd972424b07cf", "rev": "d57058eb09dd5ec00c746df34fe0a603ea744370",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -38,7 +38,7 @@
}, },
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_5" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -61,11 +61,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714515075, "lastModified": 1714900398,
"narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=", "narHash": "sha256-H7XYHpjk1G6dkA3AnbYrKtaTFjcCE7ul6nUVlVQxtsA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef", "rev": "fdaaf543bad047639ef0b356ea2e6caec2f1215c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -74,32 +74,10 @@
"type": "github" "type": "github"
} }
}, },
"hypridle": {
"inputs": {
"hyprlang": "hyprlang",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_2"
},
"locked": {
"lastModified": 1713472482,
"narHash": "sha256-7Ft5WZTMIjXOGgRCf31DZBwK6RK8xkeKlD5vFXz3gII=",
"owner": "hyprwm",
"repo": "Hypridle",
"rev": "7cff4581a3753154fc5b41f39a098fad49b777b1",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "Hypridle",
"type": "github"
}
},
"hyprlang": { "hyprlang": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hypridle", "hyprlock",
"nixpkgs" "nixpkgs"
], ],
"systems": "systems" "systems": "systems"
@ -118,42 +96,20 @@
"type": "github" "type": "github"
} }
}, },
"hyprlang_2": {
"inputs": {
"nixpkgs": [
"hyprlock",
"nixpkgs"
],
"systems": "systems_3"
},
"locked": {
"lastModified": 1713121246,
"narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprlock": { "hyprlock": {
"inputs": { "inputs": {
"hyprlang": "hyprlang_2", "hyprlang": "hyprlang",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_4" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1713978374, "lastModified": 1714843107,
"narHash": "sha256-jla5Wo0Qt3NEnD0OjNj85BGw0pR4Zlz5uy8AqHH7tuE=", "narHash": "sha256-89WxndRGO3CGuWE5XCaHKnsV3IKBRdOWqScp6o8enT4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprlock", "repo": "Hyprlock",
"rev": "415262065fff0a04b229cd00165f346a86a0a73a", "rev": "c87af3aa1f6e6bd06cffaabcc400bd45e26d565a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -169,11 +125,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714273701, "lastModified": 1714878592,
"narHash": "sha256-bmoeZ5zMSSO/e8P51yjrzaxA9uzA3SZAEFvih6S3LFo=", "narHash": "sha256-E68C03sYRsYFsK7wiGHUIJm8IsyPRALOrFoTL0glXnI=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "941c4973c824509e0356be455d89613611f76c8a", "rev": "a362555e9dbd4ecff3bb98969bbdb8f79fe87f10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -191,11 +147,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714526701, "lastModified": 1714872267,
"narHash": "sha256-SO5QvTx6gEbEDqRJVzQGhwftmJICJM+h0cvql9z4kTg=", "narHash": "sha256-G04hUZnX7rrJ5a9A2OqrKZ1x25svs2xpGDrP2ExExUg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "24c85bf514f34dc679f0cfd35c66065975cb635e", "rev": "7d48b70548c01495e9d434db3a89f61600ca4aca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -206,11 +162,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1714253743, "lastModified": 1714763106,
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "narHash": "sha256-DrDHo74uTycfpAF+/qxZAMlP/Cpe04BVioJb6fdI0YY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "rev": "e9be42459999a253a9f92559b1f5b72e1b44c13d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -222,11 +178,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1713638189, "lastModified": 1714858427,
"narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=", "narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "74574c38577914733b4f7a775dd77d24245081dd", "rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -240,7 +196,6 @@
"inputs": { "inputs": {
"disko": "disko", "disko": "disko",
"home-manager": "home-manager", "home-manager": "home-manager",
"hypridle": "hypridle",
"hyprlock": "hyprlock", "hyprlock": "hyprlock",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nix-vscode-extensions": "nix-vscode-extensions", "nix-vscode-extensions": "nix-vscode-extensions",
@ -256,11 +211,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1713892811, "lastModified": 1714878026,
"narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=", "narHash": "sha256-YJ1k/jyd6vKqmVgGkkAb4n+ZfPPAt8+L5a73eAThqFU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd", "rev": "10dc39496d5b027912038bde8d68c836576ad0bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -300,36 +255,6 @@
} }
}, },
"systems_3": { "systems_3": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_4": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_5": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

13
flake.nix
View file

@ -12,13 +12,13 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-index-database = { sops-nix = {
url = "github:Mic92/nix-index-database"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
sops-nix = { nix-index-database = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -31,11 +31,6 @@
url = "github:hyprwm/Hyprlock"; url = "github:hyprwm/Hyprlock";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hypridle = {
url = "github:hyprwm/Hypridle";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = {nixpkgs, ...} @ inputs: let outputs = {nixpkgs, ...} @ inputs: let

33
modules/home/de/hypridlelock.nix
View file

@ -4,10 +4,7 @@
lib, lib,
... ...
}: { }: {
imports = [ imports = [inputs.hyprlock.homeManagerModules.hyprlock];
inputs.hyprlock.homeManagerModules.hyprlock
inputs.hypridle.homeManagerModules.hypridle
];
options.myConfig.de.hypridlelock.enable = lib.mkEnableOption ""; options.myConfig.de.hypridlelock.enable = lib.mkEnableOption "";
@ -24,21 +21,25 @@
]; ];
}; };
services.hypridle = let services.hypridle = {
hyprlockExe = "${lib.getExe config.programs.hyprlock.package}";
in {
enable = true; enable = true;
lockCmd = "pidof ${hyprlockExe} || ${hyprlockExe}"; settings = {
beforeSleepCmd = "loginctl lock-session"; general = {
afterSleepCmd = "hyprctl dispatch dpms on"; lock_cmd = let
hyprlockExe = "${lib.getExe config.programs.hyprlock.package}";
in "pidof ${hyprlockExe} || ${hyprlockExe}";
before_sleep_cmd = "loginctl lock-session";
after_sleep_cmd = "hyprctl dispatch dpms on";
};
listeners = [ listener = [
{ {
timeout = 600; timeout = 600;
onTimeout = "loginctl lock-session"; on-timeout = "loginctl lock-session";
} }
]; ];
};
}; };
}; };
} }

8
users/seb/@inspiron.nix
View file

@ -10,15 +10,15 @@
wayland.windowManager.hyprland.settings.monitor = "eDP-1,1920x1080@60,0x0,1"; wayland.windowManager.hyprland.settings.monitor = "eDP-1,1920x1080@60,0x0,1";
services.hypridle.listeners = [ services.hypridle.settings.listener = [
{ {
timeout = 300; timeout = 300;
onTimeout = "${lib.getExe pkgs.brightnessctl} -s && ${lib.getExe pkgs.brightnessctl} -e set 10%"; on-timeout = "${lib.getExe pkgs.brightnessctl} -s && ${lib.getExe pkgs.brightnessctl} -e set 10%";
onResume = "${lib.getExe pkgs.brightnessctl} -r"; on-resume = "${lib.getExe pkgs.brightnessctl} -r";
} }
{ {
timeout = 1200; timeout = 1200;
onTimeout = "systemctl suspend"; on-timeout = "systemctl suspend";
} }
]; ];
}; };

2
users/seb/@north.nix
View file

@ -24,6 +24,6 @@
''; '';
}; };
services.hypridle.beforeSleepCmd = lib.mkForce ""; services.hypridle.settings.general.before_sleep_cmd = lib.mkForce "";
}; };
} }