diff --git a/data.log b/data.log deleted file mode 100644 index 5d57ec4..0000000 Binary files a/data.log and /dev/null differ diff --git a/flake.nix b/flake.nix index 10e32a7..618ef98 100644 --- a/flake.nix +++ b/flake.nix @@ -169,6 +169,7 @@ "kop-pc" = mkHost { modules = [ ./users/kopatz + #./users/testuser ./systems/pc/configuration.nix ]; }; diff --git a/base16.md b/misc-unrelated/base16.md similarity index 100% rename from base16.md rename to misc-unrelated/base16.md diff --git a/register_matrix_user.md b/misc-unrelated/register_matrix_user.md similarity index 100% rename from register_matrix_user.md rename to misc-unrelated/register_matrix_user.md diff --git a/modules/nix/settings.nix b/modules/nix/settings.nix index 1ed4290..352cc8f 100644 --- a/modules/nix/settings.nix +++ b/modules/nix/settings.nix @@ -48,8 +48,9 @@ in min-free = ${toString (100 * 1024 * 1024)} max-free = ${toString (1024 * 1024 * 1024)} ''; + #nixPath = [ "nixpkgs=flake:nixpkgs" ]; + #nixPath = [ "nixpkgs=${pkgsVersion.outPath}" ]; }; - #nix.nixPath = [ "nixpkgs=flake:nixpkgs" ]; nixpkgs.config.allowUnfree = true; ##home-manager.users.${config.mainUser.name}.home.sessionVariables = { ## NIX_PATH = "nixpkgs=flake:nixpkgs$\{NIX_PATH:+:$NIX_PATH}"; diff --git a/search.sh b/search.sh deleted file mode 100755 index 1923719..0000000 --- a/search.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -pdfgrep -h -i -C 10 "$1" /synced/fh/cloud_computing/scriptum/* diff --git a/users/option.nix b/users/option.nix index 8c20e64..a634d0b 100644 --- a/users/option.nix +++ b/users/option.nix @@ -26,25 +26,5 @@ description = "Public key of the user"; }; }; - custom.user = { - name = lib.mkOption { - default = "mainuser"; - description = '' - username - ''; - }; - layout = lib.mkOption { - default = "de"; - description = "keyboard layout"; - }; - variant = lib.mkOption { - default = ""; - description = "keyboard variant"; - }; - sshKey = lib.mkOption { - default = throw "No ssh key specified"; - description = "Public key of the user"; - }; - }; }; } diff --git a/users/testuser/default.nix b/users/testuser/default.nix new file mode 100644 index 0000000..0fe68f5 --- /dev/null +++ b/users/testuser/default.nix @@ -0,0 +1,19 @@ +{ + inputs, + pkgs, + lib, + config, + ... +}: +{ + imports = [ ../default.nix ]; + + programs.zsh.enable = true; + users.users.testuser = { + isNormalUser = true; + initialPassword = "1"; + description = "Test user"; + shell = pkgs.zsh; + openssh.authorizedKeys.keys = [ config.mainUser.sshKey ]; + }; +} diff --git a/tsukasa.jpg b/wallpaper/tsukasa.jpg similarity index 100% rename from tsukasa.jpg rename to wallpaper/tsukasa.jpg