nullbite/nixfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update flake.lock, perform migrations

Browse Source
This commit is contained in:
NullBite 2024-05-09 22:27:14 -04:00
parent c12bb8ed31
commit da68e5e572
Signed by: nullbite
GPG Key ID: 6C4D545385D4925A
4 changed files with 86 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
flake.lock generated
View File

@ -114,11 +114,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714865296, "lastModified": 1715077503,
"narHash": "sha256-02r2Qzh4fGYBPB/3Lj8vwPMtE6H/UchZnN7A/dQMHIA=", "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e0825ea2112d09d9f0680833cd716f6aee3b973f", "rev": "6e277d9566de9976f47228dd8c580b97488734d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -181,45 +181,47 @@
"hyprland": { "hyprland": {
"inputs": { "inputs": {
"hyprcursor": "hyprcursor", "hyprcursor": "hyprcursor",
"hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang_2", "hyprlang": "hyprlang_2",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"systems": "systems_3", "systems": "systems_3",
"wlroots": "wlroots",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1714875275, "lastModified": 1715305136,
"narHash": "sha256-e7InWx8mw/jNGtWP1By9CZkGINHEplf9Z3P/QvgPMos=", "narHash": "sha256-+X0H4v/goM9QAu1PSkr46AmVc5be9EV1JRkGU5TEtXw=",
"owner": "hyprwm", "ref": "refs/heads/main",
"repo": "Hyprland", "rev": "2ba6bb69c4b455ff6327596a63bf1785d0910d2c",
"rev": "aaf35b9f1f0ce49080f2a0b1e7943336b1ba6057", "revCount": 4655,
"type": "github" "submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
}, },
"original": { "original": {
"owner": "hyprwm", "submodules": true,
"repo": "Hyprland", "type": "git",
"type": "github" "url": "https://github.com/hyprwm/Hyprland"
} }
}, },
"hyprland-protocols": { "hyprland-protocols": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
"xdph",
"nixpkgs" "nixpkgs"
], ],
"systems": [ "systems": [
"hyprland", "hyprland",
"xdph",
"systems" "systems"
] ]
}, },
"locked": { "locked": {
"lastModified": 1714869498, "lastModified": 1691753796,
"narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -287,11 +289,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714755542, "lastModified": 1715287423,
"narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=", "narHash": "sha256-B7AJIjOyWgVMKhu7DlOnWa0VprdhywUVHuB/j+EwSxM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828", "rev": "e2fc1c0eb8b392110588f478cce644348ead7271",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -364,11 +366,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714872254, "lastModified": 1715304061,
"narHash": "sha256-O9n7CATdL7uD+MNcxd8RhjA4Bn6yweF7uoGaJKOYcE0=", "narHash": "sha256-iFtaM+G51qYTBb1rroD/TBx5f2/oHjDBUIEptQJsKmo=",
"owner": "infinidoge", "owner": "infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "716121fd08323465a25878cba2814f7463be0095", "rev": "6ec9f2bac00a7f5ca7133303b926d7d67a2e6167",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -386,11 +388,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714355896, "lastModified": 1715237610,
"narHash": "sha256-rtv+nJJ12V7w68j8vIcGacfS1yuK1/dBgglSKWzYMTM=", "narHash": "sha256-/ZeWQ4mL3DfHsbTZYc80qMrL4vBfENP0RiGv2KrCrEo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "acb893461a4bee4e77b1a27b1410d4995b52174c", "rev": "61fe33f4194bbbc48c090a2e79f4eb61b47c9b75",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -424,11 +426,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1714253743, "lastModified": 1715087517,
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -440,11 +442,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1714809261, "lastModified": 1715161350,
"narHash": "sha256-hfBmnYFyz9I1mdrC3tX1A+dF9cOUcds5PIMPxrT+cRk=", "narHash": "sha256-5ZU8DVwHO0gjw2sKoKkToYOXMJFRBpRsa17Ebm8fgj0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d32560238207b8e26d88b265207b216ee46b8450", "rev": "c4200cb341ee794775185ecd4105fbbfb5ca73a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -456,11 +458,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1714685007, "lastModified": 1715106579,
"narHash": "sha256-Q4ddhb5eC5pwci0QhAapFwnsc8X8H9ZMQiWpsofBsDc=", "narHash": "sha256-gZMgKEGiK6YrwGBiccZ1gemiUwjsZ1Zv49KYOgmX2fY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "383ffe076d9b633a2e97b6e4dd97fc15fcf30159", "rev": "8be0d8a1ed4f96d99b09aa616e2afd47acc3da89",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -513,11 +515,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714875369, "lastModified": 1715221036,
"narHash": "sha256-dyyJEHKbnz2sZcz9yVxOCE/085covNljWKeTCIcBfL0=", "narHash": "sha256-81EKOdlmT/4hZpImRlvMVPgmCcJYZjwlWbJese/XqUw=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "35cc508a9de1c971ce1dc610dec1ba75f66c6004", "rev": "5c4bc8a0a70093a31a12509c5653c147f2310bd2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -631,29 +633,9 @@
"type": "github" "type": "github"
} }
}, },
"wlroots": {
"flake": false,
"locked": {
"lastModified": 1713731601,
"narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=",
"owner": "hyprwm",
"repo": "wlroots-hyprland",
"rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "wlroots-hyprland",
"rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea",
"type": "github"
}
},
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": [ "hyprland-protocols": "hyprland-protocols",
"hyprland",
"hyprland-protocols"
],
"hyprlang": [ "hyprlang": [
"hyprland", "hyprland",
"hyprlang" "hyprlang"
@ -668,11 +650,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714060055, "lastModified": 1714662532,
"narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=", "narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a", "rev": "1f228ba2f1f254195c0b571302b37482861abee3",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View File

@ -40,7 +40,7 @@
}; };
# no inputs.nixpkgs.follows so i can use cachix # no inputs.nixpkgs.follows so i can use cachix
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
hyprwm-contrib = { hyprwm-contrib = {
url = "github:hyprwm/contrib"; url = "github:hyprwm/contrib";

2
home/default.nix
View File

@ -11,8 +11,6 @@ in
./profile ./profile
./programs ./programs
./sessions ./sessions
inputs.hypridle.homeManagerModules.default
]; ];
config = {}; config = {};
options.nixfiles = { options.nixfiles = {

32
home/programs/hypridle.nix
View File

@ -43,13 +43,14 @@ in
}; };
config = lib.mkMerge [ config = lib.mkMerge [
(lib.mkIf cfg.enable { (lib.mkIf cfg.enable {
services.hypridle = let services.hypridle = {
enable = true;
settings = let
lock = pkgs.writeShellScript "lock-once" '' lock = pkgs.writeShellScript "lock-once" ''
${pkgs.procps}/bin/pgrep -x swaylock > /dev/null || "${config.programs.swaylock.package}/bin/swaylock" ${pkgs.procps}/bin/pgrep -x swaylock > /dev/null || "${config.programs.swaylock.package}/bin/swaylock"
''; '';
in { in {
enable = true; listener = let
listeners = let
dpms-wrapped = pkgs.writeShellScript "dpms-wrapped" '' dpms-wrapped = pkgs.writeShellScript "dpms-wrapped" ''
exec ${cfg.commands.dpms-off} exec ${cfg.commands.dpms-off}
''; '';
@ -60,28 +61,33 @@ in
in [ in [
{ {
timeout = cfg.timeouts.dpms; timeout = cfg.timeouts.dpms;
onTimeout = cfg.commands.dpms-off; on-timeout = cfg.commands.dpms-off;
onResume = cfg.commands.dpms-on; on-resume = cfg.commands.dpms-on;
} }
# { # {
# timeout = cfg.timeouts.locked-dpms; # timeout = cfg.timeouts.locked-dpms;
# onTimeout = "${lock-dpms}"; # on-timeout = "${lock-dpms}";
# onResume = cfg.commands.dpms-on; # on-resume = cfg.commands.dpms-on;
# } # }
{ {
timeout = cfg.timeouts.lock; timeout = cfg.timeouts.lock;
onTimeout = "${lock}"; on-timeout = "${lock}";
} }
{ {
timeout = cfg.timeouts.lock + cfg.timeouts.locked-dpms; timeout = cfg.timeouts.lock + cfg.timeouts.locked-dpms;
onTimeout = cfg.commands.dpms-off; on-timeout = cfg.commands.dpms-off;
onResume = cfg.commands.dpms-on; on-resume = cfg.commands.dpms-on;
} }
]; ];
lockCmd = "${lock}"; general = {
unlockCmd = "${pkgs.procps}/bin/pkill -x -USR1 swaylock"; lock_cmd = "${lock}";
beforeSleepCmd = "${config.programs.swaylock.package}"; unlock_cmd = "${pkgs.procps}/bin/pkill -x -USR1 swaylock";
before_sleep_cmd = "${config.programs.swaylock.package}";
ignore_dbus_inhibit = false;
# after_sleep_cmd = "echo 'Awake...'";
};
};
}; };
}) })
# why isn't this handled automatically?? # why isn't this handled automatically??