From a31224cb810a137fc8aa82881ccc520922b602dc Mon Sep 17 00:00:00 2001 From: iFargle Date: Sun, 2 Jul 2023 18:14:32 +0900 Subject: [PATCH] test --- common/dotfiles/firefox.nix | 6 ++---- configuration.nix | 17 +++++++++++----- desktops/gnome.nix | 11 +++++++--- flake.nix | 7 +++++++ users/albert/dconf.nix | 40 +++++++++++-------------------------- 5 files changed, 41 insertions(+), 40 deletions(-) diff --git a/common/dotfiles/firefox.nix b/common/dotfiles/firefox.nix index 06d2b72d..59244782 100644 --- a/common/dotfiles/firefox.nix +++ b/common/dotfiles/firefox.nix @@ -27,7 +27,7 @@ "toolkit.telemetry.bhrPing.enabled" = "false"; "datareporting.policy.dataSubmissionEnabled" = "false"; "datareporting.sessions.current.clean" = "true"; - "browser.startup.homepage" = "https://searx.sysctl.io"; + "browser.startup.homepage" = "https://dir.sysctl.io"; "browser.search.region" = "US"; "browser.search.isUS" = false; "distribution.searchplugins.defaultLocale" = "en-US"; @@ -50,9 +50,7 @@ search.default = "DuckDuckGo"; search.force = true; - search.order = [ - "DuckDuckGo" - ]; + search.order = [ "DuckDuckGo" ]; search.engines = { "Nix Packages" = { urls = [{ diff --git a/configuration.nix b/configuration.nix index ec7b2b94..e0b91f5b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -31,6 +31,7 @@ # Bootloader boot.loader.efi.canTouchEfiVariables = true; boot.tmp.cleanOnBoot = true; + # Plymouth splash screen boot.plymouth.enable = true; boot.initrd.systemd.enable = true; @@ -47,7 +48,11 @@ enable = true; }; - wireless.networks.copeland-5g.psk = "5b43054e4c927ecd94cf19103fa80a7ce99ca69f27cdd75026be3c261d7f78cb"; + # Password set via wpa_supplicant command + # https://nixos.org/manual/nixos/unstable/index.html#sec-wireless + wireless.networks = { + copeland-5g.psk = "5b43054e4c927ecd94cf19103fa80a7ce99ca69f27cdd75026be3c261d7f78cb"; + }; enableIPv6 = false; firewall = { @@ -122,7 +127,7 @@ # Enable flakes: https://nixos.wiki/wiki/Flakes nix.settings.experimental-features = [ "nix-command" "flakes" ]; - # List packages installed in system profile. To search, run: + # List packages installed in system profile environment.systemPackages = with pkgs; [ # Secureboot sbctl @@ -146,9 +151,11 @@ neofetch ]; - # Enable the OpenSSH daemon and Tailscale. - services.openssh.enable = true; - services.tailscale.enable = true; + # Enable various system services + services { + openssh.enable = true; + tailscale.enable = true; + }; # Garbage collection -- Keep the system clean nix.gc = { diff --git a/desktops/gnome.nix b/desktops/gnome.nix index 757fb5eb..a8b196b8 100644 --- a/desktops/gnome.nix +++ b/desktops/gnome.nix @@ -12,6 +12,7 @@ }; # https://nixos.wiki/wiki/GNOME + # Remove unwanted packages environment.gnome.excludePackages = (with pkgs; [ gnome.cheese gnome.gnome-music @@ -30,9 +31,8 @@ gnome.simple-scan ]); - # Gnome extensions environment.systemPackages = with pkgs; [ - # Gnome Extensions / Packages + # Gnome Extensions gnomeExtensions.tiling-assistant gnomeExtensions.dash-to-dock gnomeExtensions.blur-my-shell @@ -41,16 +41,21 @@ gnomeExtensions.caffeine gnomeExtensions.hibernate-status-button gnomeExtensions.night-theme-switcher + + # Gnome relevant packages gnome3.gnome-tweaks papirus-icon-theme + glibc ]; imports = [ + # Gnome Themes ./gnome/themes/gruvbox.nix ./gnome/themes/tokyo-night.nix ./gnome/themes/nordic.nix ./gnome/themes/vimix.nix ./gnome/themes/fluent.nix ]; - # Idea... Move these to a separate file and tie it into dconf sections that load the theme automatically when I want it. + # Idea... Move these to a separate file and tie it into dconf + # sections that load the theme automatically when I want it. } \ No newline at end of file diff --git a/flake.nix b/flake.nix index a8050fdb..2ac80d71 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,10 @@ # Nix User Repository nur.url = "github:nix-community/NUR"; + + # Encrypted secrets in Nix configuration files + agenix.url = "github:ryantm/agenix"; + }; outputs = { nixpkgs, home-manager, lanzaboote, moz_overlay, nur, ... }@inputs: @@ -58,6 +62,9 @@ # Import NUR nur.nixosModules.nur + # Import agenix + agenix.nixosModules.default + # Tell home-manager to use both global and user packages: home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/users/albert/dconf.nix b/users/albert/dconf.nix index a32b6838..22e62cd5 100644 --- a/users/albert/dconf.nix +++ b/users/albert/dconf.nix @@ -7,7 +7,7 @@ with lib.hm.gvariant; { dconf.settings = { "org/gnome/Console" = { - theme = "auto"; + theme = "dark"; }; "org/gnome/GWeather4" = { @@ -28,15 +28,6 @@ with lib.hm.gvariant; size = mkTuple [ 870 690 ]; }; - "org/gnome/control-center" = { - last-panel = "background"; - window-state = mkTuple [ 980 847 ]; - }; - - "org/gnome/desktop/app-folders" = { - folder-children = [ "Utilities" "YaST" ]; - }; - "org/gnome/desktop/app-folders/folders/Utilities" = { apps = [ "gnome-abrt.desktop" "gnome-system-log.desktop" "nm-connection-editor.desktop" "org.gnome.baobab.desktop" "org.gnome.Connections.desktop" "org.gnome.DejaDup.desktop" "org.gnome.Dictionary.desktop" "org.gnome.DiskUtility.desktop" "org.gnome.eog.desktop" "org.gnome.Evince.desktop" "org.gnome.FileRoller.desktop" "org.gnome.fonts.desktop" "org.gnome.seahorse.Application.desktop" "org.gnome.tweaks.desktop" "org.gnome.Usage.desktop" "vinagre.desktop" ]; categories = [ "X-GNOME-Utilities" ]; @@ -95,24 +86,15 @@ with lib.hm.gvariant; "org/gnome/desktop/screensaver" = { color-shading-type = "solid"; picture-options = "zoom"; - picture-uri = "file:///nix/store/4x0rqlvhvrzkbdigdr9mrgrb40cb52df-simple-blue-2016-02-19/share/backgrounds/nixos/nix-wallpaper-simple-blue.png"; + # picture-uri = "file:///nix/store/4x0rqlvhvrzkbdigdr9mrgrb40cb52df-simple-blue-2016-02-19/share/backgrounds/nixos/nix-wallpaper-simple-blue.png"; primary-color = "#3a4ba0"; secondary-color = "#2f302f"; }; - "org/gnome/desktop/wm/keybindings" = { - maximize = []; - unmaximize = []; - }; - "org/gnome/desktop/wm/preferences" = { button-layout = "appmenu:minimize,maximize,close"; }; - "org/gnome/evolution-data-server" = { - migrated = true; - }; - "org/gnome/gnome-system-monitor" = { # cpu-colors = [ (mkTuple [ mkUint32 0 "#e6194B" ]) (mkTuple [ 1 "#f58231" ]) (mkTuple [ 2 "#ffe119" ]) (mkTuple [ 3 "#bfef45" ]) (mkTuple [ 4 "#3cb44b" ]) (mkTuple [ 5 "#42d4f4" ]) (mkTuple [ 6 "#4363d8" ]) (mkTuple [ 7 "#911eb4" ]) (mkTuple [ 8 "#f032e6" ]) (mkTuple [ 9 "#fabebe" ]) (mkTuple [ 10 "#ffd8b1" ]) (mkTuple [ 11 "#fffac8" ]) (mkTuple [ 12 "#aaffc3" ]) (mkTuple [ 13 "#469990" ]) (mkTuple [ 14 "#000075" ]) (mkTuple [ 15 "#e6beff" ]) (mkTuple [ 16 "#d4867999f332" ]) (mkTuple [ 17 "#7999f332b10b" ]) (mkTuple [ 18 "#f3328d907999" ]) (mkTuple [ 19 "#7999891df332" ]) ]; current-tab = "disks"; @@ -150,7 +132,7 @@ with lib.hm.gvariant; disabled-extensions = [ "workspace-indicator@gnome-shell-extensions.gcampax.github.com" ]; enabled-extensions = [ "blur-my-shell@aunetx" "caffeine@patapon.info" "dash-to-dock@micxgx.gmail.com" "user-theme@gnome-shell-extensions.gcampax.github.com" "Vitals@CoreCoding.com" "tiling-assistant@leleat-on-github" ]; favorite-apps = [ "org.gnome.Nautilus.desktop" "firefox.desktop" "org.gnome.Console.desktop" "bitwarden.desktop" "steam.desktop" "net.lutris.Lutris.desktop" ]; - welcome-dialog-last-shown-version = "44.2"; + # welcome-dialog-last-shown-version = "44.2"; }; "org/gnome/shell/extensions/caffeine" = { @@ -168,8 +150,9 @@ with lib.hm.gvariant; height-fraction = 0.9; icon-size-fixed = false; isolate-workspaces = false; - preferred-monitor = -2; - preferred-monitor-by-connector = "eDP-1"; + # Will change based on which computer I'm on + # preferred-monitor = -2; + # preferred-monitor-by-connector = "eDP-1"; show-icons-emblems = true; show-icons-notifications-counter = true; show-show-apps-button = false; @@ -222,11 +205,12 @@ with lib.hm.gvariant; window-gap = 20; }; - "org/gnome/shell/extensions/vitals" = { - hot-sensors = [ "_memory_usage_" "_system_load_1m_" "__network-rx_max__" "_battery_rate_" "_battery_state_" "_battery_time_left_" ]; - show-battery = true; - show-voltage = false; - }; + # This will change depending on what computer I'm on + # "org/gnome/shell/extensions/vitals" = { + # hot-sensors = [ "_memory_usage_" "_system_load_1m_" "__network-rx_max__" "_battery_rate_" "_battery_state_" "_battery_time_left_" ]; + # show-battery = true; + # show-voltage = false; + # }; "org/gnome/shell/weather" = { automatic-location = true;