diff --git a/flake.lock b/flake.lock index f5c8e3f..8ba508f 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1702410648, - "narHash": "sha256-U6vmxn1s0DhtBGJ57dBzDwtFVyu+P//lc9AXcXC7qv0=", + "lastModified": 1702495959, + "narHash": "sha256-xLYLHlF0wsBNQtC1FMYHhhu13lRUxFh8uEMkv5/427g=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "e22c855e000c91e9f469bbd406e5e3ae125d47f8", + "rev": "7369da9bf46df08ec2d4793f72e7000d511864e4", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1701905325, - "narHash": "sha256-lda63LmEIlDMeCgWfjr3/wb487XPllBByfrGRieyEk4=", + "lastModified": 1702479765, + "narHash": "sha256-wjNYsFhciYoJkZ/FBKvFj55k+vkLbu6C2qYQ7K+s8pI=", "owner": "nix-community", "repo": "disko", - "rev": "1144887c6f4d2dcbb2316a24364ef53e25b0fcfe", + "rev": "bd8fbc3f274288ac905bcea66bc2a5428abde458", "type": "github" }, "original": { @@ -69,11 +69,11 @@ ] }, "locked": { - "lastModified": 1702399955, - "narHash": "sha256-FnB5O1RVFzj3h7Ayf7UxFnOL1gsJuG6gn1LCTd9dKFs=", + "lastModified": 1701334333, + "narHash": "sha256-rsJ11xznoc2JSmM57bstxyas8xq8ZaEqNhQuQWyoQ/A=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "47798c4ab07d5f055bb2625010cf6d8e3f384923", + "rev": "913e44a13636fd111139ee683a6741ccb4c28672", "type": "github" }, "original": { @@ -233,12 +233,12 @@ ] }, "locked": { - "lastModified": 1702203126, - "narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=", - "rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883", - "revCount": 3178, + "lastModified": 1702423270, + "narHash": "sha256-3ZA5E+b2XBP+c9qGhWpRApzPq/PZtIPgkeEDpTBV4g8=", + "rev": "d9297efd3a1c3ebb9027dc68f9da0ac002ae94db", + "revCount": 3189, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/home-manager/0.1.3178%2Brev-defbb9c5857e157703e8fc7cf3c2ceb01cb95883/018c5337-b35a-70f9-ab26-b36c9064d16c/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/nix-community/home-manager/0.1.3189%2Brev-d9297efd3a1c3ebb9027dc68f9da0ac002ae94db/018c6056-840b-7cf1-807e-7eba8b631300/source.tar.gz" }, "original": { "type": "tarball", @@ -364,12 +364,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702151865, - "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", - "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", - "revCount": 557885, + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "revCount": 558881, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.557885%2Brev-666fc80e7b2afb570462423cb0e1cf1a3a34fedd/018c547a-1b6d-7b79-84fc-aab0c12f1b6e/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.558881%2Brev-a9bf124c46ef298113270b1f84a164865987a91c/018c5fba-8d93-798c-8bda-4b11a431ccba/source.tar.gz" }, "original": { "type": "tarball", @@ -444,11 +444,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1702233072, - "narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=", + "lastModified": 1702346276, + "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348", + "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7", "type": "github" }, "original": { @@ -513,11 +513,11 @@ }, "nur": { "locked": { - "lastModified": 1702417575, - "narHash": "sha256-89HhMpiU48+PrZW/nkYxl9A2uRt94ud/J/FIf6k0dW8=", + "lastModified": 1702547108, + "narHash": "sha256-1SZWYPXMaQdsDPrqWd4iTORb7ZnzUWPfEHACHdc+lRI=", "owner": "nix-community", "repo": "NUR", - "rev": "55ff7c9e06b3dd19be193158fb39df1a4623ea70", + "rev": "18310bf0ad74f04a57a89a70d52d78e719e46774", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3d15518..02b1497 100644 --- a/flake.nix +++ b/flake.nix @@ -128,7 +128,7 @@ }; nixosConfigurations = { nixos-pulse = nixpkgs.lib.nixosSystem { - system = system; + system = system; specialArgs = args; modules = [ @@ -143,7 +143,7 @@ ++ osModules; }; nixos-desk = nixpkgs.lib.nixosSystem { - system = system; + system = system; specialArgs = args; modules = [ @@ -167,7 +167,7 @@ ++ osModules; }; nixos-karl-kvm-guest = nixpkgs.lib.nixosSystem { - system = system; + system = system; specialArgs = args; modules = [ diff --git a/home-mods/shell/default.nix b/home-mods/shell/default.nix index 6b1fcc0..ae079df 100644 --- a/home-mods/shell/default.nix +++ b/home-mods/shell/default.nix @@ -197,6 +197,7 @@ in cmake curl direnv + filezilla fd gnutls gnumake diff --git a/os-mods/network/default.nix b/os-mods/network/default.nix index 62d45a1..c18a4f2 100644 --- a/os-mods/network/default.nix +++ b/os-mods/network/default.nix @@ -18,16 +18,19 @@ }; # security.wrappers.keybase-redirector = { - # setuid = true; - # owner = "root"; - # group = "root"; - # source = "${pkgs.kbfs}/bin/redirector"; + # setuid = true; + # owner = "root"; + # group = "root"; + # source = "${pkgs.kbfs}/bin/redirector"; # }; + environment.systemPackages = with pkgs; [ + keybase-gui + ]; services = { keybase.enable = true; - kbfs.enable = false; - kbfs.enableRedirector = false; + kbfs.enable = true; + # kbfs.enableRedirector = true; resolved = { enable = true; dnssec = "true"; diff --git a/systems/nixos-pulse/default.nix b/systems/nixos-pulse/default.nix index c713e2a..6ec8842 100644 --- a/systems/nixos-pulse/default.nix +++ b/systems/nixos-pulse/default.nix @@ -78,6 +78,7 @@ 192.168.0.245 cloud.oekonzept.net 192.168.0.245 office.oekonzept.net 192.168.0.245 llama.oekonzept.net + 192.168.0.245 netdata.oekonzept.net 192.168.0.245 nixos-karl-kvm-guest.oekonzept.de ''; interfaces = {