From 818c797903dc8b8ff1f490f973521c2016230ec0 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 22 Jun 2022 11:00:41 -0500 Subject: [PATCH 01/14] Update xonsh-direnv --- overlays/xonsh-direnv.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/overlays/xonsh-direnv.nix b/overlays/xonsh-direnv.nix index 79afcad..07d57a5 100644 --- a/overlays/xonsh-direnv.nix +++ b/overlays/xonsh-direnv.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "xonsh-direnv"; - version = "1.5.0"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "OLjtGD2lX4Yf3aHrxCWmAbSPZnf8OuVrBu0VFbsna1Y="; + sha256 = "Nt8Da1EtMVWZ9mbBDjys7HDutLYifwoQ1HVmI5CN2Ww="; }; meta = with lib; { From 944ad44a58e02c070b706e14cd1feadd6ba9bb91 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 22 Jun 2022 11:00:58 -0500 Subject: [PATCH 02/14] Use Bitwarden FF plugin --- home/gui/firefox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/gui/firefox.nix b/home/gui/firefox.nix index d5513a0..d1b97c7 100644 --- a/home/gui/firefox.nix +++ b/home/gui/firefox.nix @@ -19,7 +19,7 @@ in with lib; }; }; extensions = with pkgs.nur.repos.rycee.firefox-addons; [ - keepassxc-browser + bitwarden octotree refined-github tree-style-tab From 1c67ef4fa0945b76bdcd98b5105255aeb404e3af Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 1 Aug 2022 21:46:23 -0500 Subject: [PATCH 03/14] Custom ISO based on Calamares --- hosts/iso/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/iso/default.nix b/hosts/iso/default.nix index 23333be..18535c8 100644 --- a/hosts/iso/default.nix +++ b/hosts/iso/default.nix @@ -2,7 +2,7 @@ { imports = [ - "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-base.nix" + "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix" ]; networking.networkmanager.enable = lib.mkForce false; From 8c69ccd3b2ad86dc2fd47bd9e1d952cd52c97a20 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 1 Aug 2022 21:47:13 -0500 Subject: [PATCH 04/14] Ignore result build --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c70dc2d..0d96e93 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ host +result From 78704b5c882084ffe58b4aed2e94c814de1e161e Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Tue, 2 Aug 2022 01:50:50 -0500 Subject: [PATCH 05/14] Convert home-manager to flakes Instead of calling the home manager directly in the user's list, we add a command for the user to invoke "hms" and have their environment setup in the way that Greg likes. --- flake.lock | 10 +++++----- flake.nix | 14 +++++++++----- home/default.nix | 35 +++++++++++++++++++++++++++++++++++ home/home.nix | 11 ++++++----- home/xonsh.nix | 6 ++---- hosts/jude/boot.nix | 6 ++++++ overlays/default.nix | 4 ++++ overlays/hms.nix | 20 ++++++++++++++++++++ profiles/base/default.nix | 7 +++++++ profiles/base/programs.nix | 1 + 10 files changed, 95 insertions(+), 19 deletions(-) create mode 100644 home/default.nix create mode 100644 overlays/hms.nix diff --git a/flake.lock b/flake.lock index a11ff8a..ed6b921 100644 --- a/flake.lock +++ b/flake.lock @@ -87,13 +87,13 @@ "type": "github" } }, - "nur": { + "nurpkgs": { "locked": { - "lastModified": 1654123271, - "narHash": "sha256-xM85/VFYu8I8jZiZ7U0CmZO/98sHO7+f7PIMxQVZXCM=", + "lastModified": 1659413279, + "narHash": "sha256-7tCR//2NnB1Xw2AqK0RTYJH9YcAEKHmhiSAYsBbQp8s=", "owner": "nix-community", "repo": "NUR", - "rev": "4c83235ccca7cfcf34fee9f49023f21c0e9db128", + "rev": "9bedf12848954098f5298215b3a06b5eb2983058", "type": "github" }, "original": { @@ -108,7 +108,7 @@ "home-manager": "home-manager", "nixpkgs": "nixpkgs_2", "nixunstable": "nixunstable", - "nur": "nur" + "nurpkgs": "nurpkgs" } } }, diff --git a/flake.nix b/flake.nix index b90f021..1180306 100644 --- a/flake.nix +++ b/flake.nix @@ -12,15 +12,15 @@ url = "github:nix-community/home-manager/release-22.05"; inputs.nixpkgs.follows = "nixpkgs"; }; - nur.url = "github:nix-community/NUR"; + nurpkgs.url = "github:nix-community/NUR"; }; - outputs = {nixpkgs, nixunstable, agenix, home-manager, nur, self}@inputs: + outputs = {nixpkgs, nixunstable, agenix, home-manager, nurpkgs, self}@inputs: let local_overlay = import ./overlays; mods = hostname: [ - { nixpkgs.overlays = [ nur.overlay local_overlay ]; } + { nixpkgs.overlays = [ nurpkgs.overlay local_overlay ]; } agenix.nixosModule ./modules ./profiles/base @@ -28,8 +28,6 @@ home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.greg = import ./home/home.nix "greg"; - home-manager.users.root = import ./home/home.nix "root"; home-manager.extraSpecialArgs = { inherit nixunstable; }; @@ -54,5 +52,11 @@ }; defaultPackage."x86_64-linux" = inputs.self.nixosConfigurations.iso.config.system.build.isoImage; + + homeConfigurations = ( + import ./home { + inherit nixpkgs nixunstable agenix home-manager nurpkgs; + } + ); }; } diff --git a/home/default.nix b/home/default.nix new file mode 100644 index 0000000..ec0ed68 --- /dev/null +++ b/home/default.nix @@ -0,0 +1,35 @@ +{ nixpkgs, nurpkgs, home-manager, username ? builtins.getEnv "USER", ... }: + +let + homeDirectory = if username == "root" then "/root" else "/home/${username}"; + configDir = "${homeDirectory}/.config"; + + pkgs = import nixpkgs { + config.allowUnfree = true; + config.xdg.configHome = configDir; + overlays = [ + nurpkgs.overlay + (import ../overlays) + ]; + }; + + nur = import nurpkgs { + inherit pkgs; + nur = pkgs; + }; + + mkhome = system: gui: + home-manager.lib.homeManagerConfiguration rec { + inherit pkgs system username homeDirectory; + stateVersion = "22.05"; + configuration = import ./home.nix username { + inherit nur pkgs gui; + inherit (pkgs) config lib stdenv; + }; + }; +in { + "aarch64-gui" = mkhome "aarch64-linux" true; + "aarch64-nogui" = mkhome "aarch64-linux" false; + "x86_64-gui" = mkhome "x86_64-linux" true; + "x86_64-nogui" = mkhome "x86_64-linux" false; +} diff --git a/home/home.nix b/home/home.nix index 55fc169..50b7f6f 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,7 +1,7 @@ -name: { pkgs, lib, nixosConfig, ...}: +name: { pkgs, lib, gui, ...}: let - guiImports = if nixosConfig.greg.gnome.enable then + guiImports = if gui then [ ./gui ] else []; in { @@ -17,7 +17,8 @@ in { ] ++ guiImports; - home.username = name; - home.homeDirectory = if name == "root" then "/root" else "/home/${name}"; - home.stateVersion = "21.11"; + home.stateVersion = "22.05"; + home.packages = [ + pkgs.hms + ]; } diff --git a/home/xonsh.nix b/home/xonsh.nix index 336d280..aafa96a 100644 --- a/home/xonsh.nix +++ b/home/xonsh.nix @@ -1,8 +1,6 @@ -{ pkgs, config, nixosConfig, lib, ... }: +{ pkgs, config, lib, ... }: -let - enable = nixosConfig.greg.gnome.enable; -in { +{ programs.xonsh = { enable = true; diff --git a/hosts/jude/boot.nix b/hosts/jude/boot.nix index 65f8ae9..f01208d 100644 --- a/hosts/jude/boot.nix +++ b/hosts/jude/boot.nix @@ -4,6 +4,12 @@ # Use the systemd-boot EFI boot loader. #boot.loader.systemd-boot.enable = true; boot.loader.grub.device = "/dev/nvme0n1"; + boot.loader.grub.useOSProber = true; + boot.loader.grub.extraEntries = '' + menuentry "Windows" { + chainloader (hd0,2)+1 + } + ''; boot.loader.efi.canTouchEfiVariables = true; networking.interfaces.enp4s0.useDHCP = true; } diff --git a/overlays/default.nix b/overlays/default.nix index 080869d..e228946 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -8,4 +8,8 @@ self: super: xonsh = super.xonsh.overridePythonAttrs (old: rec{ propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.xonsh-direnv ]; }); + + hms = super.callPackage ./hms.nix { + pkgs = self.pkgs; + }; } diff --git a/overlays/hms.nix b/overlays/hms.nix new file mode 100644 index 0000000..b3cefb1 --- /dev/null +++ b/overlays/hms.nix @@ -0,0 +1,20 @@ +{ pkgs, ... }: + +pkgs.writeShellScriptBin "hms" '' +set -eo pipefail +# Build different targets with GUI or not +if [ -z "$DISPLAY" ]; then + target="nogui" +else + target="gui" +fi + +# Build and switch +echo "Building $(uname -m)-$target" +dest=$(mktemp -d) +pushd "$dest" > /dev/null +nix build --impure /etc/nixos#homeConfigurations.$(uname -m)-$target.activationPackage +./result/activate +popd > /dev/null +rm -r "$dest" +'' diff --git a/profiles/base/default.nix b/profiles/base/default.nix index 043fb38..5e6b5b9 100755 --- a/profiles/base/default.nix +++ b/profiles/base/default.nix @@ -27,6 +27,13 @@ ]; }; + users.users.test = { + isNormalUser = true; + createHome = true; + extraGroups = [ ]; + shell = pkgs.xonsh; + }; + i18n.defaultLocale = "en_US.UTF-8"; console = { diff --git a/profiles/base/programs.nix b/profiles/base/programs.nix index 06afebb..f2f273a 100644 --- a/profiles/base/programs.nix +++ b/profiles/base/programs.nix @@ -15,6 +15,7 @@ in { git gnupatch findutils + hms # My own home manager switcher home-manager htop myPython From f502476e2980fed53bf1c92d52706995cdb8c5bb Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Tue, 2 Aug 2022 01:57:50 -0500 Subject: [PATCH 06/14] Add output overlay --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index 1180306..e8c2391 100644 --- a/flake.nix +++ b/flake.nix @@ -58,5 +58,7 @@ inherit nixpkgs nixunstable agenix home-manager nurpkgs; } ); + + overlay = local_overlay; }; } From 6e96c8f5e44e0276682f24cef9f5bbb1c38a1652 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Tue, 2 Aug 2022 12:47:32 -0500 Subject: [PATCH 07/14] Update flake lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index ed6b921..73ba5fd 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1654113405, - "narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=", + "lastModified": 1656169755, + "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=", "owner": "nix-community", "repo": "home-manager", - "rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675", + "rev": "4a3d01fb53f52ac83194081272795aa4612c2381", "type": "github" }, "original": { @@ -57,11 +57,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1654005557, - "narHash": "sha256-J6elwUzPoco+r5qWPHhvS2EHVWomUtNcxzkfdAQOwEU=", + "lastModified": 1659342832, + "narHash": "sha256-ePnxG4hacRd6oZMk+YeCSYMNUnHCe+qPLI0/+VaTu48=", "owner": "nixos", "repo": "nixpkgs", - "rev": "08950a6e29cf7bddee466592eb790a417550f7f9", + "rev": "e43cf1748462c81202a32b26294e9f8eefcc3462", "type": "github" }, "original": { @@ -73,11 +73,11 @@ }, "nixunstable": { "locked": { - "lastModified": 1653931853, - "narHash": "sha256-O3wncIouj9x7gBPntzHeK/Hkmm9M1SGlYq7JI7saTAE=", + "lastModified": 1659219666, + "narHash": "sha256-pzYr5fokQPHv7CmUXioOhhzDy/XyWOIXP4LZvv/T7Mk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f1c167688a6f81f4a51ab542e5f476c8c595e457", + "rev": "7b9be38c7250b22d829ab6effdee90d5e40c6e5c", "type": "github" }, "original": { @@ -89,11 +89,11 @@ }, "nurpkgs": { "locked": { - "lastModified": 1659413279, - "narHash": "sha256-7tCR//2NnB1Xw2AqK0RTYJH9YcAEKHmhiSAYsBbQp8s=", + "lastModified": 1659423577, + "narHash": "sha256-i2wSHqFqu4xpBJU/o9SRpQblAHknnEtyeN6Kuq/c1JA=", "owner": "nix-community", "repo": "NUR", - "rev": "9bedf12848954098f5298215b3a06b5eb2983058", + "rev": "0bdb7691364dc93c8f04016c0ed395b675bdc50c", "type": "github" }, "original": { From 0dfd8ef63f8e46906400b4209eddf2314b120d37 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Tue, 2 Aug 2022 16:06:39 -0500 Subject: [PATCH 08/14] Add modules to outputs --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index e8c2391..ee135e9 100644 --- a/flake.nix +++ b/flake.nix @@ -60,5 +60,6 @@ ); overlay = local_overlay; + modules = import ./modules; }; } From cecc289c6bd0ab49a37d958b5dfaa67e5dcf35ef Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sat, 13 Aug 2022 00:17:46 -0500 Subject: [PATCH 09/14] Add laptop configuration --- configuration.nix | 120 +++++++++++++++++++++++++ flake.nix | 2 + hardware-configuration.nix | 39 ++++++++ hosts/lappy/default.nix | 15 ++++ hosts/lappy/hardware-configuration.nix | 39 ++++++++ 5 files changed, 215 insertions(+) create mode 100644 configuration.nix create mode 100644 hardware-configuration.nix create mode 100644 hosts/lappy/default.nix create mode 100644 hosts/lappy/hardware-configuration.nix diff --git a/configuration.nix b/configuration.nix new file mode 100644 index 0000000..98ba06e --- /dev/null +++ b/configuration.nix @@ -0,0 +1,120 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ./profiles/nix.nix + ]; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.efi.efiSysMountPoint = "/boot/efi"; + + networking.hostName = "lappy"; # Define your hostname. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Enable networking + networking.networkmanager.enable = true; + + # Set your time zone. + time.timeZone = "America/Chicago"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.utf8"; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the GNOME Desktop Environment. + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; + + # Configure keymap in X11 + services.xserver = { + layout = "us"; + xkbVariant = ""; + }; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = true; + }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.greg = { + isNormalUser = true; + description = "Greg Hellings"; + extraGroups = [ "networkmanager" "wheel" ]; + packages = with pkgs; [ + firefox + # thunderbird + ]; + }; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + git + vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + wget + ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "22.05"; # Did you read the comment? + +} diff --git a/flake.nix b/flake.nix index ee135e9..0c49f14 100644 --- a/flake.nix +++ b/flake.nix @@ -48,6 +48,8 @@ "jude" = machine "x86_64-linux" "jude"; + "lappy" = machine "x86_64-linux" "lappy"; + "iso" = machine "x86_64-linux" "iso"; }; diff --git a/hardware-configuration.nix b/hardware-configuration.nix new file mode 100644 index 0000000..19de254 --- /dev/null +++ b/hardware-configuration.nix @@ -0,0 +1,39 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "rtsx_usb_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/63bcc80e-0501-4aef-bb58-30bb83881055"; + fsType = "ext4"; + }; + + fileSystems."/boot/efi" = + { device = "/dev/disk/by-uuid/C617-B2B1"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/bc4f24a3-5969-4bcb-95f4-f80109e36ebb"; } + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp7s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true; + + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/lappy/default.nix b/hosts/lappy/default.nix new file mode 100644 index 0000000..fb9dd7e --- /dev/null +++ b/hosts/lappy/default.nix @@ -0,0 +1,15 @@ +{ ... }: + +{ + imports = [ + ./hardware-configuration.nix + ]; + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.efi.efiSysMountPoint = "/boot/efi"; + # Graphics, please + greg.gnome.enable = true; + # Set host name + networking.hostName = "lappy"; +} diff --git a/hosts/lappy/hardware-configuration.nix b/hosts/lappy/hardware-configuration.nix new file mode 100644 index 0000000..19de254 --- /dev/null +++ b/hosts/lappy/hardware-configuration.nix @@ -0,0 +1,39 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "rtsx_usb_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/63bcc80e-0501-4aef-bb58-30bb83881055"; + fsType = "ext4"; + }; + + fileSystems."/boot/efi" = + { device = "/dev/disk/by-uuid/C617-B2B1"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/bc4f24a3-5969-4bcb-95f4-f80109e36ebb"; } + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp7s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true; + + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} From 763e2fd2017cde1ab92594e19c40268d664ced4a Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sat, 13 Aug 2022 00:40:01 -0500 Subject: [PATCH 10/14] Streamline modules and profiles --- flake.nix | 1 - modules/automatic.nix | 12 +++++++++++ {profiles/base => modules/automatic}/nix.nix | 1 + .../base => modules/automatic}/programs.nix | 0 .../base => modules/automatic}/syncthing.nix | 0 .../automatic/users.nix | 21 ------------------- modules/default.nix | 1 + 7 files changed, 14 insertions(+), 22 deletions(-) create mode 100644 modules/automatic.nix rename {profiles/base => modules/automatic}/nix.nix (93%) rename {profiles/base => modules/automatic}/programs.nix (100%) rename {profiles/base => modules/automatic}/syncthing.nix (100%) rename profiles/base/default.nix => modules/automatic/users.nix (86%) mode change 100755 => 100644 diff --git a/flake.nix b/flake.nix index 0c49f14..600512c 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,6 @@ { nixpkgs.overlays = [ nurpkgs.overlay local_overlay ]; } agenix.nixosModule ./modules - ./profiles/base ./hosts/${hostname} home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/modules/automatic.nix b/modules/automatic.nix new file mode 100644 index 0000000..b8f2f38 --- /dev/null +++ b/modules/automatic.nix @@ -0,0 +1,12 @@ +{ ... }: + +{ + imports = [ + ./automatic/nix.nix + ./automatic/programs.nix + ./automatic/syncthing.nix + ./automatic/users.nix + ]; + # I am a fan of network manager, myself + networking.networkmanager.enable = true; +} diff --git a/profiles/base/nix.nix b/modules/automatic/nix.nix similarity index 93% rename from profiles/base/nix.nix rename to modules/automatic/nix.nix index 3a964da..3d71a48 100644 --- a/profiles/base/nix.nix +++ b/modules/automatic/nix.nix @@ -20,4 +20,5 @@ keep-derivations = true autoOptimiseStore = true; }; nixpkgs.config.allowUnfree = true; + system.stateVersion = "22.05"; } diff --git a/profiles/base/programs.nix b/modules/automatic/programs.nix similarity index 100% rename from profiles/base/programs.nix rename to modules/automatic/programs.nix diff --git a/profiles/base/syncthing.nix b/modules/automatic/syncthing.nix similarity index 100% rename from profiles/base/syncthing.nix rename to modules/automatic/syncthing.nix diff --git a/profiles/base/default.nix b/modules/automatic/users.nix old mode 100755 new mode 100644 similarity index 86% rename from profiles/base/default.nix rename to modules/automatic/users.nix index 5e6b5b9..e9f47a6 --- a/profiles/base/default.nix +++ b/modules/automatic/users.nix @@ -1,16 +1,6 @@ { config, pkgs, agenix, ... }: { - imports = [ - ./nix.nix - ./programs.nix - ./syncthing.nix - ]; - - - # I am a fan of network manager, myself - networking.networkmanager.enable = true; - # Enable the OpenSSH daemon for remote control services.openssh.enable = true; #services.openssh.permitRootLogin = "yes"; @@ -27,21 +17,10 @@ ]; }; - users.users.test = { - isNormalUser = true; - createHome = true; - extraGroups = [ ]; - shell = pkgs.xonsh; - }; - i18n.defaultLocale = "en_US.UTF-8"; console = { font = "Lat2-Terminus16"; keyMap = "us"; }; - - # The set of default values, which allow syou to keep system defaults set - # to a predictable value as you upgrade the system - system.stateVersion = "21.11"; } diff --git a/modules/default.nix b/modules/default.nix index 2a2d0c4..f39ef20 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -2,6 +2,7 @@ { imports = [ + ./automatic.nix ./home.nix ./gnome.nix ./linode.nix From 36e370fb73d2f6eccd340c72e9f3866ff304fee3 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sat, 13 Aug 2022 00:42:30 -0500 Subject: [PATCH 11/14] Default configuration.nix file --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 98ba06e..f860526 100644 --- a/configuration.nix +++ b/configuration.nix @@ -8,7 +8,7 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ./profiles/nix.nix + ./modules/automatic/nix.nix ]; # Bootloader. From 46630f69bc610c1274351148d779cce2864200ac Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 19 Aug 2022 10:17:23 -0500 Subject: [PATCH 12/14] Synology plus Gnome oneline --- home/gui/default.nix | 1 + modules/gnome.nix | 38 ++++++++++++++++++++++---------------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/home/gui/default.nix b/home/gui/default.nix index 4ee5a48..7e39d17 100644 --- a/home/gui/default.nix +++ b/home/gui/default.nix @@ -10,5 +10,6 @@ home.packages = with pkgs; [ bitwarden onlyoffice-bin + synology-drive-client ]; } diff --git a/modules/gnome.nix b/modules/gnome.nix index 45cd953..dbea52a 100644 --- a/modules/gnome.nix +++ b/modules/gnome.nix @@ -12,13 +12,28 @@ in with lib; { greg.xprograms.enable = true; # Sets up a basic Gnome installation - services.xserver = { - enable = true; - displayManager.gdm.enable = true; - desktopManager.gnome.enable = true; - layout = "us"; - # Trackpad support - libinput.enable = true; + services = { + xserver = { + enable = true; + displayManager.gdm.enable = true; + desktopManager.gnome.enable = true; + layout = "us"; + # Trackpad support + libinput.enable = true; + }; + + udev.packages = with pkgs; [ + gnome3.gnome-settings-daemon + ]; + + pipewire.enable = true; + + # Enablement for Firefox + gnome = { + chrome-gnome-shell.enable = true; + sushi.enable = true; + gnome-online-accounts.enable = true; + }; }; programs.dconf.enable = true; @@ -35,14 +50,5 @@ in with lib; { gnomeExtensions.appindicator gnomeExtensions.dash-to-dock ]; - - services.udev.packages = with pkgs; [ - gnome3.gnome-settings-daemon - ]; - - services.pipewire.enable = true; - - # Enablement for Firefox - services.gnome.chrome-gnome-shell.enable = true; }; } From 2681a2f58e153fe2976e8cb54ef853063a0d4cbc Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 19 Aug 2022 10:55:21 -0500 Subject: [PATCH 13/14] VLC and associated bits --- home/gui/default.nix | 1 + home/home.nix | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/home/gui/default.nix b/home/gui/default.nix index 7e39d17..0cf4a31 100644 --- a/home/gui/default.nix +++ b/home/gui/default.nix @@ -11,5 +11,6 @@ bitwarden onlyoffice-bin synology-drive-client + vlc ]; } diff --git a/home/home.nix b/home/home.nix index 50b7f6f..b9e007d 100644 --- a/home/home.nix +++ b/home/home.nix @@ -18,7 +18,11 @@ in { home.stateVersion = "22.05"; - home.packages = [ - pkgs.hms + home.packages = with pkgs; [ + cdrtools + ffmpeg + hms + libtheora + x265 ]; } From cf6ccf2bf714e16beee53ea8ac7fee3a0ca398cb Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sun, 21 Aug 2022 21:57:29 -0500 Subject: [PATCH 14/14] Add handbrake and other tools --- home/gui/default.nix | 1 + modules/gnome.nix | 3 +++ 2 files changed, 4 insertions(+) diff --git a/home/gui/default.nix b/home/gui/default.nix index 0cf4a31..54ae780 100644 --- a/home/gui/default.nix +++ b/home/gui/default.nix @@ -9,6 +9,7 @@ home.packages = with pkgs; [ bitwarden + handbrake onlyoffice-bin synology-drive-client vlc diff --git a/modules/gnome.nix b/modules/gnome.nix index dbea52a..b168e8e 100644 --- a/modules/gnome.nix +++ b/modules/gnome.nix @@ -47,7 +47,10 @@ in with lib; { # Enable some Gnome plugins that I like environment.systemPackages = with pkgs; [ gnome3.adwaita-icon-theme + gnome3.gnome-tweaks + gnome3.dconf-editor gnomeExtensions.appindicator + gnomeExtensions.clipboard-indicator gnomeExtensions.dash-to-dock ]; };