diff --git a/flake.lock b/flake.lock index 7bbbeb7..7d3327c 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1683651229, - "narHash": "sha256-HN0Mw8g1XQIrcdyzqT00YW0Uqi/V/BUUUAgvcK1pcSM=", + "lastModified": 1685885003, + "narHash": "sha256-+OB0EvZBfGvnlTGg6mtyUCqkMnUp9DkmRUU4d7BZBVE=", "owner": "nix-community", "repo": "home-manager", - "rev": "983f8a1bb965b261492123cd8e2d07da46d4d50a", + "rev": "607d8fad96436b134424b9935166a7cd0884003e", "type": "github" }, "original": { @@ -29,11 +29,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1683740173, - "narHash": "sha256-yxFHxphIhKQDdhu6Ne61pR1Ktw5M4KQCYpBwjsznhjA=", + "lastModified": 1685951361, + "narHash": "sha256-Hx9yVkyEjVf5ohiWW2HmSuGgxDaVOqGLMIGSz/HV6f8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f2725a374a5921903bf918fdfd8111b537cbf18f", + "rev": "1a4e6e6a4b3272118a51bebb4a45ecd642383209", "type": "github" }, "original": { @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1681065697, - "narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=", + "lastModified": 1684265364, + "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd", + "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530", "type": "github" }, "original": { @@ -65,11 +65,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1683014792, - "narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=", + "lastModified": 1685655444, + "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42", + "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd", "type": "github" }, "original": { @@ -81,16 +81,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1683408522, - "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", + "lastModified": 1685865905, + "narHash": "sha256-XJZ/o17eOd2sEsGif+/MQBnfa2DKmndWgJyc7CWajFc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", + "rev": "e7603eba51f2c7820c0a182c6bbb351181caa8e7", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable", + "ref": "nixos-23.05", "type": "indirect" } }, @@ -105,11 +105,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1682436395, - "narHash": "sha256-GGEjkQO9m7YLYIXIXM76HWdhjg4Ye+oafOtyaFAYKI4=", + "lastModified": 1685803001, + "narHash": "sha256-yxq/U9zL1ssFZtgT27A96UKteCiKb3zSmbA/dokK76U=", "owner": "wlroots", "repo": "wlroots", - "rev": "6830bfc17fd94709e2cdd4da0af989f102a26e59", + "rev": "b61d5922f1d0910a848deb100570ad8587aea38d", "type": "gitlab" }, "original": { @@ -131,11 +131,11 @@ ] }, "locked": { - "lastModified": 1682439384, - "narHash": "sha256-zHDa8LCZs05TZHQSIZ3ucwyMPglBGHcqTBzfkLjYXTM=", + "lastModified": 1685385764, + "narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "c0e233955568fbea4e859336f6d3d14d51294d7c", + "rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 774bdf3..8e70ad2 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "A flake using my config"; inputs = { - nixpkgs.url = "nixpkgs/nixos-unstable"; + nixpkgs.url = "nixpkgs/nixos-23.05"; home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/lib/modules/dev.nix b/lib/modules/dev.nix index 62228cf..d152b6b 100644 --- a/lib/modules/dev.nix +++ b/lib/modules/dev.nix @@ -23,6 +23,7 @@ in }) dbeaver ansible + tig ]); }]; }; diff --git a/lib/modules/git.nix b/lib/modules/git.nix index 1553820..439b2b9 100644 --- a/lib/modules/git.nix +++ b/lib/modules/git.nix @@ -18,6 +18,12 @@ in graph = "log --oneline --all --graph"; amend = "commit --amend --no-edit"; }; + delta = { + enable = true; + }; + extraConfig = { + pull.rebase = true; + }; }; }]; }; diff --git a/lib/modules/work.nix b/lib/modules/work.nix index 63cb717..f841d29 100644 --- a/lib/modules/work.nix +++ b/lib/modules/work.nix @@ -83,12 +83,16 @@ with lib; }; }; + users.users.tristan.extraGroups = ["docker"]; virtualisation.docker = { enable = true; storageDriver = "btrfs"; rootless = { - enable = true; + enable = false; setSocketVariable = true; + daemon.settings = { + "userns-remap"= "default"; + }; }; }; diff --git a/system/global/home.nix b/system/global/home.nix index 4a8389a..0da7644 100644 --- a/system/global/home.nix +++ b/system/global/home.nix @@ -20,7 +20,6 @@ let gawk = "${pkgs.gawk}/bin/awk"; }; lf-sixel = pkgs.callPackage ../../custom/lf-sixel/. { }; - input-leap = pkgs.callPackage ../../custom/input-leap/. { }; in { programs.home-manager.enable = true; @@ -39,7 +38,6 @@ in imv libsixel lf-sixel - input-leap yt-dlp playerctl swww