From f28a9b5b9b91b89b644e25e247c818110970ab70 Mon Sep 17 00:00:00 2001 From: Liam Malone Date: Sun, 17 Mar 2024 14:28:10 +0000 Subject: [PATCH] . --- hosts/default/configuration.nix | 8 +++----- hosts/default/home.nix | 16 ++++++++++++++-- modules/old_configs/emacs/config.org | 2 +- modules/old_configs/hypr/hyprland.conf | 6 +++--- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 5053504..27c4381 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -88,11 +88,8 @@ dina-font (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; }) ]; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "steam" - "steam-original" - "steam-run" - ]; + + nix.settings.trusted-users = [ "root" "@wheel" ]; nix.gc = { automatic = true; @@ -126,6 +123,7 @@ environment.systemPackages = with pkgs; [ vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. wget + wl-clipboard alacritty ]; diff --git a/hosts/default/home.nix b/hosts/default/home.nix index cc68f40..18246d7 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { home.username = "liamm"; @@ -13,28 +13,34 @@ # environment. home.packages = [ + pkgs.brightnessctl pkgs.cmake pkgs.contour # pkgs.etcher ## Currently Uses Electron-19 -- which is marked EOL - # pkgs.discord + pkgs.discord pkgs.emacs-all-the-icons-fonts pkgs.exfatprogs pkgs.firefox + pkgs.floorp pkgs.gcc pkgs.grimblast pkgs.gnumake pkgs.htop + pkgs.keepassxc pkgs.libtool pkgs.libreoffice pkgs.gnome.nautilus pkgs.neofetch pkgs.networkmanagerapplet + pkgs.pamixer pkgs.pavucontrol pkgs.picom pkgs.signal-desktop + pkgs.swayidle pkgs.swww pkgs.thunderbird pkgs.tree + pkgs.wev ]; # Home Manager is pretty good at managing dotfiles. The primary way to manage @@ -53,6 +59,12 @@ NIX_SHELL_PRESERVE_PROMPT = 1; }; + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "steam" + "steam-original" + "steam-run" + # "discord-0.0.44" + ]; nix.settings.extra-trusted-substituters = [ "https://ghostty.cachix.org" ]; diff --git a/modules/old_configs/emacs/config.org b/modules/old_configs/emacs/config.org index 61d5a9a..642f046 100644 --- a/modules/old_configs/emacs/config.org +++ b/modules/old_configs/emacs/config.org @@ -170,7 +170,7 @@ (lm/leader-keys "SPC" '(counsel-M-x :wk "Counsel M-x") "." '(find-file :wk "Find file") - "f c" '((lambda () (interactive) (find-file "~/.config/emacs/config.org")) :wk "Edit emacs config") + "f c" '((lambda () (interactive) (find-file "~/nixos/modules/old_configs/emacs/config.org")) :wk "Edit emacs config") "f r" '(counsel-recentf :wk "Find recent files") "TAB TAB" '(comment-line :wk "Comment lines")) diff --git a/modules/old_configs/hypr/hyprland.conf b/modules/old_configs/hypr/hyprland.conf index e3e213d..ff80c20 100644 --- a/modules/old_configs/hypr/hyprland.conf +++ b/modules/old_configs/hypr/hyprland.conf @@ -25,7 +25,7 @@ exec-once = ~/.config/hypr/xdg-portal-hyprland #exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = dbus-update-activation-environment --systemd all exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP QT_QPA_PLATFORMTHEME -exec-once = /usr/lib/polkit-kde-authentication-agent-1 +# exec-once = /usr/lib/polkit-kde-authentication-agent-1 exec-once = wl-clipboard-history -t exec-once = swww init exec-once = gammastep @@ -48,13 +48,13 @@ exec-once = swayidle -w timeout 300 '$lock' timeout 330 'hyprctl dispatch dpms o exec-once = fcitx5 -d exec-once = dunst -exec-once = /usr/lib/kdeconnectd +# exec-once = /usr/lib/kdeconnectd # set $gnome-schema org.gnome.desktop.interface exec-once = gsettings set $gnome-schema gtk-theme 'Arc Dark' exec-once = gsettings set $gnome-schema icon-theme 'Arc Dark' -exec-once = /usr/bin/emacs --daemon +# exec-once = /usr/bin/emacs --daemon exec-once = blueman-applet exec-once = nm-applet exec-once = kdeconnect-indicator