diff --git a/flake.lock b/flake.lock index 2306b98..83727a8 100644 --- a/flake.lock +++ b/flake.lock @@ -16,21 +16,6 @@ "type": "github" } }, - "flake-utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "intake": { "inputs": { "flake-compat": [ @@ -96,46 +81,6 @@ "type": "github" } }, - "nixos-wsl": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs-2305" - ] - }, - "locked": { - "lastModified": 1671480147, - "narHash": "sha256-IzWdZL8jMNtyKsXXJjn2L4MsBeR52WBdhciPw4latHU=", - "owner": "nix-community", - "repo": "NixOS-WSL", - "rev": "577d7919e4380e6905e69d4a5f8f48a41ca37187", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NixOS-WSL", - "type": "github" - } - }, - "nixpkgs-2305": { - "locked": { - "lastModified": 1685566663, - "narHash": "sha256-btHN1czJ6rzteeCuE/PNrdssqYD2nIA4w48miQAFloM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4ecab3273592f27479a583fb6d975d4aba3486fe", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "23.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-2311": { "locked": { "lastModified": 1701282334, @@ -173,8 +118,6 @@ "flake-compat": "flake-compat", "intake": "intake", "intake-sources": "intake-sources", - "nixos-wsl": "nixos-wsl", - "nixpkgs-2305": "nixpkgs-2305", "nixpkgs-2311": "nixpkgs-2311", "nixpkgs-2405": "nixpkgs-2405" } diff --git a/flake.nix b/flake.nix index 5efb487..4883cd6 100644 --- a/flake.nix +++ b/flake.nix @@ -1,17 +1,11 @@ { inputs = { - nixpkgs-2305.url = "github:NixOS/nixpkgs/23.05"; nixpkgs-2311.url = "github:NixOS/nixpkgs/23.11"; nixpkgs-2405.url = "github:NixOS/nixpkgs/24.05"; flake-compat = { url = "github:edolstra/flake-compat"; flake = false; }; - nixos-wsl = { - url = "github:nix-community/NixOS-WSL"; - inputs.nixpkgs.follows = "nixpkgs-2305"; - inputs.flake-compat.follows = "flake-compat"; - }; intake = { url = "git+ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake.git"; inputs.nixpkgs.follows = "nixpkgs-2405"; @@ -25,11 +19,9 @@ outputs = { self, - nixpkgs-2305, nixpkgs-2311, nixpkgs-2405, flake-compat, - nixos-wsl, intake, intake-sources, }@inputs: { @@ -82,13 +74,6 @@ ./machine/imperium ]; }; - stagirite = nixpkgs-2305.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - nixos-wsl.nixosModules.wsl - ./machine/stagirite - ]; - }; unfolder = nixpkgs-2405.lib.nixosSystem { system = "x86_64-linux"; modules = [ diff --git a/machine/stagirite/default.nix b/machine/stagirite/default.nix deleted file mode 100644 index 639596e..0000000 --- a/machine/stagirite/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib, pkgs, config, modulesPath, ... }: - -with lib; -let - wp = { addr = "localhost"; port = 4567; }; -in -{ - imports = [ - "${modulesPath}/profiles/minimal.nix" - ]; - - wsl = { - enable = true; - wslConf.automount.root = "/mnt"; - defaultUser = "nixos"; - startMenuLaunchers = false; - }; - - #system.stateVersion = "21.11"; - - networking.hostName = "stagirite"; - beatific.defaults.tvbSync = false; - - fileSystems.winssh = { - device = "C:/Users/tvb/.ssh"; - fsType = "drvfs"; - options = [ "ro" "noatime" "uid=1000" "gid=100" "case=off" "umask=0077" "fmask=0177" "metadata" ]; - depends = [ "/" ]; - mountPoint = "/home/nixos/.ssh"; - }; - - documentation.enable = true; - documentation.man.enable = true; - documentation.dev.enable = true; - - # Enable nix flakes - nix.package = pkgs.nixFlakes; - nix.extraOptions = '' - experimental-features = nix-command flakes - ''; - - environment.systemPackages = - [ - pkgs.vim pkgs.git - pkgs.nmap - (pkgs.python3.withPackages (pypkgs: [ pypkgs.poetry ])) - pkgs.htop pkgs.wget - pkgs.gcc - ]; - environment.variables = { - EDITOR = "vim"; - }; - - #services.code-server.enable = true; - #services.code-server.extraPackages = [ pkgs.bashInteractive ]; - - services.openssh.enable = true; - - #services.wordpress.webserver = "nginx"; - #services.wordpress.sites.${wp.addr} = { - # extraConfig = '' - # define('WPSITEURL','http://${wp.addr}:${toString wp.port}/'); - # define('WPHOME','http://${wp.addr}:${toString wp.port}/'); - # ''; - #}; - #services.nginx.virtualHosts.${wp.addr} = { - # listen = [ wp ]; - #}; -}