我的NixOS配置基本完成

ding-f · Apr 26, 2024 · 154932e · 154932e
1 parent 6f3fd22
commit 154932e
Show file tree

Hide file tree

Showing 18 changed files with 242 additions and 239 deletions.
diff --git a/config/home/bash.nix b/config/home/bash.nix
@@ -34,7 +34,7 @@ lib.mkIf (theShell == "bash") {
       la="lsd -a";
       lal="lsd -al";
       ".."="cd ..";
-      neofetch="neofetch --ascii ~/.config/ascii-neofetch";
+      # neofetch="neofetch --ascii ~/.config/ascii-neofetch";
     };
   };
 }
diff --git a/config/home/files.nix b/config/home/files.nix
@@ -9,7 +9,7 @@
   home.file.".config/rofi/rofi.jpg".source = ./files/rofi.jpg;
   home.file.".config/starship.toml".source = ./files/starship.toml;
   home.file.".config/swaylock-bg.jpg".source = ./files/media/swaylock-bg.jpg;
-  home.file.".config/ascii-neofetch".source = ./files/ascii-neofetch;
+  # home.file.".config/ascii-neofetch".source = ./files/ascii-neofetch;
   home.file.".local/share/fonts" = {
     source = ./files/fonts;
     recursive = true;

diff --git a/config/home/hyprland.nix b/config/home/hyprland.nix
@@ -46,7 +46,6 @@ in with lib; {
         sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
         accel_profile = flat
       }
-      env = NIXOS_OZONE_WL, 1
       env = NIXPKGS_ALLOW_UNFREE, 1
       env = XDG_CURRENT_DESKTOP, Hyprland
       env = XDG_SESSION_TYPE, wayland
@@ -118,6 +117,8 @@ in with lib; {
       exec-once = wallsetter
       exec-once = nm-applet --indicator
       exec-once = swayidle -w timeout 720 'swaylock -f' timeout 800 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep 'swaylock -f -c 000000'
+      exec-once = clash-meta
+      exec-once = fcitx5
       dwindle {
         pseudotile = true
         preserve_split = true
@@ -136,9 +137,10 @@ in with lib; {
       ''}
       bind = ${modifier},E,exec,emopicker9000
       bind = ${modifier},S,exec,screenshootin
-      bind = ${modifier},D,exec,discord
       bind = ${modifier},O,exec,obs
       bind = ${modifier},G,exec,gimp
+      bind = ${modifier},D,exec,dolphin
+      bind = ${modifier},C,exec,code
       bind = ${modifier}SHIFT,G,exec,godot4
       bind = ${modifier},T,exec,thunar
       bind = ${modifier},M,exec,spotify

diff --git a/config/home/neofetch.nix b/config/home/neofetch.nix
@@ -3,7 +3,7 @@
 {
     home.file.".config/neofetch/config.conf".text = ''
         print_info() {
-            prin "$(color 6)  ZaneyOS "
+            prin "$(color 6)  NixOS "
             info underline
             info "$(color 7)  VER" kernel
             info "$(color 2)  UP " uptime

diff --git a/config/home/packages.nix b/config/home/packages.nix
@@ -6,10 +6,10 @@ let
 in {
   # Install Packages For The User
   home.packages = with pkgs; [
-    pkgs."${browser}" discord libvirt swww grim slurp gnome.file-roller
+    pkgs."${browser}" libvirt swww grim slurp gnome.file-roller
     swaynotificationcenter rofi-wayland imv transmission-gtk mpv
     gimp obs-studio rustup audacity pavucontrol tree protonup-qt
-    font-awesome spotify swayidle neovide swaylock
+    font-awesome spotify swayidle neovide swaylock google-chrome
     (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
     # Import Scripts
     (import ./../scripts/emopicker9000.nix { inherit pkgs; })

diff --git a/config/home/waybar.nix b/config/home/waybar.nix
@@ -28,10 +28,9 @@ in with lib; {
       	on-scroll-down = "hyprctl dispatch workspace e-1";
       };
       "clock" = {
-	format = if clock24h == true then ''{: %H:%M}'' 
-	else ''{: %I:%M %p}'';
+	      format = if clock24h == true then '' {:%H:%M}'' else '' {:%I:%M %p}'';
       	tooltip = true;
-	tooltip-format = "<big>{:%A, %d.%B %Y }</big><tt><small>{calendar}</small></tt>";
+	      tooltip-format = "<big>{:%A, %d.%B %Y }</big><tt><small>{calendar}</small></tt>";
       };
       "hyprland/window" = {
       	max-length = 25;

diff --git a/config/home/zsh.nix b/config/home/zsh.nix
@@ -54,7 +54,7 @@ lib.mkIf (theShell == "zsh") {
       la="lsd -a";
       lal="lsd -al";
       ".."="cd ..";
-      neofetch="neofetch --ascii ~/.config/ascii-neofetch";
+      # neofetch="neofetch --ascii ~/.config/ascii-neofetch";
     };
   };
 }
diff --git a/config/scripts/list-hypr-bindings.nix b/config/scripts/list-hypr-bindings.nix
@@ -24,7 +24,6 @@ pkgs.writeShellScriptBin "list-hypr-bindings" ''
   " + W" "Launch Web Browser" "${browser}" \
   " + E" "Launch Emoji Selector" "emopicker9000" \
   " + S" "Take Screenshot" "screenshootin" \
-  " + D" "Launch Discord" "discord" \
   " + O" "Launch OBS" "obs" \
   " + G" "Launch GIMP" "gimp" \
   " + N" "Launch New File Browser Window" "thunar" \

diff --git a/config/system/displaymanager.nix b/config/system/displaymanager.nix
@@ -12,7 +12,7 @@ theKBDLayout theSecondKBDLayout; in
     libinput.enable = true;
     displayManager.sddm = {
       enable = true;
-      autoNumlock = true;
+      autoNumlock = false;
       wayland.enable = true;
       theme = "tokyo-night-sddm";
     };

diff --git a/config/system/packages.nix b/config/system/packages.nix
@@ -12,7 +12,7 @@
     pkg-config meson hugo gnumake ninja go nodejs symbola
     noto-fonts-color-emoji material-icons brightnessctl
     toybox virt-viewer swappy ripgrep appimage-run 
-    networkmanagerapplet yad playerctl nh
+    networkmanagerapplet yad playerctl nh 
   ];
 
   programs = {

diff --git a/config/system/persistence.nix b/config/system/persistence.nix
@@ -28,7 +28,6 @@ in
 	".mozilla"
 	".cache"
 	".ssh"
-	".config/discord"
 	".config/obs-studio"
 	".steam"
       ];