From 86bc193019f1c32fc4b89248d69f4cde12dd460d Mon Sep 17 00:00:00 2001 From: jxnshi Date: Fri, 24 Jan 2025 22:10:22 +0100 Subject: [PATCH] Update --- configuration.nix | 37 ++++++++++++------------------------ home.nix | 48 ++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 51 insertions(+), 34 deletions(-) diff --git a/configuration.nix b/configuration.nix index 547128e..500dbd0 100644 --- a/configuration.nix +++ b/configuration.nix @@ -43,36 +43,23 @@ users.users.jxnshi.isNormalUser = true; users.users.jxnshi.extraGroups = [ "networkmanager" "wheel" ]; - users.users.jxnshi.packages = with pkgs; [ - dwm # Window manager. - librewolf # Web browser. - monero-gui # Monero wallet. - st # Terminal emulator. - - # Misc. - dmenu - home-manager - syncthing - tree - xclip - wget - ]; - + # Environment variables. + environment.variables = { + BROWSER = "tabbed vimb -e"; + EDITOR = "hx"; + TERM = "st"; + }; + + # Allow unfree packages. nixpkgs.config.allowUnfree = true; # Window manager. services.xserver.windowManager.dwm.enable = true; + services.xserver.desktopManager.wallpaper.mode = "fill"; - nixpkgs.overlays = [ - (final: prev: { - dwm = prev.dwm.overrideAttrs (old: { - src = pkgs.fetchgit { - url = "git://jxnshi.xyz/dwm-config.git"; - hash = "sha256-rQ73CrK9ijqb+CByShAFQytcNNBb4GPiB9/mIYdQi6Y="; - }; - }); - }) - ]; + # Auto login. + services.displayManager.autoLogin.enable = true; + services.displayManager.autoLogin.user = "jxnshi"; # SSH. programs.ssh.startAgent = true; diff --git a/home.nix b/home.nix index 5580864..fe090c2 100644 --- a/home.nix +++ b/home.nix @@ -6,21 +6,46 @@ home.stateVersion = "24.05"; - home.packages = [ - pkgs.helix # Text editor. + home.packages = with pkgs; [ + dwm # Window manager. + helix # Text editor. + monero-gui # Monero wallet. + st # Terminal emulator. + vimb # Web browser. # Misc. - pkgs.git + dmenu + feh + git + home-manager + htop + pfetch-rs + syncthing + tabbed + tree + xclip + wget ]; - home.file = {}; - - home.sessionVariables = { - EDITOR = "hx"; - }; - programs.home-manager.enable = true; + nixpkgs.overlays = [ + (final: prev: { + dwm = prev.dwm.overrideAttrs (old: { + src = pkgs.fetchgit { + url = "git://jxnshi.xyz/dwm-config.git"; + hash = "sha256-2oOAUaaB0g68E9+ITfJeOxzzf33yQn2TeOxmSakH/qQ="; + }; + }); + st = prev.st.overrideAttrs (old: { + src = pkgs.fetchgit { + url = "git://jxnshi.xyz/st-config.git"; + hash = "sha256-1KfKBcVYAgOdRJAwSYXIq2ywPcLNvE1edBK7cXRNr3w="; + }; + }); + }) + ]; + # Helix. programs.helix.enable = true; @@ -29,6 +54,11 @@ programs.helix.settings.editor.rulers = [80]; programs.helix.languages.language = [ + { + name = "c"; + indent.tab-width = 4; + indent.unit = " "; + } { name = "nix"; indent.tab-width = 4; -- 2.49.0