From 2ea9051688fa838936a69db7b27df2fa0bbb85b6 Mon Sep 17 00:00:00 2001 From: Whovian9369 Date: Mon, 13 May 2024 23:31:53 -0400 Subject: [PATCH] Remove some outdated files that git was still holding... for some reason. --- .old/flake.nix | 125 --------------------------------------- system/configuration.nix | 47 --------------- system/packages.nix | 52 ---------------- system/users.nix | 22 ------- 4 files changed, 246 deletions(-) delete mode 100644 .old/flake.nix delete mode 100644 system/configuration.nix delete mode 100644 system/packages.nix delete mode 100644 system/users.nix diff --git a/.old/flake.nix b/.old/flake.nix deleted file mode 100644 index 78424fc..0000000 --- a/.old/flake.nix +++ /dev/null @@ -1,125 +0,0 @@ -{ - description = "Whovian9369's WSL NixOS Config"; - inputs = { - - ### Basically required - nixpkgs = { - url = "github:NixOS/nixpkgs/nixos-unstable"; - }; - - nixos-wsl = { - url = "github:nix-community/NixOS-WSL/main"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; - - ### My extra inputs - - agenix = { - url = "github:ryantm/agenix"; - inputs.nixpkgs.follows = "nixpkgs"; - # Optional, not necessary for the module - inputs.darwin.follows = ""; - # Optionally choose not to download darwin deps - # (saves some resources on Linux) - inputs.systems.follows = "nix-systems_default"; - inputs.home-manager.follows = "home-manager"; - }; - - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - my_packages = { - url = "/home/whovian/.flakes"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - xil = { - url = "github:Qyriad/Xil"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; - - nix-index-database = { - url = "github:nix-community/nix-index-database"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - ######### - # Extra inputs that I am adding just to make my life easier, - # but don't like that they're included >:( - ######### - - # I don't like `flake-utils`, but so many things use it that I might as - # well only keep a single version of it. - flake-utils = { - url = "github:numtide/flake-utils"; - inputs.systems.follows = "nix-systems_default"; - }; - - # Ditto to github:nix-systems/default - nix-systems_default = { - url = "github:nix-systems/default"; - }; - - - }; # inputs - - outputs = { - # Needed - self, nixpkgs, nixos-wsl, - # Added by me - agenix, home-manager, my_packages, nix-index-database, xil, ... }: - { - nixosConfigurations = { - testing-wsl = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./system/configuration.nix - nixos-wsl.nixosModules.wsl - home-manager.nixosModules.home-manager - { - system.configurationRevision = self.rev or self.dirtyRev or "dirty"; - - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs = { - inherit my_packages; - inherit xil; - my_pkgs = my_packages.packages.x86_64-linux; - system = "x86_64-linux"; - }; - - sharedModules = [ - # ./home/home.nix - agenix.homeManagerModules.default - nix-index-database.hmModules.nix-index - ]; - - users.whovian = import ./home/home.nix; - - # users.whovian.home.packages = [ - # agenix.packages.x86_64-linux.default - # ]; - /* - home-manager.lib.homeManagerConfiguration { - # configuration = import ./home/home.nix; - # system = "x86_64-linux"; - # pkgs = import nixpkgs { - # system = "x86_64-linux"; - # config = { - # allowUnfree = true; - # }; - # }; - }; - */ - }; - } - ]; - }; - }; - }; -} diff --git a/system/configuration.nix b/system/configuration.nix deleted file mode 100644 index d32d741..0000000 --- a/system/configuration.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, - pkgs, - config, - modulesPath, - nixos-wsl, - ... -}: - -{ - imports = [ - ./packages.nix - ./users.nix - ]; - - wsl = { - enable = true; - defaultUser = "whovian"; - startMenuLaunchers = false; - wslConf = { - automount = { - root = "/mnt"; - }; - }; - }; - - networking.hostName = "nixos-wsl"; - - # Enable nix flakes - nix.settings.experimental-features = [ - "nix-command" - "flakes" - ]; - - time.timeZone = "America/New_York"; - - /* - Add environment.pathsToLink for auto-completion for system packages (e.g. systemd). - Appears to be required due to [GitHub - nix-community/home-manager]: - https://github.com/nix-community/home-manager/blob/c781b28add41b74423ab2e64496d4fc91192e13a/modules/programs/zsh.nix#L348-L358 - [/modules/programs/zsh.nix] - https://github.com/nix-community/home-manager/issues/3521#issuecomment-1367197995 - [Issue #3521] - */ - environment.pathsToLink = [ "/share/zsh" ]; - - system.stateVersion = "22.05"; -} diff --git a/system/packages.nix b/system/packages.nix deleted file mode 100644 index 7316143..0000000 --- a/system/packages.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, agenix, pkgs, config, modulesPath, ... }: -{ - environment.systemPackages = [ - pkgs.file - pkgs.xterm - # `agenix` is currently added via - # ".nixos-wsl.modules.environment.systemPackages" - ]; - - - nixpkgs = { - config = { - allowUnfree = true; - }; - }; - - programs = { - zsh = { - enable = true; - }; - nano = { - enable = true; - }; - - # I haven't figured out how to get `cdemu` properly working (in WSL), so - # I'm just going to leave it as `programs.cdemu.enable = false;` for now. - - cdemu = { - enable = false; - group = "cdrom"; - gui = false; - image-analyzer = false; - }; - }; - - # `documentation.man.generateCaches` seems to be mainly useful for `whatis`, - # but I couldn't really get it working well. - # From what I can tell, it depends on a package being installed via - # `environment.systemPackages`, *and* for that package to have a manpage. - # That's kinda useless for me since I've been mostly installing stuff via - # `home-manager`, sooooooooo... - /* - documentation = { - nixos = { - includeAllModules = true; - }; - man = { - generateCaches = true; - }; - }; - */ -} diff --git a/system/users.nix b/system/users.nix deleted file mode 100644 index cc1664b..0000000 --- a/system/users.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, - pkgs, - config, - modulesPath, - ... -}: -{ - users = { - users = { - whovian = { - name = "whovian"; - description = "Whovian9369"; - extraGroups = [ - "wheel" - "cdrom" - ]; - shell = pkgs.zsh; - initialPassword = "abcde"; # I need to log in somehow - }; - }; - }; -}