diff --git a/flake.lock b/flake.lock index acb752a..8999b03 100644 --- a/flake.lock +++ b/flake.lock @@ -101,11 +101,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1680667162, - "narHash": "sha256-2vgxK4j42y73S3XB2cThz1dSEyK9J9tfu4mhuEfAw68=", + "lastModified": 1681250798, + "narHash": "sha256-fQMROyKzPFBPqJy9J4ffywm02ZuqAI0GW1O1QibVpdQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "440faf5ae472657ef2d8cc7756d77b6ab0ace68d", + "rev": "28698126bd825aff21cae9ffd15cf83e169051b0", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1681044500, - "narHash": "sha256-jXuwPWHr5Yywc0T40NsJ8LyPjjxEnJgo44wXgb9JZc8=", + "lastModified": 1681303095, + "narHash": "sha256-0lj5ZGMhXdeYbbQQ5Y0fv0OcKe0zXfn4H2VOn31l/9o=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "046ad79d11dbccc90ade48d63aaa340655d999fb", + "rev": "efee6a1cda278b8589bfe335c66d8fb272027bca", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1680997116, - "narHash": "sha256-nNyoatiHmTMczrCoHCH2LIRfSF8n9ZPZ1O7WNMxcbR4=", + "lastModified": 1681065697, + "narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "d7d403b711b60e8136295b0d4229e89a115e80cc", + "rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd", "type": "github" }, "original": { @@ -206,22 +206,6 @@ "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": { "locked": { "lastModified": 1671417167, @@ -256,16 +240,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1680865339, - "narHash": "sha256-H6rmJ1CyJ3Q5ZyoLMYq/UEYMS9Q1orJjRpWiQ47HudE=", - "owner": "NixOS", + "lastModified": 1681217261, + "narHash": "sha256-RbxCHWN3Vhyv/WEsXcJlDwF7bpvZ9NxDjfSouQxXEKo=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "0040164e473509b4aee6aedb3b923e400d6df10b", + "rev": "3fb8eedc450286d5092e4953118212fa21091b3b", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-22.11", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -277,8 +261,7 @@ "home-manager": "home-manager", "hyprland": "hyprland", "nix-colors": "nix-colors", - "nixpkgs": "nixpkgs_4", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs": "nixpkgs_4" } }, "utils": { @@ -341,11 +324,11 @@ ] }, "locked": { - "lastModified": 1673116118, - "narHash": "sha256-eR0yDSkR2XYMesfdRWJs25kAdXET2mbNNHu5t+KUcKA=", + "lastModified": 1681127512, + "narHash": "sha256-vklOOhBj5W8fii6yN4L2WY5ZeifBmsq3+mJ2wC1Pk9U=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "d479c846531fd0e1d2357c9588b8310a2b859ef2", + "rev": "04f579377a32781ce57c9cf4ba2a5bcb7f53fa97", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 38635f8..f440f1a 100644 --- a/flake.nix +++ b/flake.nix @@ -9,26 +9,26 @@ inputs.nixpkgs.follows = "nixpkgs"; }; agenix.url = "github:ryantm/agenix"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + #nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; deploy-rs.url = "github:serokell/deploy-rs"; hyprland.url = "github:hyprwm/Hyprland"; 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: let inherit (self) outputs; lib = nixpkgs.lib; allowUnfree = { nixpkgs.config.allowUnfree = true; }; system = "x86_64-linux"; - overlay-unstable = final: prev: { - unstable = import nixpkgs-unstable { - inherit system; - config.allowUnfree = true; - }; - }; + # overlay-unstable = final: prev: { + # unstable = import nixpkgs-unstable { + # inherit system; + # config.allowUnfree = true; + # }; + # }; in { nixosConfigurations = { lkk-nix-1 = lib.nixosSystem { @@ -36,9 +36,9 @@ modules = [ ./hosts/lkk-nix-1 agenix.nixosModules.default - ({ config, pkgs, ... }: { - nixpkgs.overlays = [ overlay-unstable ]; - }) + # ({ config, pkgs, ... }: { + # nixpkgs.overlays = [ overlay-unstable ]; + # }) ]; }; lkk-prod-1 = lib.nixosSystem { @@ -46,10 +46,10 @@ modules = [ allowUnfree ./hosts/lkk-prod-1 - agenix.nixosModules.default - ({ config, pkgs, ... }: { - nixpkgs.overlays = [ overlay-unstable ]; - }) + # agenix.nixosModules.default + # ({ config, pkgs, ... }: { + # nixpkgs.overlays = [ overlay-unstable ]; + # }) ]; }; lkk-prod-2 = lib.nixosSystem { @@ -58,9 +58,9 @@ allowUnfree ./hosts/lkk-prod-2 agenix.nixosModules.default - ({ config, pkgs, ... }: { - nixpkgs.overlays = [ overlay-unstable ]; - }) + # ({ config, pkgs, ... }: { + # nixpkgs.overlays = [ overlay-unstable ]; + # }) ]; }; m3-nix = lib.nixosSystem { @@ -69,9 +69,9 @@ allowUnfree ./hosts/m3-nix agenix.nixosModules.default - ({ config, pkgs, ... }: { - nixpkgs.overlays = [ overlay-unstable ]; - }) + # ({ config, pkgs, ... }: { + # nixpkgs.overlays = [ overlay-unstable ]; + # }) ]; }; }; @@ -81,12 +81,12 @@ pkgs = nixpkgs.legacyPackages."x86_64-linux"; extraSpecialArgs = { inherit inputs nix-colors; }; modules = [ - hyprland.homeManagerModules.default + #hyprland.homeManagerModules.default ./home/users/m3tam3re/m3-nix.nix allowUnfree - ({ config, pkgs, ... }: { - nixpkgs.overlays = [ overlay-unstable ]; - }) + # ({ config, pkgs, ... }: { + # nixpkgs.overlays = [ overlay-unstable ]; + # }) ]; }; # Company Root Servera diff --git a/home/features/desktop/media.nix b/home/features/desktop/media.nix index dc3f848..e110d85 100644 --- a/home/features/desktop/media.nix +++ b/home/features/desktop/media.nix @@ -22,6 +22,7 @@ in { plexamp uxplay vlc + webcord youtube-dl ]; }; diff --git a/home/features/virtualization/podman.nix b/home/features/virtualization/podman.nix index 5c99ee3..fd5984f 100644 --- a/home/features/virtualization/podman.nix +++ b/home/features/virtualization/podman.nix @@ -10,7 +10,7 @@ in { config = mkIf cfg.enable { home.packages = with pkgs; [ - #podman + fuse-overlayfs ]; }; } diff --git a/hosts/lkk-nix-1/default.nix b/hosts/lkk-nix-1/default.nix index 31425d6..383b94f 100644 --- a/hosts/lkk-nix-1/default.nix +++ b/hosts/lkk-nix-1/default.nix @@ -26,7 +26,7 @@ to = 3481; }]; }; - + programs.fish.enable = true; age = { secrets = { mj-smtp-user.file = ../../secrets/mj-smtp-user.age; diff --git a/hosts/lkk-nix-1/services/gitea.nix b/hosts/lkk-nix-1/services/gitea.nix index 29d753d..1affefd 100644 --- a/hosts/lkk-nix-1/services/gitea.nix +++ b/hosts/lkk-nix-1/services/gitea.nix @@ -2,7 +2,6 @@ { services.gitea = { enable = true; - package = pkgs.unstable.gitea; rootUrl = "https://code.lanakk.com"; lfs.enable = true; dump = { diff --git a/hosts/lkk-nix-1/services/invidious.nix b/hosts/lkk-nix-1/services/invidious.nix index 5f12f3c..83ba1d5 100644 --- a/hosts/lkk-nix-1/services/invidious.nix +++ b/hosts/lkk-nix-1/services/invidious.nix @@ -2,7 +2,6 @@ { services.invidious = { enable = true; - package = pkgs.unstable.invidious; port = 3006; domain = "video.lanakk.com"; }; diff --git a/hosts/lkk-nix-1/services/n8n.nix b/hosts/lkk-nix-1/services/n8n.nix index 58fa0b2..c0da7c5 100644 --- a/hosts/lkk-nix-1/services/n8n.nix +++ b/hosts/lkk-nix-1/services/n8n.nix @@ -1,12 +1,4 @@ { config, pkgs, ... }: { - disabledModules = [ "system/services/n8n.nix" ]; - - nixpkgs.overlays = - [ (self: super: - { - n8n = pkgs.unstable.n8n; - }) - ]; services.n8n = { enable = true; diff --git a/hosts/m3-nix/default.nix b/hosts/m3-nix/default.nix index ef7ab7d..ae57785 100644 --- a/hosts/m3-nix/default.nix +++ b/hosts/m3-nix/default.nix @@ -21,7 +21,6 @@ in { ./services inputs.hyprland.nixosModules.default ]; - specialisation = { external-display.configuration = { system.nixos.tags = [ "Externer-Monitor" ]; @@ -118,6 +117,7 @@ in { remotePlay.openFirewall = true; dedicatedServer.openFirewall = true; }; + programs.fish.enable = true; time.timeZone = "Europe/Berlin"; i18n.defaultLocale = "de_DE.utf8"; diff --git a/hosts/m3-nix/hardware-configuration.nix b/hosts/m3-nix/hardware-configuration.nix index bf51559..d4440ff 100644 --- a/hosts/m3-nix/hardware-configuration.nix +++ b/hosts/m3-nix/hardware-configuration.nix @@ -54,7 +54,7 @@ lib.mkDefault config.hardware.enableRedistributableFirmware; # high-resolution display - hardware.video.hidpi.enable = lib.mkDefault true; + #hardware.video.hidpi.enable = lib.mkDefault true; hardware.bluetooth.enable = true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } diff --git a/hosts/m3-nix/services/virtualization.nix b/hosts/m3-nix/services/virtualization.nix index 81f3953..91ff9aa 100644 --- a/hosts/m3-nix/services/virtualization.nix +++ b/hosts/m3-nix/services/virtualization.nix @@ -5,6 +5,6 @@ virtualisation.podman = { enable = true; enableNvidia = true; - defaultNetwork.dnsname.enable = true; + defaultNetwork.settings.dns_enabled = true; }; }