Renaming, update, switch to Element on NixOS
This commit is contained in:
parent
e8613514eb
commit
db961848a3
12
flake.lock
12
flake.lock
@ -27,11 +27,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1702110869,
|
"lastModified": 1703155327,
|
||||||
"narHash": "sha256-hgbzPjIMLYJf3Ekq9qZCpDcIZn1BZmOp7d6PMkIWknU=",
|
"narHash": "sha256-Q25AEghhhOp+ImNN4PsAExi7DIB1INMlBSaggGz7q4w=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "7db6291d95693374d408f4877c265ec7481f222b",
|
"rev": "8b797c8eea1eba7dfb47f6964103e6e0d134255f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -42,11 +42,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1701693815,
|
"lastModified": 1703105089,
|
||||||
"narHash": "sha256-7BkrXykVWfkn6+c1EhFA3ko4MLi3gVG0p9G96PNnKTM=",
|
"narHash": "sha256-1F7hDLj58OQCADRtG2DRKpmJ8QVza0M0NK/kfLWLs3k=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "09ec6a0881e1a36c29d67497693a67a16f4da573",
|
"rev": "2b9c57d33e3d5be6262e124fc66e3a8bc650b93d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -20,8 +20,9 @@
|
|||||||
config.allowUnsupportedSystem = false;
|
config.allowUnsupportedSystem = false;
|
||||||
config.allowBroken = false;
|
config.allowBroken = false;
|
||||||
config.permittedInsecurePackages = [
|
config.permittedInsecurePackages = [
|
||||||
"libgcrypt-1.8.10"
|
#"libgcrypt-1.8.10"
|
||||||
"libxls-1.6.2"
|
"libxls-1.6.2"
|
||||||
|
"electron-25.9.0"
|
||||||
];
|
];
|
||||||
overlays = import ./overlays.nix;
|
overlays = import ./overlays.nix;
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
@ -55,7 +56,7 @@
|
|||||||
home-manager.users.${username}.imports = utils.nixFilesIn ./maddie/common ++ utils.nixFilesIn ./maddie/nixos;
|
home-manager.users.${username}.imports = utils.nixFilesIn ./maddie/common ++ utils.nixFilesIn ./maddie/nixos;
|
||||||
home-manager.extraSpecialArgs = { inherit username; pkgs = nixpkgs_x86_64; };
|
home-manager.extraSpecialArgs = { inherit username; pkgs = nixpkgs_x86_64; };
|
||||||
}
|
}
|
||||||
] ++ utils.nixFilesIn ./systems/mdesktop;
|
] ++ utils.nixFilesIn ./systems/macos;
|
||||||
};
|
};
|
||||||
|
|
||||||
darwinConfigurations."MMacBookPro" = darwin.lib.darwinSystem
|
darwinConfigurations."MMacBookPro" = darwin.lib.darwinSystem
|
||||||
@ -70,7 +71,7 @@
|
|||||||
home-manager.users.${username}.imports = utils.nixFilesIn ./maddie/common ++ utils.nixFilesIn ./maddie/macos;
|
home-manager.users.${username}.imports = utils.nixFilesIn ./maddie/common ++ utils.nixFilesIn ./maddie/macos;
|
||||||
home-manager.extraSpecialArgs = { inherit username; pkgs = nixpkgs_aarch64_darwin; };
|
home-manager.extraSpecialArgs = { inherit username; pkgs = nixpkgs_aarch64_darwin; };
|
||||||
}
|
}
|
||||||
] ++ utils.nixFilesIn ./systems/mmacbookpro;
|
] ++ utils.nixFilesIn ./systems/nixos;
|
||||||
};
|
};
|
||||||
|
|
||||||
formatter.x86_64-linux = nixpkgs_x86_64.legacyPackages.x86_64-linux.nixpkgs-fmt;
|
formatter.x86_64-linux = nixpkgs_x86_64.legacyPackages.x86_64-linux.nixpkgs-fmt;
|
||||||
|
@ -2,8 +2,7 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
schildichat-desktop # Matrix client, fork of element
|
element-desktop # Standard matrix client
|
||||||
signal-desktop # Signal client
|
|
||||||
cinny-desktop # Pretty matrix client
|
cinny-desktop # Pretty matrix client
|
||||||
discord-canary # Discord client
|
discord-canary # Discord client
|
||||||
ripcord # Better discord client
|
ripcord # Better discord client
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
{
|
{
|
||||||
services.avahi = {
|
services.avahi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
nssmdns = true;
|
nssmdns4 = true;
|
||||||
publish = {
|
publish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
addresses = true;
|
addresses = true;
|
@ -5,6 +5,6 @@
|
|||||||
programs.gnupg.agent = {
|
programs.gnupg.agent = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableSSHSupport = false;
|
enableSSHSupport = false;
|
||||||
pinentryFlavor = "gtk2";
|
pinentryFlavor = "gnome3";
|
||||||
};
|
};
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user