Merge branch 'main' of github.com:JulienMalka/nix-config

This commit is contained in:
Julien Malka 2023-05-13 16:30:10 +02:00
commit a70775ebb6
Signed by: Luj
GPG key ID: 6FC74C847011FD83
7 changed files with 51 additions and 53 deletions

View file

@ -26,6 +26,7 @@
rxvt_unicode rxvt_unicode
xorg.xbacklight xorg.xbacklight
neovim neovim
comma
]; ];
environment.variables.EDITOR = "nvim"; environment.variables.EDITOR = "nvim";

80
flake.lock generated
View file

@ -27,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1683255183, "lastModified": 1683779844,
"narHash": "sha256-UUxpb5PMkFfP2JGoPMEUvKbxv+wCkTWy4uZs1MyyCes=", "narHash": "sha256-sIeOU0GsCeQEn5TpqE/jFRN4EGsPsjqVRsPdrzIDABM=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "6b0b6a1c2527e8b1ef370a308b6ef8903004ac47", "rev": "c80189917086e43d49eece2bd86f56813500a0eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -103,17 +103,17 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1683459775, "lastModified": 1681468923,
"narHash": "sha256-Ab1pIKOj7XRZbJAv4g9937ElhaZF7Pob3hqGTDKt5w8=", "narHash": "sha256-+X2oO4juRVhQRs002mn8km6PODccIRiz09c2K1xtSpY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6fc82e56971523acfe1a61dbcb20f4bb969b3990", "rev": "17198cf5ae27af5b647c7dac58d935a7d0dbd189",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "master",
"repo": "home-manager", "repo": "home-manager",
"rev": "17198cf5ae27af5b647c7dac58d935a7d0dbd189",
"type": "github" "type": "github"
} }
}, },
@ -141,11 +141,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1683414693, "lastModified": 1683850587,
"narHash": "sha256-TH7iHV4mcStMk0NzySOiKcUMY5tjmOM9VbdNHEanvSs=", "narHash": "sha256-ncnstS+f6kgTTqyT0+6Kjnro3PY9KtXh79MBMjRgAnM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "a31dceb2c623c41565193328f98b50694917e0bf", "rev": "cc01550aff70a0cbee5b62db5f4a08789244998f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -180,11 +180,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1682542538, "lastModified": 1683569252,
"narHash": "sha256-752hHXEGsvKdw1Hm2LoFfi6sj2zVxu2AuKi4sRA7HN0=", "narHash": "sha256-BDbn3GhCbS/g3fYaIGXd+22q+SISjUxWzX/aCxx83vY=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprpaper", "repo": "hyprpaper",
"rev": "b4fdc0be52d7c3e48e932698bafc3f69dbd45b3b", "rev": "3596630a207a02a0035a0a178a1fdbf2a5f40a30",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -223,15 +223,15 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1680392507, "lastModified": 1683434835,
"narHash": "sha256-GGW1ANwP+UqlUAC3DBut+WESx/cLA2NhRkEMuhjbgEY=", "narHash": "sha256-idBmY6LKkB5hTcTFroUi1oQdCK1/fDfJA+qNaivl1Wk=",
"owner": "JulienMalka", "owner": "tpwrules",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"rev": "ae1cac6a21b655053ddd132920f65263e86898d5", "rev": "ef6f0de57ef175e0de8c7e846a95481ac6f4ce58",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "JulienMalka", "owner": "tpwrules",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"type": "github" "type": "github"
} }
@ -270,27 +270,27 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1679172431, "lastModified": 1683286087,
"narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=", "narHash": "sha256-xseOd7W7xwF5GOF2RW8qhjmVGrKoBz+caBlreaNzoeI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1603d11595a232205f03d46e635d919d1e1ec5b9", "rev": "3e313808bd2e0a0669430787fb22e43b2f4bf8bf",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1603d11595a232205f03d46e635d919d1e1ec5b9", "rev": "3e313808bd2e0a0669430787fb22e43b2f4bf8bf",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1683383741, "lastModified": 1683627095,
"narHash": "sha256-rAQSBnFGNKNomUUyVl+7v0tnp45677t4Ovlh9f57k6Q=", "narHash": "sha256-8u9SejRpL2TrMuHBdhYh4FKc1OGPDLyWTpIbNTtoHsA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "adc7c6f1bbaa73cda26be2323353b63a05b42f61", "rev": "a08e061a4ee8329747d54ddf1566d34c55c895eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -371,11 +371,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1683428115, "lastModified": 1683545104,
"narHash": "sha256-sxkM4upCCdsaWVpDWxYgQXooobex8QHbFkGj40Uf9uQ=", "narHash": "sha256-48wC0zzHAej/wLFWIgV+uj63AvQ2UUk85g7wmXJzTqk=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "fd2d857ce2450a3ba5700d1e95eb110070e0dbc3", "rev": "36b062a2c85a0efb37de1300c79c54602a094fab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -399,21 +399,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1683408522, "lastModified": 1683408522,
@ -431,15 +416,12 @@
} }
}, },
"utils": { "utils": {
"inputs": {
"systems": "systems_2"
},
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1667395993,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401", "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -12,7 +12,7 @@
}; };
home-manager-unstable = { home-manager-unstable = {
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/17198cf5ae27af5b647c7dac58d935a7d0dbd189";
inputs.nixpkgs.follows = "unstable"; inputs.nixpkgs.follows = "unstable";
}; };
@ -51,7 +51,7 @@
}; };
nixos-apple-silicon = { nixos-apple-silicon = {
url = "github:JulienMalka/nixos-apple-silicon"; url = "github:tpwrules/nixos-apple-silicon/";
}; };
hyprland = { hyprland = {

View file

@ -5,6 +5,7 @@ with builtins;
let let
overlay-unstable = arch: final: prev: { overlay-unstable = arch: final: prev: {
unstable = inputs.unstable.legacyPackages."${arch}"; unstable = inputs.unstable.legacyPackages."${arch}";
stable = inputs.nixpkgs.legacyPackages."${arch}";
}; };
in in
{ {

View file

@ -88,6 +88,15 @@
security.pam.services.swaylock = { }; security.pam.services.swaylock = { };
services.gnome3.gnome-keyring.enable = true;
security.pam.services.login.enableGnomeKeyring = true;
programs.ssh.startAgent = true;
programs.adb.enable = true;
services.udev.packages = [
pkgs.android-udev-rules
];
services.autofs = { services.autofs = {
enable = true; enable = true;
debug = true; debug = true;

View file

@ -63,7 +63,7 @@
feh feh
meld meld
vlc vlc
nerdfonts stable.nerdfonts
libreoffice libreoffice
font-awesome font-awesome
nodejs nodejs
@ -76,6 +76,8 @@
flameshot flameshot
kitty kitty
networkmanagerapplet networkmanagerapplet
element-desktop
xdg-utils
sops sops
coq coq
cvc5 cvc5
@ -94,6 +96,9 @@
layout = "fr"; layout = "fr";
}; };
services.dunst = {
enable = true;
};
}; };

View file

@ -5,7 +5,7 @@
users.users.julien = { users.users.julien = {
isNormalUser = true; isNormalUser = true;
home = "/home/julien"; home = "/home/julien";
extraGroups = [ "wheel" config.users.groups.keys.name "filerun" "networkmanager" "davfs2" ]; extraGroups = [ "wheel" config.users.groups.keys.name "filerun" "networkmanager" "davfs2" "adbusers" ];
shell = pkgs.fish; shell = pkgs.fish;
passwordFile = config.sops.secrets.user-julien-password.path; passwordFile = config.sops.secrets.user-julien-password.path;
}; };