m3tam3re
/
nix-configurations
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unstable branch

This commit is contained in:
m3tam3re 2023-04-12 19:30:43 +02:00
parent 7bec28e12d
commit 0451280165
11 changed files with 51 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
flake.lock
View File

@ -101,11 +101,11 @@
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1680667162, "lastModified": 1681250798,
"narHash": "sha256-2vgxK4j42y73S3XB2cThz1dSEyK9J9tfu4mhuEfAw68=", "narHash": "sha256-fQMROyKzPFBPqJy9J4ffywm02ZuqAI0GW1O1QibVpdQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "440faf5ae472657ef2d8cc7756d77b6ab0ace68d", "rev": "28698126bd825aff21cae9ffd15cf83e169051b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -122,11 +122,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1681044500, "lastModified": 1681303095,
"narHash": "sha256-jXuwPWHr5Yywc0T40NsJ8LyPjjxEnJgo44wXgb9JZc8=", "narHash": "sha256-0lj5ZGMhXdeYbbQQ5Y0fv0OcKe0zXfn4H2VOn31l/9o=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "046ad79d11dbccc90ade48d63aaa340655d999fb", "rev": "efee6a1cda278b8589bfe335c66d8fb272027bca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -143,11 +143,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680997116, "lastModified": 1681065697,
"narHash": "sha256-nNyoatiHmTMczrCoHCH2LIRfSF8n9ZPZ1O7WNMxcbR4=", "narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "d7d403b711b60e8136295b0d4229e89a115e80cc", "rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -206,22 +206,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1680945546,
"narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1671417167, "lastModified": 1671417167,
@ -256,16 +240,16 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1680865339, "lastModified": 1681217261,
"narHash": "sha256-H6rmJ1CyJ3Q5ZyoLMYq/UEYMS9Q1orJjRpWiQ47HudE=", "narHash": "sha256-RbxCHWN3Vhyv/WEsXcJlDwF7bpvZ9NxDjfSouQxXEKo=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0040164e473509b4aee6aedb3b923e400d6df10b", "rev": "3fb8eedc450286d5092e4953118212fa21091b3b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "nixos",
"ref": "nixos-22.11", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -277,8 +261,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"nix-colors": "nix-colors", "nix-colors": "nix-colors",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4"
"nixpkgs-unstable": "nixpkgs-unstable"
} }
}, },
"utils": { "utils": {
@ -341,11 +324,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1673116118, "lastModified": 1681127512,
"narHash": "sha256-eR0yDSkR2XYMesfdRWJs25kAdXET2mbNNHu5t+KUcKA=", "narHash": "sha256-vklOOhBj5W8fii6yN4L2WY5ZeifBmsq3+mJ2wC1Pk9U=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "d479c846531fd0e1d2357c9588b8310a2b859ef2", "rev": "04f579377a32781ce57c9cf4ba2a5bcb7f53fa97",
"type": "github" "type": "github"
}, },
"original": { "original": {

52
flake.nix
View File

@ -9,26 +9,26 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; #nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
deploy-rs.url = "github:serokell/deploy-rs"; deploy-rs.url = "github:serokell/deploy-rs";
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
nix-colors.url = "github:misterio77/nix-colors"; nix-colors.url = "github:misterio77/nix-colors";
}; };
outputs = { self, nix-colors, nixpkgs, nixpkgs-unstable, home-manager outputs = { self, nix-colors, nixpkgs, home-manager
, hyprland, agenix, deploy-rs, ... }@inputs: , hyprland, agenix, deploy-rs, ... }@inputs:
let let
inherit (self) outputs; inherit (self) outputs;
lib = nixpkgs.lib; lib = nixpkgs.lib;
allowUnfree = { nixpkgs.config.allowUnfree = true; }; allowUnfree = { nixpkgs.config.allowUnfree = true; };
system = "x86_64-linux"; system = "x86_64-linux";
overlay-unstable = final: prev: { # overlay-unstable = final: prev: {
unstable = import nixpkgs-unstable { # unstable = import nixpkgs-unstable {
inherit system; # inherit system;
config.allowUnfree = true; # config.allowUnfree = true;
}; # };
}; # };
in { in {
nixosConfigurations = { nixosConfigurations = {
lkk-nix-1 = lib.nixosSystem { lkk-nix-1 = lib.nixosSystem {
@ -36,9 +36,9 @@
modules = [ modules = [
./hosts/lkk-nix-1 ./hosts/lkk-nix-1
agenix.nixosModules.default agenix.nixosModules.default
({ config, pkgs, ... }: { # ({ config, pkgs, ... }: {
nixpkgs.overlays = [ overlay-unstable ]; # nixpkgs.overlays = [ overlay-unstable ];
}) # })
]; ];
}; };
lkk-prod-1 = lib.nixosSystem { lkk-prod-1 = lib.nixosSystem {
@ -46,10 +46,10 @@
modules = [ modules = [
allowUnfree allowUnfree
./hosts/lkk-prod-1 ./hosts/lkk-prod-1
agenix.nixosModules.default # agenix.nixosModules.default
({ config, pkgs, ... }: { # ({ config, pkgs, ... }: {
nixpkgs.overlays = [ overlay-unstable ]; # nixpkgs.overlays = [ overlay-unstable ];
}) # })
]; ];
}; };
lkk-prod-2 = lib.nixosSystem { lkk-prod-2 = lib.nixosSystem {
@ -58,9 +58,9 @@
allowUnfree allowUnfree
./hosts/lkk-prod-2 ./hosts/lkk-prod-2
agenix.nixosModules.default agenix.nixosModules.default
({ config, pkgs, ... }: { # ({ config, pkgs, ... }: {
nixpkgs.overlays = [ overlay-unstable ]; # nixpkgs.overlays = [ overlay-unstable ];
}) # })
]; ];
}; };
m3-nix = lib.nixosSystem { m3-nix = lib.nixosSystem {
@ -69,9 +69,9 @@
allowUnfree allowUnfree
./hosts/m3-nix ./hosts/m3-nix
agenix.nixosModules.default agenix.nixosModules.default
({ config, pkgs, ... }: { # ({ config, pkgs, ... }: {
nixpkgs.overlays = [ overlay-unstable ]; # nixpkgs.overlays = [ overlay-unstable ];
}) # })
]; ];
}; };
}; };
@ -81,12 +81,12 @@
pkgs = nixpkgs.legacyPackages."x86_64-linux"; pkgs = nixpkgs.legacyPackages."x86_64-linux";
extraSpecialArgs = { inherit inputs nix-colors; }; extraSpecialArgs = { inherit inputs nix-colors; };
modules = [ modules = [
hyprland.homeManagerModules.default #hyprland.homeManagerModules.default
./home/users/m3tam3re/m3-nix.nix ./home/users/m3tam3re/m3-nix.nix
allowUnfree allowUnfree
({ config, pkgs, ... }: { # ({ config, pkgs, ... }: {
nixpkgs.overlays = [ overlay-unstable ]; # nixpkgs.overlays = [ overlay-unstable ];
}) # })
]; ];
}; };
# Company Root Servera # Company Root Servera

1
home/features/desktop/media.nix
View File

@ -22,6 +22,7 @@ in {
plexamp plexamp
uxplay uxplay
vlc vlc
webcord
youtube-dl youtube-dl
]; ];
}; };

2
home/features/virtualization/podman.nix
View File

@ -10,7 +10,7 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
#podman fuse-overlayfs
]; ];
}; };
} }

2
hosts/lkk-nix-1/default.nix
View File

@ -26,7 +26,7 @@
to = 3481; to = 3481;
}]; }];
}; };
programs.fish.enable = true;
age = { age = {
secrets = { secrets = {
mj-smtp-user.file = ../../secrets/mj-smtp-user.age; mj-smtp-user.file = ../../secrets/mj-smtp-user.age;

1
hosts/lkk-nix-1/services/gitea.nix
View File

@ -2,7 +2,6 @@
{ {
services.gitea = { services.gitea = {
enable = true; enable = true;
package = pkgs.unstable.gitea;
rootUrl = "https://code.lanakk.com"; rootUrl = "https://code.lanakk.com";
lfs.enable = true; lfs.enable = true;
dump = { dump = {

1
hosts/lkk-nix-1/services/invidious.nix
View File

@ -2,7 +2,6 @@
{ {
services.invidious = { services.invidious = {
enable = true; enable = true;
package = pkgs.unstable.invidious;
port = 3006; port = 3006;
domain = "video.lanakk.com"; domain = "video.lanakk.com";
}; };

8
hosts/lkk-nix-1/services/n8n.nix
View File

@ -1,12 +1,4 @@
{ config, pkgs, ... }: { { config, pkgs, ... }: {
disabledModules = [ "system/services/n8n.nix" ];
nixpkgs.overlays =
[ (self: super:
{
n8n = pkgs.unstable.n8n;
})
];
services.n8n = { services.n8n = {
enable = true; enable = true;

2
hosts/m3-nix/default.nix
View File

@ -21,7 +21,6 @@ in {
./services ./services
inputs.hyprland.nixosModules.default inputs.hyprland.nixosModules.default
]; ];
specialisation = { specialisation = {
external-display.configuration = { external-display.configuration = {
system.nixos.tags = [ "Externer-Monitor" ]; system.nixos.tags = [ "Externer-Monitor" ];
@ -118,6 +117,7 @@ in {
remotePlay.openFirewall = true; remotePlay.openFirewall = true;
dedicatedServer.openFirewall = true; dedicatedServer.openFirewall = true;
}; };
programs.fish.enable = true;
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
i18n.defaultLocale = "de_DE.utf8"; i18n.defaultLocale = "de_DE.utf8";

2
hosts/m3-nix/hardware-configuration.nix
View File

@ -54,7 +54,7 @@
lib.mkDefault config.hardware.enableRedistributableFirmware; lib.mkDefault config.hardware.enableRedistributableFirmware;
# high-resolution display # high-resolution display
hardware.video.hidpi.enable = lib.mkDefault true; #hardware.video.hidpi.enable = lib.mkDefault true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
} }

2
hosts/m3-nix/services/virtualization.nix
View File

@ -5,6 +5,6 @@
virtualisation.podman = { virtualisation.podman = {
enable = true; enable = true;
enableNvidia = true; enableNvidia = true;
defaultNetwork.dnsname.enable = true; defaultNetwork.settings.dns_enabled = true;
}; };
} }