aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPreston Pan <preston@nullring.xyz>2024-03-27 10:14:27 -0700
committerPreston Pan <preston@nullring.xyz>2024-03-27 10:14:27 -0700
commit3278e02f9c08f91d423a611d28d2eec2f1999ba6 (patch)
tree021374b0d41e2d4ac25a78c57588fac8ae8e8620
parentb0468f02e5a7ef82749af3d76fd9c3d769cf4228 (diff)
some changes
-rw-r--r--configuration.nix12
-rw-r--r--flake.nix27
-rw-r--r--home.nix13
3 files changed, 48 insertions, 4 deletions
diff --git a/configuration.nix b/configuration.nix
index 3d41161..1b1637e 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -42,6 +42,13 @@
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
+ services.xserver.windowManager.qtile = {
+ enable = true;
+ backend = "wayland";
+ #backend = "x11";
+ extraPackages = python3Packages: with python3Packages; [
+ ];
+ };
services.pipewire = {
enable = true;
alsa.enable = true;
@@ -51,11 +58,14 @@
#media-session.enable = true;
};
+ services.kanata = {
+ enable = true;
+ };
# services.xserver.libinput.enable = true;
programs.zsh.enable = true;
-
+
users.users.root.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINSshvS1N/42pH9Unp3Zj4gjqs9BXoin99oaFWYHXZDJ preston@preston-arch"
];
diff --git a/flake.nix b/flake.nix
index 3e4fa78..717ff18 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,6 +19,33 @@
outputs = { self, nixpkgs, home-manager, nur, disko, wallpapers, sops-nix, scripts, ... }@attrs: {
nixosConfigurations = {
+ live = nixpkgs.lib.nixosSystem {
+ system = "x86_64-linux";
+ specialArgs = attrs;
+ modules = [
+ { nixpkgs.overlays = [ nur.overlay ]; }
+ ({ pkgs, ... }:
+ let
+ nur-no-pkgs = import nur {
+ inherit pkgs;
+ nurpkgs = import nixpkgs { system = "x86_64-linux"; };
+ };
+ in
+ {
+ imports = [ ];
+ })
+ (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
+ ./configuration.nix
+ disko.nixosModules.disko
+ home-manager.nixosModules.home-manager
+ {
+ home-manager.useGlobalPkgs = true;
+ home-manager.extraSpecialArgs = attrs;
+ home-manager.useUserPackages = true;
+ home-manager.users.preston = import ./home.nix;
+ }
+ ];
+ };
continuity = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = attrs;
diff --git a/home.nix b/home.nix
index 5078f01..ecd1d30 100644
--- a/home.nix
+++ b/home.nix
@@ -51,10 +51,11 @@
podman-desktop
monero-gui
electrum
- element-desktop
+ fluffychat
iamb
veracrypt
imagemagick
+ tor-browser
(nerdfonts.override { fonts = [ "Iosevka" ]; })
(discord.override {
withOpenASAR = true;
@@ -108,6 +109,7 @@
};
};
+
programs.nushell = {
enable = true;
extraConfig = ''
@@ -850,6 +852,7 @@
GTK_IM_MODULE = "fcitx";
XMODIFIERS = "@im=fcitx";
XIM_SERVERS = "fcitx";
+ WXSUPPRESS_SIZER_FLAGS_CHECK = "1";
};
shellAliases = {
c = "clear";
@@ -966,7 +969,7 @@
# Gmail
account preston
host mail.nullring.xyz
- port 587
+ port 465
from preston@nullring.xyz
user preston
passwordeval "pass Mail"
@@ -1021,7 +1024,10 @@
"workspace 1, ^(.*emacs.*)$"
"workspace 2, ^(.*firefox.*)$"
"workspace 3, ^(.*discord.*)$"
+ "workspace 3, ^(.*fluffychat.*)$"
"workspace 3, ^(.*element-desktop.*)$"
+ "workspace 5, ^(.*Monero.*)$"
+ "workspace 5, ^(.*electrum.*)$"
"pseudo,fcitx"
];
bind = [
@@ -1031,7 +1037,8 @@
"$mod, B, exec, electrum"
"$mod, M, exec, monero-wallet-gui"
"$mod, V, exec, Discord"
- "$mod, C, exec, element-desktop"
+ "$mod, T, exec, veracrypt"
+ "$mod, C, exec, fluffychat"
"$mod, D, exec, wofi --show run"
"$mod, P, exec, bash ${scripts}/powermenu.sh"
"$mod, Q, killactive"