From 246b2a75eaeff438aabb35a72f3da1d036edd312 Mon Sep 17 00:00:00 2001 From: willifan Date: Tue, 21 May 2024 17:54:20 +0200 Subject: [PATCH 1/6] change VSCodium setting to not ask when drag and dropping --- users/willifan/graphical/dev/vscodium.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/willifan/graphical/dev/vscodium.nix b/users/willifan/graphical/dev/vscodium.nix index 53b6d62..c2496dd 100644 --- a/users/willifan/graphical/dev/vscodium.nix +++ b/users/willifan/graphical/dev/vscodium.nix @@ -8,6 +8,7 @@ userSettings = { "[nix]"."editor.tabSize" = 2; + "explorer.confirmDragAndDrop" = false; }; extensions = with pkgs.vscode-extensions; [ # System From e3176e185846b5dd4b53089409e24a14777e70c5 Mon Sep 17 00:00:00 2001 From: willifan Date: Tue, 21 May 2024 17:54:57 +0200 Subject: [PATCH 2/6] Move hyprland files to host specific directories --- flake.nix | 2 +- .../graphical/hyprland/Lenni/default.nix | 9 +++++++++ .../hyprland/{ => Lenni}/hypridle.nix | 0 .../hyprland/{ => Lenni}/hyprlock.nix | 0 .../graphical/hyprland/{ => Lenni}/kanshi.nix | 0 .../graphical/hyprland/common/default.nix | 16 +++++++++++++++ .../hyprland/{ => common}/hyprland.nix | 0 .../hyprland/{ => common}/hyprpaper.nix | 0 .../graphical/hyprland/{ => common}/mako.nix | 0 .../hyprland/{ => common}/pipewire.nix | 0 .../hyprland/{ => common}/polkit.nix | 0 .../graphical/hyprland/{ => common}/utils.nix | 0 .../graphical/hyprland/{ => common}/wofi.nix | 0 users/willifan/graphical/hyprland/default.nix | 20 ++++--------------- 14 files changed, 30 insertions(+), 17 deletions(-) create mode 100644 users/willifan/graphical/hyprland/Lenni/default.nix rename users/willifan/graphical/hyprland/{ => Lenni}/hypridle.nix (100%) rename users/willifan/graphical/hyprland/{ => Lenni}/hyprlock.nix (100%) rename users/willifan/graphical/hyprland/{ => Lenni}/kanshi.nix (100%) create mode 100644 users/willifan/graphical/hyprland/common/default.nix rename users/willifan/graphical/hyprland/{ => common}/hyprland.nix (100%) rename users/willifan/graphical/hyprland/{ => common}/hyprpaper.nix (100%) rename users/willifan/graphical/hyprland/{ => common}/mako.nix (100%) rename users/willifan/graphical/hyprland/{ => common}/pipewire.nix (100%) rename users/willifan/graphical/hyprland/{ => common}/polkit.nix (100%) rename users/willifan/graphical/hyprland/{ => common}/utils.nix (100%) rename users/willifan/graphical/hyprland/{ => common}/wofi.nix (100%) diff --git a/flake.nix b/flake.nix index f4072b3..0f53742 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,7 @@ }; outputs = { self, nixpkgs, home-manager, disko, ... }@inputs: - let + let inherit (self) outputs; forAllSystems = nixpkgs.lib.genAttrs [ "x86_64-linux" diff --git a/users/willifan/graphical/hyprland/Lenni/default.nix b/users/willifan/graphical/hyprland/Lenni/default.nix new file mode 100644 index 0000000..274fc73 --- /dev/null +++ b/users/willifan/graphical/hyprland/Lenni/default.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: + +{ + imports = [ + ./hypridle.nix + ./hyprlock.nix + ./kanshi.nix + ]; +} diff --git a/users/willifan/graphical/hyprland/hypridle.nix b/users/willifan/graphical/hyprland/Lenni/hypridle.nix similarity index 100% rename from users/willifan/graphical/hyprland/hypridle.nix rename to users/willifan/graphical/hyprland/Lenni/hypridle.nix diff --git a/users/willifan/graphical/hyprland/hyprlock.nix b/users/willifan/graphical/hyprland/Lenni/hyprlock.nix similarity index 100% rename from users/willifan/graphical/hyprland/hyprlock.nix rename to users/willifan/graphical/hyprland/Lenni/hyprlock.nix diff --git a/users/willifan/graphical/hyprland/kanshi.nix b/users/willifan/graphical/hyprland/Lenni/kanshi.nix similarity index 100% rename from users/willifan/graphical/hyprland/kanshi.nix rename to users/willifan/graphical/hyprland/Lenni/kanshi.nix diff --git a/users/willifan/graphical/hyprland/common/default.nix b/users/willifan/graphical/hyprland/common/default.nix new file mode 100644 index 0000000..0700cdd --- /dev/null +++ b/users/willifan/graphical/hyprland/common/default.nix @@ -0,0 +1,16 @@ +{ pkgs, ... }: + +{ + programs.hyprland.enable = true; + imports = [ + ./hyprland.nix + ./hyprpaper.nix + ./mako.nix + ./pipewire.nix + ./polkit.nix + ./utils.nix + ./wofi.nix + ]; + + +} diff --git a/users/willifan/graphical/hyprland/hyprland.nix b/users/willifan/graphical/hyprland/common/hyprland.nix similarity index 100% rename from users/willifan/graphical/hyprland/hyprland.nix rename to users/willifan/graphical/hyprland/common/hyprland.nix diff --git a/users/willifan/graphical/hyprland/hyprpaper.nix b/users/willifan/graphical/hyprland/common/hyprpaper.nix similarity index 100% rename from users/willifan/graphical/hyprland/hyprpaper.nix rename to users/willifan/graphical/hyprland/common/hyprpaper.nix diff --git a/users/willifan/graphical/hyprland/mako.nix b/users/willifan/graphical/hyprland/common/mako.nix similarity index 100% rename from users/willifan/graphical/hyprland/mako.nix rename to users/willifan/graphical/hyprland/common/mako.nix diff --git a/users/willifan/graphical/hyprland/pipewire.nix b/users/willifan/graphical/hyprland/common/pipewire.nix similarity index 100% rename from users/willifan/graphical/hyprland/pipewire.nix rename to users/willifan/graphical/hyprland/common/pipewire.nix diff --git a/users/willifan/graphical/hyprland/polkit.nix b/users/willifan/graphical/hyprland/common/polkit.nix similarity index 100% rename from users/willifan/graphical/hyprland/polkit.nix rename to users/willifan/graphical/hyprland/common/polkit.nix diff --git a/users/willifan/graphical/hyprland/utils.nix b/users/willifan/graphical/hyprland/common/utils.nix similarity index 100% rename from users/willifan/graphical/hyprland/utils.nix rename to users/willifan/graphical/hyprland/common/utils.nix diff --git a/users/willifan/graphical/hyprland/wofi.nix b/users/willifan/graphical/hyprland/common/wofi.nix similarity index 100% rename from users/willifan/graphical/hyprland/wofi.nix rename to users/willifan/graphical/hyprland/common/wofi.nix diff --git a/users/willifan/graphical/hyprland/default.nix b/users/willifan/graphical/hyprland/default.nix index d7b6dfe..c7f8050 100644 --- a/users/willifan/graphical/hyprland/default.nix +++ b/users/willifan/graphical/hyprland/default.nix @@ -1,19 +1,7 @@ -{ pkgs, ... }: - +{ pkgs, configVars, ... }: { - programs.hyprland.enable = true; imports = [ - ./hypridle.nix - ./hyprland.nix - ./hyprlock.nix - ./hyprpaper.nix - ./kanshi.nix - ./mako.nix - ./pipewire.nix - ./polkit.nix - ./utils.nix - ./wofi.nix + ./common + ./${configVars.hostname} ]; - - -} +} \ No newline at end of file From c104ae441c98a2cfd01833d2e6c58a87de6cd7c9 Mon Sep 17 00:00:00 2001 From: willifan Date: Tue, 21 May 2024 18:07:07 +0200 Subject: [PATCH 3/6] added hyfetch config --- users/willifan/applications.nix | 1 - users/willifan/default.nix | 1 + users/willifan/hyfetch.nix | 25 +++++++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 users/willifan/hyfetch.nix diff --git a/users/willifan/applications.nix b/users/willifan/applications.nix index b36ef90..f0965c0 100644 --- a/users/willifan/applications.nix +++ b/users/willifan/applications.nix @@ -15,7 +15,6 @@ feh - hyfetch enpass webcord obsidian diff --git a/users/willifan/default.nix b/users/willifan/default.nix index 65b3a03..d99b5b5 100644 --- a/users/willifan/default.nix +++ b/users/willifan/default.nix @@ -7,6 +7,7 @@ ./auto-cpufreq.nix ./envvar.nix ./git.nix + ./hyfetch.nix ./locales.nix #./ssh.nix ./syncthing.nix diff --git a/users/willifan/hyfetch.nix b/users/willifan/hyfetch.nix new file mode 100644 index 0000000..7e463ee --- /dev/null +++ b/users/willifan/hyfetch.nix @@ -0,0 +1,25 @@ +{ pkgs, home-manager, ... }: + +{ + home-manager.users.willifan = { + programs.hyfetch = { + enable = true; + settings = { + preset = "transgender"; + mode = "rgb"; + light_dark = "dark"; + lightness = 0.69; + color_align = { + mode = "horizontal"; + custom_colors = []; + fore_back = null; + }; + backend = "neofetch"; + args = null; + distro = null; + pride_month_shown = []; + pride_month_disable = false; + }; + }; + }; +} From 42931f9dbd1f6d5115262db9ea87b98d1646fcf1 Mon Sep 17 00:00:00 2001 From: willifan Date: Wed, 22 May 2024 11:06:48 +0200 Subject: [PATCH 4/6] update syncthing path --- users/willifan/syncthing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/willifan/syncthing.nix b/users/willifan/syncthing.nix index 427161a..9e0e9ea 100644 --- a/users/willifan/syncthing.nix +++ b/users/willifan/syncthing.nix @@ -3,8 +3,8 @@ services.syncthing = { enable = true; user = "willifan"; - dataDir = "/home/willifan/temp"; - configDir = "/home/willifan/temp/.config/syncthing"; + dataDir = "/mnt/data"; + configDir = "/mnt/data/.config/syncthing"; overrideDevices = true; overrideFolders = true; settings = { From 8768d12ad67334d44344f575b1d20d751f745be6 Mon Sep 17 00:00:00 2001 From: willifan Date: Wed, 22 May 2024 19:15:46 +0200 Subject: [PATCH 5/6] Add rust tools --- users/willifan/graphical/dev/default.nix | 1 + users/willifan/graphical/dev/rust.nix | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 users/willifan/graphical/dev/rust.nix diff --git a/users/willifan/graphical/dev/default.nix b/users/willifan/graphical/dev/default.nix index abfa574..8ca09ea 100644 --- a/users/willifan/graphical/dev/default.nix +++ b/users/willifan/graphical/dev/default.nix @@ -2,6 +2,7 @@ { imports = [ + ./rust.nix ./vscodium.nix ]; } diff --git a/users/willifan/graphical/dev/rust.nix b/users/willifan/graphical/dev/rust.nix new file mode 100644 index 0000000..53031b9 --- /dev/null +++ b/users/willifan/graphical/dev/rust.nix @@ -0,0 +1,10 @@ +{ pkgs, ... }: +{ + environment.systemPackages = with pkgs; [ + + rustup + probe-rs + cargo-binutils + + ]; +} \ No newline at end of file From 0e010c4a6995e7a91271aef98e0391ddc0dfb899 Mon Sep 17 00:00:00 2001 From: willifan Date: Thu, 23 May 2024 12:15:13 +0200 Subject: [PATCH 6/6] changed kanshi eDP scale to 1 in LeoBots1 --- users/willifan/graphical/dev/default.nix | 1 - users/willifan/graphical/hyprland/Lenni/kanshi.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/users/willifan/graphical/dev/default.nix b/users/willifan/graphical/dev/default.nix index 8ca09ea..f4e2e6c 100644 --- a/users/willifan/graphical/dev/default.nix +++ b/users/willifan/graphical/dev/default.nix @@ -6,4 +6,3 @@ ./vscodium.nix ]; } - diff --git a/users/willifan/graphical/hyprland/Lenni/kanshi.nix b/users/willifan/graphical/hyprland/Lenni/kanshi.nix index b5c8616..ade1778 100644 --- a/users/willifan/graphical/hyprland/Lenni/kanshi.nix +++ b/users/willifan/graphical/hyprland/Lenni/kanshi.nix @@ -67,7 +67,7 @@ criteria = "eDP-1"; mode = "2256x1504"; position = "3840,0"; - scale = 1.6; + scale = 1.0; transform = "normal"; } ];