From 09f7ba6e006fe434eab06f7498362b254a373ee0 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Tue, 3 Oct 2023 17:59:33 -0600 Subject: adding env vars --- modules/nixos/environment.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'modules') diff --git a/modules/nixos/environment.nix b/modules/nixos/environment.nix index 225ddda..5486d42 100644 --- a/modules/nixos/environment.nix +++ b/modules/nixos/environment.nix @@ -13,6 +13,7 @@ MANPAGER = "sh -c 'col -bx | bat -l man -p'"; EDITOR = "hx"; ZEIT_DB = "/home/defin/Documents/zeit"; + PASSWORD_STORE_DIR = "/home/devin/.password-store" }; }; } -- cgit v1.2.3 From 2303677c2ad7f1ea5e8b11a4d0df63289d6bbaa3 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Tue, 3 Oct 2023 18:00:11 -0600 Subject: syntax --- modules/nixos/environment.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/nixos/environment.nix b/modules/nixos/environment.nix index 5486d42..cb2c42e 100644 --- a/modules/nixos/environment.nix +++ b/modules/nixos/environment.nix @@ -13,7 +13,7 @@ MANPAGER = "sh -c 'col -bx | bat -l man -p'"; EDITOR = "hx"; ZEIT_DB = "/home/defin/Documents/zeit"; - PASSWORD_STORE_DIR = "/home/devin/.password-store" + PASSWORD_STORE_DIR = "/home/devin/.password-store"; }; }; } -- cgit v1.2.3 From 2758b3846eee64355eafba88c97878583af045c2 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Tue, 3 Oct 2023 18:01:41 -0600 Subject: didn't need var --- modules/nixos/environment.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'modules') diff --git a/modules/nixos/environment.nix b/modules/nixos/environment.nix index cb2c42e..225ddda 100644 --- a/modules/nixos/environment.nix +++ b/modules/nixos/environment.nix @@ -13,7 +13,6 @@ MANPAGER = "sh -c 'col -bx | bat -l man -p'"; EDITOR = "hx"; ZEIT_DB = "/home/defin/Documents/zeit"; - PASSWORD_STORE_DIR = "/home/devin/.password-store"; }; }; } -- cgit v1.2.3 From 3dca0e4f3a6f0b24a102db67b2c98ba6b886e11c Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Tue, 3 Oct 2023 18:08:43 -0600 Subject: enable sddm hidpi to fix small ui --- modules/nixos/services.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/nixos/services.nix b/modules/nixos/services.nix index c0cd4e8..3fa9d40 100644 --- a/modules/nixos/services.nix +++ b/modules/nixos/services.nix @@ -24,7 +24,10 @@ # Enable the Plasma 5 Desktop Environment. desktopManager.plasma5.enable = true; displayManager = { - sddm.enable = true; + sddm = { + enable = true; + enableHidpi = true; + }; # defaultSession = "plasmawayland"; }; }; -- cgit v1.2.3 From c4f1213c2131c3587a7a7e1427964b079dded334 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sun, 15 Oct 2023 18:00:12 -0600 Subject: typo --- modules/nixos/services.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/nixos/services.nix b/modules/nixos/services.nix index 3fa9d40..6ad8594 100644 --- a/modules/nixos/services.nix +++ b/modules/nixos/services.nix @@ -26,7 +26,7 @@ displayManager = { sddm = { enable = true; - enableHidpi = true; + autoNumlock = true; }; # defaultSession = "plasmawayland"; }; -- cgit v1.2.3 From f24f0375df867841e7593b0cee67684c2c85e2aa Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sun, 15 Oct 2023 18:20:08 -0600 Subject: issues with use command --- modules/home-manager/shell.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'modules') diff --git a/modules/home-manager/shell.nix b/modules/home-manager/shell.nix index c86190e..5568272 100644 --- a/modules/home-manager/shell.nix +++ b/modules/home-manager/shell.nix @@ -1,12 +1,12 @@ {nushell-scripts, ... }: { programs.nushell = { extraConfig = '' - use ${nushell-scripts}/custom-completions/pass/pass-completions.nu * - use ${nushell-scripts}/custom-completions/nix/nix-completions.nu * - use ${nushell-scripts}/custom-completions/man/man-completions.nu * - use ${nushell-scripts}/custom-completions/cargo/cargo-completions.nu * - use ${nushell-scripts}/custom-completions/make/make-completions.nu * - use ${nushell-scripts}/custom-completions/git/git-completions.nu * + source ${nushell-scripts}/custom-completions/pass/pass-completions.nu * + source ${nushell-scripts}/custom-completions/nix/nix-completions.nu * + source ${nushell-scripts}/custom-completions/man/man-completions.nu * + source ${nushell-scripts}/custom-completions/cargo/cargo-completions.nu * + source ${nushell-scripts}/custom-completions/make/make-completions.nu * + source ${nushell-scripts}/custom-completions/git/git-completions.nu * ''; }; } -- cgit v1.2.3 From 10bdbafcec4a0169229a2bfab7f53a10e5df0eac Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sun, 15 Oct 2023 22:30:35 -0600 Subject: figured out how to get correct checksum (use nix-prefetch-url) --- modules/user-profiles/defin.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'modules') diff --git a/modules/user-profiles/defin.nix b/modules/user-profiles/defin.nix index 36b3cbc..58e496e 100644 --- a/modules/user-profiles/defin.nix +++ b/modules/user-profiles/defin.nix @@ -11,12 +11,12 @@ shell = pkgs.nushell; hashedPassword = "$6$UljPNAdxZ22lP3Bc$8VaEAacZxtXM3Zji2IA7Jf5fXs9pFnAVQff1d8IbfFOKCvjibceyopOAjRXa8lXtpOSJgPW1OO1dzOspqhWnz0"; - # oppenssh.authorizedKeys.keyFiles = [ - # (builtins.fetchurl { - # url = "https://gitlab.com/dFinlinson.keys"; - # sha256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; - # }) - # ]; + openssh.authorizedKeys.keyFiles = [ + (builtins.fetchurl { + url = "https://gitlab.com/dFinlinson.keys"; + sha256 = "05mmvw190j6dp756bsqp3ssjyv2hq6r8cpc03wzvzgf2bhdg4dvb"; + }) + ]; }; }; -- cgit v1.2.3 From aab187548391515abd7383ba75a44bd951b6d31f Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sun, 15 Oct 2023 23:35:26 -0600 Subject: separating utility for server --- modules/nixos/sway.nix | 60 +++++++++++++++++++++++++++++++++++++ modules/nixos/system-packages.nix | 63 --------------------------------------- 2 files changed, 60 insertions(+), 63 deletions(-) (limited to 'modules') diff --git a/modules/nixos/sway.nix b/modules/nixos/sway.nix index f2f616c..f431759 100644 --- a/modules/nixos/sway.nix +++ b/modules/nixos/sway.nix @@ -1,6 +1,66 @@ { config, pkgs, lib, ... }: +let + # bash script to let dbus know about important env variables and + # propagate them to relevent services run at the end of sway config + # see + # https://github.com/emersion/xdg-desktop-portal-wlr/wiki/"It-doesn't-work"-Troubleshooting-Checklist + # note: this is pretty much the same as /etc/sway/config.d/nixos.conf but also restarts + # some user services to make sure they have the correct environment variables + dbus-sway-environment = pkgs.writeTextFile { + name = "dbus-sway-environment"; + destination = "/bin/dbus-sway-environment"; + executable = true; + + text = '' + dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway + systemctl --user stop pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr + systemctl --user start pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr + ''; + }; + + # currently, there is some friction between sway and gtk: + # https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland + # the suggested way to set gtk settings is with gsettings + # for gsettings to work, we need to tell it where the schemas are + # using the XDG_DATA_DIR environment variable + # run at the end of sway config + configure-gtk = pkgs.writeTextFile { + name = "configure-gtk"; + destination = "/bin/configure-gtk"; + executable = true; + text = let + schema = pkgs.gsettings-desktop-schemas; + datadir = "${schema}/share/gsettings-schemas/${schema.name}"; + in '' + export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS + gnome_schema=org.gnome.desktop.interface + gsettings set $gnome_schema gtk-theme 'Dracula' + ''; + }; + +in + { environment.systemPackages = with pkgs; [ + #For sway + alacritty # gpu accelerated terminal + dbus-sway-environment + configure-gtk + wayland + waybar + xdg-utils # for opening default programs when clicking links + glib # gsettings + dracula-theme # gtk theme + gnome3.adwaita-icon-theme # default gnome cursors + swaylock + swayidle + grim # screenshot functionality + slurp # screenshot functionality + bemenu # wayland clone of dmenu + mako # notification system developed by swaywm maintainer + wdisplays # tool to configure displays + wofi + (writeShellScriptBin "rofi" "exec -a $0 ${wofi}/bin/wofi $@") #Lets qutebrowser select passwords ]; # xdg-desktop-portal works by exposing a series of D-Bus interfaces diff --git a/modules/nixos/system-packages.nix b/modules/nixos/system-packages.nix index 1ffa540..6e991b7 100644 --- a/modules/nixos/system-packages.nix +++ b/modules/nixos/system-packages.nix @@ -1,46 +1,4 @@ { pkgs, ...}: -let - - # bash script to let dbus know about important env variables and - # propagate them to relevent services run at the end of sway config - # see - # https://github.com/emersion/xdg-desktop-portal-wlr/wiki/"It-doesn't-work"-Troubleshooting-Checklist - # note: this is pretty much the same as /etc/sway/config.d/nixos.conf but also restarts - # some user services to make sure they have the correct environment variables - dbus-sway-environment = pkgs.writeTextFile { - name = "dbus-sway-environment"; - destination = "/bin/dbus-sway-environment"; - executable = true; - - text = '' - dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway - systemctl --user stop pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr - systemctl --user start pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr - ''; - }; - - # currently, there is some friction between sway and gtk: - # https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland - # the suggested way to set gtk settings is with gsettings - # for gsettings to work, we need to tell it where the schemas are - # using the XDG_DATA_DIR environment variable - # run at the end of sway config - configure-gtk = pkgs.writeTextFile { - name = "configure-gtk"; - destination = "/bin/configure-gtk"; - executable = true; - text = let - schema = pkgs.gsettings-desktop-schemas; - datadir = "${schema}/share/gsettings-schemas/${schema.name}"; - in '' - export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS - gnome_schema=org.gnome.desktop.interface - gsettings set $gnome_schema gtk-theme 'Dracula' - ''; - }; - -in - { programs.partition-manager.enable = true; environment.systemPackages = with pkgs; [ @@ -53,26 +11,5 @@ in git wl-clipboard pciutils - #For hyprland - waybar - #For sway - alacritty # gpu accelerated terminal - dbus-sway-environment - configure-gtk - wayland - waybar - xdg-utils # for opening default programs when clicking links - glib # gsettings - dracula-theme # gtk theme - gnome3.adwaita-icon-theme # default gnome cursors - swaylock - swayidle - grim # screenshot functionality - slurp # screenshot functionality - bemenu # wayland clone of dmenu - mako # notification system developed by swaywm maintainer - wdisplays # tool to configure displays - wofi - (writeShellScriptBin "rofi" "exec -a $0 ${wofi}/bin/wofi $@") #Lets qutebrowser select passwords ]; } -- cgit v1.2.3