diff --git a/flake.lock b/flake.lock index aa9fd8a4..d315c832 100644 --- a/flake.lock +++ b/flake.lock @@ -18,27 +18,6 @@ "type": "github" } }, - "devshell_2": { - "inputs": { - "nixpkgs": [ - "nix-topology", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", - "owner": "numtide", - "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "flake-compat": { "locked": { "lastModified": 1747046372, @@ -55,22 +34,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -130,24 +93,6 @@ "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", @@ -162,7 +107,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -177,28 +122,6 @@ "type": "github" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "nix-topology", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "hardware": { "locked": { "lastModified": 1751432711, @@ -339,29 +262,6 @@ "type": "github" } }, - "nix-topology": { - "inputs": { - "devshell": "devshell_2", - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1744142264, - "narHash": "sha256-h5KyodobZm8dx/HSNN+basgdmjxrQxudjrss4gAQpZk=", - "owner": "oddlama", - "repo": "nix-topology", - "rev": "f49121cbbf4a86c560638ade406d99ee58deb7aa", - "type": "github" - }, - "original": { - "owner": "oddlama", - "repo": "nix-topology", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1722073938, @@ -414,7 +314,7 @@ "nixpkgs" ], "nuschtosSearch": "nuschtosSearch", - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1751492444, @@ -432,8 +332,8 @@ }, "nps": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_3", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", "naersk": "naersk", "nixpkgs": [ "nixpkgs" @@ -476,7 +376,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -497,33 +397,6 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore", - "nixpkgs": [ - "nix-topology", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nix-topology", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730797577, - "narHash": "sha256-SrID5yVpyUfknUTGWgYkTyvdr9J1LxUym4om3SVGPkg=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "1864030ed24a2b8b4e4d386a5eeaf0c5369e50a9", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "devshell": "devshell", @@ -531,7 +404,6 @@ "home-manager": "home-manager", "nix-alien": "nix-alien", "nix-flatpak": "nix-flatpak", - "nix-topology": "nix-topology", "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", "nps": "nps", @@ -588,21 +460,6 @@ "repo": "default", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 4027f216..73e74a80 100644 --- a/flake.nix +++ b/flake.nix @@ -58,8 +58,9 @@ # musnix.url = "github:musnix/musnix"; # musnix.inputs.nixpkgs.follows = "nixpkgs"; - nix-topology.url = "github:oddlama/nix-topology"; - nix-topology.inputs.nixpkgs.follows = "nixpkgs"; + # Network topology diagram generation + # nix-topology.url = "github:oddlama/nix-topology"; + # nix-topology.inputs.nixpkgs.follows = "nixpkgs"; # Ags for widgets (this was a terrible idea) # ags.url = "github:Aylur/ags"; @@ -108,7 +109,6 @@ overlays = [ inputs.devshell.overlays.default inputs.nur.overlays.default - inputs.nix-topology.overlays.default # inputs.emacs-overlay.overlay # Overriding specific packages from a different nixpkgs (e.g. a pull request) @@ -155,25 +155,11 @@ commonModules = [ # inputs.agenix.nixosModules.default inputs.sops-nix.nixosModules.sops - inputs.nix-topology.nixosModules.default ]; in { # Local shell for NixFlake directory devShells.${system}.default = import ./shell.nix {inherit pkgs;}; - # Output that generates a system topology diagram - topology.${system} = import inputs.nix-topology { - inherit pkgs; # Only this package set must include nix-topology.overlays.default - modules = [ - # Your own file to define global topology. - # Works in principle like a nixos module but uses different options. - ./topology/topology.nix - - # Inline module to inform topology of your existing NixOS hosts. - {inherit (self) nixosConfigurations;} - ]; - }; - # We give each configuration a (host)name to choose a configuration when rebuilding. # This makes it easy to add different configurations (e.g. for a laptop). # Usage: sudo nixos-rebuild switch --flake .#nixinator diff --git a/system/modules/mime/options.nix b/system/modules/mime/options.nix index e5b131ec..0b40d55e 100644 --- a/system/modules/mime/options.nix +++ b/system/modules/mime/options.nix @@ -224,6 +224,7 @@ example = '' [ "imv.desktop" + "org.inkscape.Inkscape.desktop" "chromium-browser.desktop" "org.kde.krita.desktop" "krita.desktop" diff --git a/system/nixinator/hardware-configuration.nix b/system/nixinator/hardware-configuration.nix index ddc78a65..f1b93609 100644 --- a/system/nixinator/hardware-configuration.nix +++ b/system/nixinator/hardware-configuration.nix @@ -94,7 +94,6 @@ swapDevices = lib.mkForce [ { device = "/var/swap"; - # size = 1024 * 32 * 2; # twice the RAM for hibernation size = 1024 * 16; # Without hibernation 4.0 GB to 0.5 x RAM } ]; diff --git a/topology/images/ProtectliVaultFW2B.png b/topology/images/ProtectliVaultFW2B.png deleted file mode 100644 index 18aee378..00000000 Binary files a/topology/images/ProtectliVaultFW2B.png and /dev/null differ diff --git a/topology/images/TPLinkTLSG108E.jpg b/topology/images/TPLinkTLSG108E.jpg deleted file mode 100644 index 5ebbac5d..00000000 --- a/topology/images/TPLinkTLSG108E.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7734164ed1e25e1d9642249a7efa8e144c344936a819d780ad14e86e795d97c2 -size 688 diff --git a/topology/topology.nix b/topology/topology.nix deleted file mode 100644 index 915dc765..00000000 --- a/topology/topology.nix +++ /dev/null @@ -1,39 +0,0 @@ -{config, ...}: let - inherit (config.lib.topology) mkInternet mkRouter mkConnection mkSwitch; -in { - # Add a node for the internet - nodes.internet = mkInternet { - connections = mkConnection "router" "wan1"; - }; - - nodes.switch = mkSwitch "Switch" { - info = "TP-Link TL-SG108E"; - image = ./images/TPLinkTLSG108E.jpg; - interfaceGroups = [["eth0" "eth1" "eth2" "eth3" "eth4" "eth5" "eth6" "eth7"]]; - # connections.eth1 = mkConnection "host1" "lan"; - # connections.eth2 = [(mkConnection "host2" "wan") (mkConnection "host3" "eth0")]; - - # any other attributes specified here are directly forwarded to the node: - interfaces.eth1.network = "home"; - }; - - # Add a router that we use to access the internet - nodes.router = mkRouter "Firewall" { - info = "Protectli Vault FW2B"; - image = ./images/ProtectliVaultFW2B.png; - interfaceGroups = [ - ["wan1"] - ["eth1"] - ]; - connections.eth1 = mkConnection "switch" "eth0"; - interfaces.eth1 = { - addresses = ["192.168.86.5"]; - network = "home"; - }; - }; - - networks.home = { - name = "Mafia Home"; - cidrv4 = "192.168.86.0/24"; - }; -}