tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

update to 23.05

Browse source
This commit is contained in:
Tristan 2023-06-05 15:01:32 +01:00
parent 4125a78bf2
commit f66541a552
6 changed files with 35 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

44
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1683651229, "lastModified": 1685885003,
"narHash": "sha256-HN0Mw8g1XQIrcdyzqT00YW0Uqi/V/BUUUAgvcK1pcSM=", "narHash": "sha256-+OB0EvZBfGvnlTGg6mtyUCqkMnUp9DkmRUU4d7BZBVE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "983f8a1bb965b261492123cd8e2d07da46d4d50a", "rev": "607d8fad96436b134424b9935166a7cd0884003e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -29,11 +29,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1683740173, "lastModified": 1685951361,
"narHash": "sha256-yxFHxphIhKQDdhu6Ne61pR1Ktw5M4KQCYpBwjsznhjA=", "narHash": "sha256-Hx9yVkyEjVf5ohiWW2HmSuGgxDaVOqGLMIGSz/HV6f8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "f2725a374a5921903bf918fdfd8111b537cbf18f", "rev": "1a4e6e6a4b3272118a51bebb4a45ecd642383209",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -50,11 +50,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1681065697, "lastModified": 1684265364,
"narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=", "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd", "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -65,11 +65,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1683014792, "lastModified": 1685655444,
"narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=", "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42", "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -81,16 +81,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1683408522, "lastModified": 1685865905,
"narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", "narHash": "sha256-XJZ/o17eOd2sEsGif+/MQBnfa2DKmndWgJyc7CWajFc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", "rev": "e7603eba51f2c7820c0a182c6bbb351181caa8e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-unstable", "ref": "nixos-23.05",
"type": "indirect" "type": "indirect"
} }
}, },
@ -105,11 +105,11 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1682436395, "lastModified": 1685803001,
"narHash": "sha256-GGEjkQO9m7YLYIXIXM76HWdhjg4Ye+oafOtyaFAYKI4=", "narHash": "sha256-yxq/U9zL1ssFZtgT27A96UKteCiKb3zSmbA/dokK76U=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "6830bfc17fd94709e2cdd4da0af989f102a26e59", "rev": "b61d5922f1d0910a848deb100570ad8587aea38d",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -131,11 +131,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682439384, "lastModified": 1685385764,
"narHash": "sha256-zHDa8LCZs05TZHQSIZ3ucwyMPglBGHcqTBzfkLjYXTM=", "narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "c0e233955568fbea4e859336f6d3d14d51294d7c", "rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -2,7 +2,7 @@
description = "A flake using my config"; description = "A flake using my config";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "nixpkgs/nixos-23.05";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

1
lib/modules/dev.nix
View file

@ -23,6 +23,7 @@ in
}) })
dbeaver dbeaver
ansible ansible
tig
]); ]);
}]; }];
}; };

6
lib/modules/git.nix
View file

@ -18,6 +18,12 @@ in
graph = "log --oneline --all --graph"; graph = "log --oneline --all --graph";
amend = "commit --amend --no-edit"; amend = "commit --amend --no-edit";
}; };
delta = {
enable = true;
};
extraConfig = {
pull.rebase = true;
};
}; };
}]; }];
}; };

6
lib/modules/work.nix
View file

@ -83,12 +83,16 @@ with lib;
}; };
}; };
users.users.tristan.extraGroups = ["docker"];
virtualisation.docker = { virtualisation.docker = {
enable = true; enable = true;
storageDriver = "btrfs"; storageDriver = "btrfs";
rootless = { rootless = {
enable = true; enable = false;
setSocketVariable = true; setSocketVariable = true;
daemon.settings = {
"userns-remap"= "default";
};
}; };
}; };

2
system/global/home.nix
View file

@ -20,7 +20,6 @@ let
gawk = "${pkgs.gawk}/bin/awk"; gawk = "${pkgs.gawk}/bin/awk";
}; };
lf-sixel = pkgs.callPackage ../../custom/lf-sixel/. { }; lf-sixel = pkgs.callPackage ../../custom/lf-sixel/. { };
input-leap = pkgs.callPackage ../../custom/input-leap/. { };
in in
{ {
programs.home-manager.enable = true; programs.home-manager.enable = true;
@ -39,7 +38,6 @@ in
imv imv
libsixel libsixel
lf-sixel lf-sixel
input-leap
yt-dlp yt-dlp
playerctl playerctl
swww swww