diff --git a/flake.lock b/flake.lock index 05504d6..72a73de 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1750173260, - "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", + "lastModified": 1754433428, + "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", "owner": "ryantm", "repo": "agenix", - "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", + "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", "type": "github" }, "original": { @@ -88,11 +88,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1749105467, - "narHash": "sha256-hXh76y/wDl15almBcqvjryB50B0BaiXJKk20f314RoE=", + "lastModified": 1756719547, + "narHash": "sha256-N9gBKUmjwRKPxAafXEk1EGadfk2qDZPBQp4vXWPHINQ=", "owner": "serokell", "repo": "deploy-rs", - "rev": "6bc76b872374845ba9d645a2f012b764fecd765f", + "rev": "125ae9e3ecf62fb2c0fd4f2d894eb971f1ecaed2", "type": "github" }, "original": { @@ -108,11 +108,11 @@ ] }, "locked": { - "lastModified": 1753140376, - "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", + "lastModified": 1758287904, + "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", "owner": "nix-community", "repo": "disko", - "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", + "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", "type": "github" }, "original": { @@ -180,6 +180,27 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -208,11 +229,11 @@ ] }, "locked": { - "lastModified": 1755914636, - "narHash": "sha256-VJ+Gm6YsHlPfUCpmRQxvdiZW7H3YPSrdVOewQHAhZN8=", + "lastModified": 1759711004, + "narHash": "sha256-B39NxeKCnK3DJlmJKIts6njcXcVVASLUChDNmRl4dxQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "8b55a6ac58b678199e5bba701aaff69e2b3281c0", + "rev": "6f4021da5d2bb5ea7cb782ff413ecb7062066820", "type": "github" }, "original": { @@ -229,11 +250,11 @@ ] }, "locked": { - "lastModified": 1753288231, - "narHash": "sha256-WcMW9yUDfER8kz4NdCaaI/ep0Ef91L+Nf7MetNzHZc4=", + "lastModified": 1758463745, + "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "owner": "nix-community", "repo": "home-manager", - "rev": "7b5a978e00273b8676c530c03d315f5b75fae564", + "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "type": "github" }, "original": { @@ -243,18 +264,36 @@ "type": "github" } }, + "m3ta-nixpkgs": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1759661061, + "narHash": "sha256-LAd1fNNIL19HrOm1cVeoKP5v8si932HsX1ZDwJh9O8o=", + "ref": "refs/heads/master", + "rev": "27d92a238ba9b9df117680c2080e082a2732bfc5", + "revCount": 7, + "type": "git", + "url": "https://code.m3ta.dev/m3tam3re/nixpkgs" + }, + "original": { + "type": "git", + "url": "https://code.m3ta.dev/m3tam3re/nixpkgs" + } + }, "nix-ai-tools": { "inputs": { "blueprint": "blueprint", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1759115451, - "narHash": "sha256-cjQAR33C5QLo0UIpzc5G0kJSU5nPFYxo2ZJQlusgyLQ=", + "lastModified": 1759718309, + "narHash": "sha256-ciD2siuGn9iI6Kp4eIWcFwy8neop39GNfzHMXPygsEA=", "owner": "numtide", "repo": "nix-ai-tools", - "rev": "10c57241916bd4be938d0cf9b110849db88b972e", + "rev": "11f67f2bd1c839ba5c907bb919508816879dab35", "type": "github" }, "original": { @@ -316,11 +355,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1753176709, - "narHash": "sha256-nkfLkqFdV5XUV2fCibvkKpEg0c+s5UP6VErL4NWT4t4=", + "lastModified": 1759222546, + "narHash": "sha256-NqwPJ95lhBNnMqkEFFQB3zaD7rCSBaGwX/MhykTbEno=", "owner": "nix-community", "repo": "nixos-anywhere", - "rev": "37cd5408a443cbba2e377d634e8b161b9a7af64f", + "rev": "5d57604924b1c63efd87b8552f9685aec45c792d", "type": "github" }, "original": { @@ -372,16 +411,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745391562, - "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "lastModified": 1754028485, + "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "rev": "59e69648d345d6e8fef86158c555730fa12af9de", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -403,11 +442,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -435,11 +474,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1758690382, - "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e643668fd71b949c53f8626614b21ff71a07379d", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -451,11 +490,27 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1753115646, - "narHash": "sha256-yLuz5cz5Z+sn8DRAfNkrd2Z1cV6DaYO9JMrEz4KZo/c=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1759580034, + "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "92c2e04a475523e723c67ef872d8037379073681", + "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", "type": "github" }, "original": { @@ -465,6 +520,27 @@ "type": "github" } }, + "nur": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1759724112, + "narHash": "sha256-42DBBV0eLlIHwu+xNX0xNcoFCX7hqkKjAs5kgxZZi/w=", + "owner": "nix-community", + "repo": "NUR", + "rev": "af3cd64344dd497054e393e288bdb32cc9621e7f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -472,11 +548,13 @@ "disko": "disko", "home-manager": "home-manager_2", "home-manager-unstable": "home-manager-unstable", + "m3ta-nixpkgs": "m3ta-nixpkgs", "nix-ai-tools": "nix-ai-tools", "nix-colors": "nix-colors", "nixos-anywhere": "nixos-anywhere", - "nixpkgs": "nixpkgs_4", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs": "nixpkgs_5", + "nixpkgs-unstable": "nixpkgs-unstable", + "nur": "nur" } }, "systems": { diff --git a/flake.nix b/flake.nix index d617b99..fe54fe3 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,13 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + m3ta-nixpkgs.url = "git+https://code.m3ta.dev/m3tam3re/nixpkgs"; + + nur = { + url = "github:nix-community/NUR"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; @@ -46,6 +53,8 @@ deploy-rs, home-manager, nixpkgs, + m3ta-nixpkgs, + nur, ... } @ inputs: let inherit (self) outputs; diff --git a/home/features/desktop/default.nix b/home/features/desktop/default.nix index 9d9d31b..e257b25 100644 --- a/home/features/desktop/default.nix +++ b/home/features/desktop/default.nix @@ -96,6 +96,7 @@ hyprpaper-random hyprpanel launch-webapp + rustdesk seahorse sushi # glib diff --git a/home/features/desktop/hyprland.nix b/home/features/desktop/hyprland.nix index 732153e..421de69 100644 --- a/home/features/desktop/hyprland.nix +++ b/home/features/desktop/hyprland.nix @@ -126,10 +126,6 @@ in { new_status = "master"; }; - gestures = { - workspace_swipe = false; - }; - device = [ { name = "epic-mouse-v1"; diff --git a/home/jannik.mueller/home.nix b/home/jannik.mueller/home.nix index 9fe314f..81a5902 100644 --- a/home/jannik.mueller/home.nix +++ b/home/jannik.mueller/home.nix @@ -45,8 +45,8 @@ programs.git = { enable = true; difftastic.enable = true; - userName = "sascha.koenig"; - userEmail = "sascha.koenig@azintec.com"; + userName = "jannik.mueller"; + userEmail = "jannik.mueller@azintec.com"; aliases = { st = "status"; logd = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"; @@ -62,8 +62,8 @@ enable = true; settings = { user = { - email = "sascha.koenig@azintec.com"; - name = "Sascha Koenig"; + email = "jannik.mueller@azintec.com"; + name = "Jannik Mueller"; }; }; }; @@ -105,15 +105,15 @@ matchBlocks = { "git.az-gruppe.com" = { hostname = "152.53.186.119"; - user = "sascha.koenig"; + user = "jannik.mueller"; port = 2022; - identityFile = "~/.ssh/sascha.koenig"; + identityFile = "~/.ssh/jannik.mueller"; }; "AZ-CLD-1" = { hostname = "152.53.186.119"; - user = "sascha.koenig"; + user = "jannik.mueller"; port = 2022; - identityFile = "~/.ssh/sascha.koenig"; + identityFile = "~/.ssh/jannik.mueller"; }; }; }; diff --git a/hosts/AZ-CLD-1/services/postgres.nix b/hosts/AZ-CLD-1/services/postgres.nix index 0a762a5..a9846b0 100644 --- a/hosts/AZ-CLD-1/services/postgres.nix +++ b/hosts/AZ-CLD-1/services/postgres.nix @@ -30,6 +30,10 @@ CREATE DATABASE librechat_rag_dev; ALTER DATABASE librechat_rag_dev OWNER to librechat_rag_dev; + CREATE USER metabase WITH ENCRYPTED PASSWORD 'metabase'; + CREATE DATABASE metabase; + ALTER DATABASE metabase OWNER to metabase; + CREATE USER n8n WITH ENCRYPTED PASSWORD 'n8n'; CREATE DATABASE n8n; ALTER DATABASE n8n OWNER to n8n; @@ -45,6 +49,7 @@ authentication = pkgs.lib.mkOverride 10 '' # Local connections (Unix socket) local all postgres peer + local az_test az_test scram-sha-256 local metabase metabase scram-sha-256 local n8n n8n scram-sha-256 local outline outline scram-sha-256 @@ -55,6 +60,9 @@ host all postgres 127.0.0.1/32 scram-sha-256 host all postgres ::1/128 scram-sha-256 + host az_test az_test 127.0.0.1/32 scram-sha-256 + host az_test az_test ::1/128 scram-sha-256 + host outline outline 127.0.0.1/32 scram-sha-256 host outline outline ::1/128 scram-sha-256 diff --git a/hosts/AZLT124-L/programs.nix b/hosts/AZLT124-L/programs.nix index cf4145d..1331894 100644 --- a/hosts/AZLT124-L/programs.nix +++ b/hosts/AZLT124-L/programs.nix @@ -28,7 +28,6 @@ obs-vaapi # obs-vertical-canvas obs-vkcapture - obs-webkitgtk wlrobs ]; }; diff --git a/hosts/common/default.nix b/hosts/common/default.nix index 4d3d970..0c3fb12 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -23,6 +23,8 @@ outputs.overlays.modifications outputs.overlays.unstable-packages + inputs.nur.overlays.default + inputs.m3ta-nixpkgs.overlays.default # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default diff --git a/hosts/common/users/jannik.mueller.nix b/hosts/common/users/jannik.mueller.nix index 912ca59..bed95d1 100644 --- a/hosts/common/users/jannik.mueller.nix +++ b/hosts/common/users/jannik.mueller.nix @@ -22,6 +22,6 @@ ]; packages = [inputs.home-manager.packages.${pkgs.system}.default]; }; - home-manager.users."sascha.koenig" = + home-manager.users."jannik.mueller" = import ../../../home/jannik.mueller/${config.networking.hostName}.nix; } diff --git a/overlays/default.nix b/overlays/default.nix index fe194c0..f0cb062 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -11,7 +11,9 @@ # https://nixos.wiki/wiki/Overlays modifications = final: prev: { n8n = import ./mods/n8n.nix {inherit prev;}; - + vivaldi = prev.vivaldi.override { + commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland"; + }; # example = prev.example.overrideAttrs (oldAttrs: rec { # ... # });