From da1a963d51be5ed5c1a00ee75563b2c904c299e6 Mon Sep 17 00:00:00 2001 From: materus Date: Tue, 31 Oct 2023 14:40:57 +0100 Subject: [PATCH] configurations: update --- configurations/host/materusPC/tmp.nix | 11 +++-- configurations/profile/os/default.nix | 57 ++++++++++++++++++++++- flake.lock | 66 +++++++++++++-------------- 3 files changed, 95 insertions(+), 39 deletions(-) diff --git a/configurations/host/materusPC/tmp.nix b/configurations/host/materusPC/tmp.nix index 40d0894..12c8500 100644 --- a/configurations/host/materusPC/tmp.nix +++ b/configurations/host/materusPC/tmp.nix @@ -1,9 +1,9 @@ { config, pkgs, lib, materusArg, ... }: { - virtualisation.lxc.enable = false; - virtualisation.lxc.lxcfs.enable = false; - virtualisation.lxd.enable = false; + virtualisation.lxc.enable = true; + virtualisation.lxc.lxcfs.enable = true; + virtualisation.lxd.enable = true; #virtualisation.lxd.recommendedSysctlSettings = true; programs.corectrl.enable = true; @@ -117,7 +117,10 @@ XDG_CONFIG_HOME = "\${HOME}/.config"; XDG_BIN_HOME = "\${HOME}/.local/bin"; XDG_DATA_HOME = "\${HOME}/.local/share"; - + GTK_IM_MODULE="fcitx"; + QT_IM_MODULE="fcitx"; + XMODIFIERS="@im=fcitx"; + SDL_IM_MODULE="fcitx"; SDL_AUDIODRIVER = "pipewire"; #SSH_ASKPASS_REQUIRE = "prefer"; diff --git a/configurations/profile/os/default.nix b/configurations/profile/os/default.nix index 2b7b523..e927032 100644 --- a/configurations/profile/os/default.nix +++ b/configurations/profile/os/default.nix @@ -1,9 +1,62 @@ { config, pkgs, ... }: -{ +{ imports = [ ./nix.nix ./fonts.nix - + ./games ]; +/* + users.users.nixos-rebuild = { + #isSystemUser = true; + isNormalUser = true; + group = "nixos-rebuild"; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPEDY+H8Hc/RSLE064AAh8IojvqxPd8BE5gec2aOfYMh materus@podkos.pl" + ]; + home = "/tmp/nixos-rebuild"; + }; + users.groups.nixos-rebuild = { }; + security.sudo.extraRules = [ + { + users = [ "nixos-rebuild" ]; + commands = let path = "/run/current-system/sw/bin/"; in + [ + { + command = + "${path}nixos-rebuild"; + options = [ "NOPASSWD" ]; + } + { + command = + "${path}nix-store"; + options = [ "NOPASSWD" ]; + } + { + command = + "${path}nix-env"; + options = [ "NOPASSWD" ]; + } + { + command = + "${path}nix-build"; + options = [ "NOPASSWD" ]; + } + { + command = + "${path}nix-instantiate"; + options = [ "NOPASSWD" ]; + } + { + command = + "${path}nix-channel"; + options = [ "NOPASSWD" ]; + } + ]; + + + } + ]; + */ } + \ No newline at end of file diff --git a/flake.lock b/flake.lock index e26c258..8c182d3 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1698519020, - "narHash": "sha256-4x+AvrljebasPoRRUAY1qI79w5Bev2olPoV+SxQDd/I=", + "lastModified": 1698661082, + "narHash": "sha256-ju60wCA5A+JpiGZV056kroBNvvyC9vNCyYb/eIwZaYo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "45659cab8b875d266146821df333ea443b935212", + "rev": "9716242daed6b500616e0d2378a06f5eba53ca2b", "type": "github" }, "original": { @@ -86,11 +86,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1698519020, - "narHash": "sha256-4x+AvrljebasPoRRUAY1qI79w5Bev2olPoV+SxQDd/I=", + "lastModified": 1698661082, + "narHash": "sha256-ju60wCA5A+JpiGZV056kroBNvvyC9vNCyYb/eIwZaYo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "45659cab8b875d266146821df333ea443b935212", + "rev": "9716242daed6b500616e0d2378a06f5eba53ca2b", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1698479159, - "narHash": "sha256-rJHBDwW4LbADEfhkgGHjKGfL2dF44NrlyXdXeZrQahs=", + "lastModified": 1698670511, + "narHash": "sha256-jQIu3UhBMPHXzVkHQO1O2gg8SVo5lqAVoC6mOaLQcLQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f92a54fef4eacdbe86b0a2054054dd58b0e2a2a4", + "rev": "8e5416b478e465985eec274bc3a018024435c106", "type": "github" }, "original": { @@ -182,11 +182,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1698479159, - "narHash": "sha256-rJHBDwW4LbADEfhkgGHjKGfL2dF44NrlyXdXeZrQahs=", + "lastModified": 1698670511, + "narHash": "sha256-jQIu3UhBMPHXzVkHQO1O2gg8SVo5lqAVoC6mOaLQcLQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f92a54fef4eacdbe86b0a2054054dd58b0e2a2a4", + "rev": "8e5416b478e465985eec274bc3a018024435c106", "type": "github" }, "original": { @@ -282,11 +282,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698288402, - "narHash": "sha256-jIIjApPdm+4yt8PglX8pUOexAdEiAax/DXW3S/Mb21E=", + "lastModified": 1698434055, + "narHash": "sha256-Phxi5mUKSoL7A0IYUiYtkI9e8NcGaaV5PJEaJApU1Ko=", "owner": "nixos", "repo": "nixpkgs", - "rev": "60b9db998f71ea49e1a9c41824d09aa274be1344", + "rev": "1a3c95e3b23b3cdb26750621c08cc2f1560cb883", "type": "github" }, "original": { @@ -298,11 +298,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1698288402, - "narHash": "sha256-jIIjApPdm+4yt8PglX8pUOexAdEiAax/DXW3S/Mb21E=", + "lastModified": 1698434055, + "narHash": "sha256-Phxi5mUKSoL7A0IYUiYtkI9e8NcGaaV5PJEaJApU1Ko=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "60b9db998f71ea49e1a9c41824d09aa274be1344", + "rev": "1a3c95e3b23b3cdb26750621c08cc2f1560cb883", "type": "github" }, "original": { @@ -314,11 +314,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1698288402, - "narHash": "sha256-jIIjApPdm+4yt8PglX8pUOexAdEiAax/DXW3S/Mb21E=", + "lastModified": 1698434055, + "narHash": "sha256-Phxi5mUKSoL7A0IYUiYtkI9e8NcGaaV5PJEaJApU1Ko=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "60b9db998f71ea49e1a9c41824d09aa274be1344", + "rev": "1a3c95e3b23b3cdb26750621c08cc2f1560cb883", "type": "github" }, "original": { @@ -330,11 +330,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1698288402, - "narHash": "sha256-jIIjApPdm+4yt8PglX8pUOexAdEiAax/DXW3S/Mb21E=", + "lastModified": 1698434055, + "narHash": "sha256-Phxi5mUKSoL7A0IYUiYtkI9e8NcGaaV5PJEaJApU1Ko=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "60b9db998f71ea49e1a9c41824d09aa274be1344", + "rev": "1a3c95e3b23b3cdb26750621c08cc2f1560cb883", "type": "github" }, "original": { @@ -392,11 +392,11 @@ }, "nur_2": { "locked": { - "lastModified": 1698513999, - "narHash": "sha256-JFWbAmExdWkghvKLjbNdWq2oNyrg5qcxTcCHrN1MTeA=", + "lastModified": 1698673581, + "narHash": "sha256-lidNMJ2f+f4Zjr9U0iUxDRAcToMHHGGwhchLZRKYA34=", "owner": "nix-community", "repo": "NUR", - "rev": "984c4715454a4f5fdd753a1b667893c206729ab5", + "rev": "9a1a107fc246a416e44e2e965a31d79983614541", "type": "github" }, "original": { @@ -422,11 +422,11 @@ }, "nur_4": { "locked": { - "lastModified": 1698513999, - "narHash": "sha256-JFWbAmExdWkghvKLjbNdWq2oNyrg5qcxTcCHrN1MTeA=", + "lastModified": 1698673581, + "narHash": "sha256-lidNMJ2f+f4Zjr9U0iUxDRAcToMHHGGwhchLZRKYA34=", "owner": "nix-community", "repo": "NUR", - "rev": "984c4715454a4f5fdd753a1b667893c206729ab5", + "rev": "9a1a107fc246a416e44e2e965a31d79983614541", "type": "github" }, "original": { @@ -438,11 +438,11 @@ }, "nur_5": { "locked": { - "lastModified": 1698513999, - "narHash": "sha256-JFWbAmExdWkghvKLjbNdWq2oNyrg5qcxTcCHrN1MTeA=", + "lastModified": 1698673581, + "narHash": "sha256-lidNMJ2f+f4Zjr9U0iUxDRAcToMHHGGwhchLZRKYA34=", "owner": "nix-community", "repo": "NUR", - "rev": "984c4715454a4f5fdd753a1b667893c206729ab5", + "rev": "9a1a107fc246a416e44e2e965a31d79983614541", "type": "github" }, "original": {