diff --git a/README.md b/README.md index 8fcdf4f..93fe9ae 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,9 @@ -# A NIX Config To Rule Them all -_now mostly focused on my Mac Machines_ +# A macOS nix-darwin config -Started with a configuration generated from [this nixos config template](https://github.com/dustinlyons/nixos-config/) +This repository now focuses on macOS systems managed with nix-darwin. -Installed nix with `--nix-build-group-id 30000` +Started with a configuration generated from [this nixos config template](https://github.com/dustinlyons/nixos-config/)Installed nix with `--nix-build-group-id 30000` Initialy created 'with secrets' but stripped out the git/agenix in favor of sops -``` -mkdir -p nixos-config && cd nixos-config && nix flake --extra-experimental-features 'nix-command flakes' init -t github:dustinlyons/nixos-config#starter-with-secrets -``` +Refactored the configuration to remove nixos but keep the shared modules and Darwin host setup, with no NixOS trees or Linux app targets. diff --git a/apps/aarch64-darwin/apply b/apps/aarch64-darwin/apply index b6c5dfe..10ba828 100755 --- a/apps/aarch64-darwin/apply +++ b/apps/aarch64-darwin/apply @@ -35,27 +35,11 @@ _prompt() { read -r $variable } -ask_for_star() { - _print "${YELLOW}Would you like to support my work by starring my GitHub repo? yes/no [yes]: ${NC}" - local response - read -r response - response=${response:-yes} # Set default response to 'yes' if input is empty - if [[ "$response" =~ ^[Yy](es)?$ ]] || [[ -z "$response" ]]; then - if [[ "$OS" == "Darwin" ]]; then - open "https://github.com/dustinlyons/nixos-config" - else - xdg-open "https://github.com/dustinlyons/nixos-config" - fi - fi -} - -ask_for_star - # Fetch username from the system export USERNAME=$(whoami) -# If the username is 'nixos' or 'root', ask the user for their username -if [[ "$USERNAME" == "nixos" ]] || [[ "$USERNAME" == "root" ]]; then +# If the username is 'root', ask the user for their username +if [[ "$USERNAME" == "root" ]]; then _prompt "${YELLOW}You're running as $USERNAME. Please enter your desired username: ${NC}" USERNAME fi @@ -101,24 +85,11 @@ select_boot_disk() { fi } -# Set hostname and find primary disk if this is NixOS -if [[ "$OS" != "Darwin" ]]; then - _prompt "${YELLOW}Please enter a hostname for the system: ${NC}" HOST_NAME - export HOST_NAME - select_boot_disk -fi - confirm_details() { _print "${GREEN}Username: $USERNAME" _print "Email: $GIT_EMAIL" _print "Name: $GIT_NAME${NC}" - if([[ "$OS" != "Darwin" ]]); then - _print "${GREEN}Primary interface: $PRIMARY_IFACE" - _print "Boot disk: $BOOT_DISK" - _print "Hostname: $HOST_NAME${NC}" - fi - _prompt "${YELLOW}Is this correct? yes/no: ${NC}" choice case "$choice" in diff --git a/apps/aarch64-linux b/apps/aarch64-linux deleted file mode 120000 index 9bdfd5f..0000000 --- a/apps/aarch64-linux +++ /dev/null @@ -1 +0,0 @@ -x86_64-linux \ No newline at end of file diff --git a/apps/x86_64-darwin/apply b/apps/x86_64-darwin/apply index b6c5dfe..10ba828 100644 --- a/apps/x86_64-darwin/apply +++ b/apps/x86_64-darwin/apply @@ -35,27 +35,11 @@ _prompt() { read -r $variable } -ask_for_star() { - _print "${YELLOW}Would you like to support my work by starring my GitHub repo? yes/no [yes]: ${NC}" - local response - read -r response - response=${response:-yes} # Set default response to 'yes' if input is empty - if [[ "$response" =~ ^[Yy](es)?$ ]] || [[ -z "$response" ]]; then - if [[ "$OS" == "Darwin" ]]; then - open "https://github.com/dustinlyons/nixos-config" - else - xdg-open "https://github.com/dustinlyons/nixos-config" - fi - fi -} - -ask_for_star - # Fetch username from the system export USERNAME=$(whoami) -# If the username is 'nixos' or 'root', ask the user for their username -if [[ "$USERNAME" == "nixos" ]] || [[ "$USERNAME" == "root" ]]; then +# If the username is 'root', ask the user for their username +if [[ "$USERNAME" == "root" ]]; then _prompt "${YELLOW}You're running as $USERNAME. Please enter your desired username: ${NC}" USERNAME fi @@ -101,24 +85,11 @@ select_boot_disk() { fi } -# Set hostname and find primary disk if this is NixOS -if [[ "$OS" != "Darwin" ]]; then - _prompt "${YELLOW}Please enter a hostname for the system: ${NC}" HOST_NAME - export HOST_NAME - select_boot_disk -fi - confirm_details() { _print "${GREEN}Username: $USERNAME" _print "Email: $GIT_EMAIL" _print "Name: $GIT_NAME${NC}" - if([[ "$OS" != "Darwin" ]]); then - _print "${GREEN}Primary interface: $PRIMARY_IFACE" - _print "Boot disk: $BOOT_DISK" - _print "Hostname: $HOST_NAME${NC}" - fi - _prompt "${YELLOW}Is this correct? yes/no: ${NC}" choice case "$choice" in diff --git a/apps/x86_64-linux/apply b/apps/x86_64-linux/apply deleted file mode 100644 index 250c34a..0000000 --- a/apps/x86_64-linux/apply +++ /dev/null @@ -1,169 +0,0 @@ -#!/usr/bin/env bash - -VERSION=1.0 - -# Color codes -RED='\033[0;31m' -GREEN='\033[0;32m' -YELLOW='\033[1;33m' -NC='\033[0m' # No Color - -# Determine the operating system -export OS=$(uname) - -# Primary network interface -if [[ "$OS" != "Darwin" ]]; then - export PRIMARY_IFACE=$(ip -o -4 route show to default | awk '{print $5}') - echo -e "${GREEN}Found primary network interface $PRIMARY_IFACE${NC}" -fi - -# Custom print function -_print() { - if [[ "$OS" == "Darwin" ]]; then - echo -e "$1" - else - echo "$1" - fi -} - -# Custom prompt function -_prompt() { - local message="$1" - local variable="$2" - - _print "$message" - read -r $variable -} - -ask_for_star() { - _print "${YELLOW}Would you like to support my work by starring my GitHub repo? yes/no [yes]: ${NC}" - local response - read -r response - response=${response:-yes} # Set default response to 'yes' if input is empty - if [[ "$response" =~ ^[Yy](es)?$ ]] || [[ -z "$response" ]]; then - if [[ "$OS" == "Darwin" ]]; then - open "https://github.com/dustinlyons/nixos-config" - else - xdg-open "https://github.com/dustinlyons/nixos-config" - fi - fi -} - -ask_for_star - -# Fetch username from the system -export USERNAME=$(whoami) - -# If the username is 'nixos' or 'root', ask the user for their username -if [[ "$USERNAME" == "nixos" ]] || [[ "$USERNAME" == "root" ]]; then - _prompt "${YELLOW}You're running as $USERNAME. Please enter your desired username: ${NC}" USERNAME -fi - -# Check if git is available -if command -v git >/dev/null 2>&1; then - # Fetch email and name from git config - export GIT_EMAIL=$(git config --get user.email) - export GIT_NAME=$(git config --get user.name) -else - _print "${RED}Git is not available on this system.${NC}" -fi - -# If git email is not found or git is not available, ask the user -if [[ -z "$GIT_EMAIL" ]]; then - _prompt "${YELLOW}Please enter your email: ${NC}" GIT_EMAIL -fi - -# If git name is not found or git is not available, ask the user -if [[ -z "$GIT_NAME" ]]; then - _prompt "${YELLOW}Please enter your name: ${NC}" GIT_NAME -fi - -select_boot_disk() { - local disks - local _boot_disk - - _print "${YELLOW}Available disks:${NC}" - disks=$(lsblk -nd --output NAME,SIZE | grep -v loop) - echo "$disks" - - # Warning message for data deletion - _print "${RED}WARNING: All data on the chosen disk will be erased during the installation!${NC}" - _prompt "${YELLOW}Please enter the name of your boot disk (e.g., sda, nvme0n1). Do not include the full path ("/dev/"): ${NC}" _boot_disk - - # Confirmation for disk selection to prevent accidental data loss - _print "${YELLOW}You have selected $_boot_disk as the boot disk. This will delete everything on this disk. Are you sure? (Y/N): ${NC}" - read -r confirmation - if [[ "$confirmation" =~ ^[Yy]$ ]]; then - export BOOT_DISK=$_boot_disk - else - _print "${RED}Disk selection cancelled by the user. Please run the script again to select the correct disk.${NC}" - exit 1 - fi -} - -# Set hostname and find primary disk if this is NixOS -if [[ "$OS" != "Darwin" ]]; then - _prompt "${YELLOW}Please enter a hostname for the system: ${NC}" HOST_NAME - export HOST_NAME - select_boot_disk -fi - -# Confirmation step -confirm_details() { - _print "${GREEN}Username: $USERNAME" - _print "Email: $GIT_EMAIL" - _print "Name: $GIT_NAME${NC}" - - if([[ "$OS" != "Darwin" ]]); then - _print "${GREEN}Primary interface: $PRIMARY_IFACE" - _print "Boot disk: $BOOT_DISK" - _print "Hostname: $HOST_NAME${NC}" - fi - - _prompt "${YELLOW}Is this correct? yes/no: ${NC}" choice - - case "$choice" in - [Nn] | [Nn][Oo] ) - _print "${RED}Exiting script.${NC}" - exit 1 - ;; - [Yy] | [Yy][Ee][Ss] ) - _print "${GREEN}Continuing...${NC}" - ;; - * ) - _print "${RED}Invalid option. Exiting script.${NC}" - exit 1 - ;; - esac -} - -# Call the confirmation function -confirm_details - -# Function to replace tokens in each file -replace_tokens() { - local file="$1" - if [[ $(basename $1) != "apply" ]]; then - if [[ "$OS" == "Darwin" ]]; then - # macOS - LC_ALL=C LANG=C sed -i '' -e "s/%USER%/$USERNAME/g" "$file" - LC_ALL=C LANG=C sed -i '' -e "s/%EMAIL%/$GIT_EMAIL/g" "$file" - LC_ALL=C LANG=C sed -i '' -e "s/%NAME%/$GIT_NAME/g" "$file" - else - # Linux or other - sed -i -e "s/%USER%/$USERNAME/g" "$file" - sed -i -e "s/%EMAIL%/$GIT_EMAIL/g" "$file" - sed -i -e "s/%NAME%/$GIT_NAME/g" "$file" - sed -i -e "s/%INTERFACE%/$PRIMARY_IFACE/g" "$file" - sed -i -e "s/%DISK%/$BOOT_DISK/g" "$file" - sed -i -e "s/%HOST%/$HOST_NAME/g" "$file" - fi - fi -} - -# Traverse directories and call replace_tokens on each Nix file -export -f replace_tokens -find . -type f -exec bash -c 'replace_tokens "$0"' {} \; - -echo "$USERNAME" > /tmp/username.txt -_print "${GREEN}User $USERNAME information applied.${NC}" diff --git a/apps/x86_64-linux/build-switch b/apps/x86_64-linux/build-switch deleted file mode 100644 index 0a54a87..0000000 --- a/apps/x86_64-linux/build-switch +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -e - -VERSION=1.0 - -GREEN='\033[1;32m' -RED='\033[1;31m' -YELLOW='\033[1;33m' -NC='\033[0m' - -SYSTEM=$(uname -m) - -case "$SYSTEM" in - x86_64) - FLAKE_TARGET="x86_64-linux" - ;; - aarch64) - FLAKE_TARGET="aarch64-linux" - ;; - *) - echo -e "${RED}Unsupported architecture: $SYSTEM${NC}" - exit 1 - ;; -esac - -echo -e "${YELLOW}Starting...${NC}" - -# We pass SSH from user to root so root can download secrets from our private Github -sudo SSH_AUTH_SOCK=$SSH_AUTH_SOCK /run/current-system/sw/bin/nixos-rebuild switch --flake .#$FLAKE_TARGET $@ - -echo -e "${GREEN}Switch to new generation complete!${NC}" diff --git a/flake.nix b/flake.nix index a9b6a41..a839af8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "Starter Configuration with secrets (removed) for MacOS and NixOS"; + description = "Starter configuration for macOS with nix-darwin"; inputs = { nixpkgs = { url = "github:nixos/nixpkgs//nixpkgs-26.05-darwin"; @@ -36,10 +36,6 @@ url = "github:homebrew/homebrew-cask"; flake = false; }; - disko = { - url = "github:nix-community/disko"; - inputs.nixpkgs.follows = "nixpkgs"; - }; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -69,7 +65,6 @@ homebrew-cask, home-manager, nixpkgs, - disko, nixd, sops-nix, nix-vscode-extensions, @@ -79,15 +74,11 @@ }@inputs: let user = "olaf"; - linuxSystems = [ - "x86_64-linux" - "aarch64-linux" - ]; darwinSystems = [ "aarch64-darwin" "x86_64-darwin" ]; - forAllSystems = f: nixpkgs.lib.genAttrs (linuxSystems ++ darwinSystems) f; + forAllSystems = f: nixpkgs.lib.genAttrs darwinSystems f; devShell = system: let @@ -121,11 +112,6 @@ '') }/bin/${scriptName}"; }; - mkLinuxApps = system: { - "apply" = mkApp "apply" system; - "build-switch" = mkApp "build-switch" system; - "install" = mkApp "install" system; - }; mkDarwinApps = system: { "apply" = mkApp "apply" system; "build" = mkApp "build" system; @@ -135,8 +121,7 @@ in { devShells = forAllSystems devShell; - apps = - nixpkgs.lib.genAttrs linuxSystems mkLinuxApps // nixpkgs.lib.genAttrs darwinSystems mkDarwinApps; + apps = nixpkgs.lib.genAttrs darwinSystems mkDarwinApps; darwinConfigurations = nixpkgs.lib.genAttrs darwinSystems ( system: @@ -144,7 +129,6 @@ inherit system; specialArgs = inputs; modules = [ - # sops-nix.nixosModules.sops home-manager.darwinModules.home-manager nix-homebrew.darwinModules.nix-homebrew # mac-app-util.darwinModules.default @@ -170,26 +154,5 @@ ]; } ); - - nixosConfigurations = nixpkgs.lib.genAttrs linuxSystems ( - system: - nixpkgs.lib.nixosSystem { - inherit system; - specialArgs = inputs; - modules = [ - sops-nix.nixosModules.sops - disko.nixosModules.disko - home-manager.nixosModules.home-manager - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - users.${user} = import ./modules/nixos/home-manager.nix; - }; - } - ./hosts/nixos - ]; - } - ); }; } diff --git a/hosts/nixos/default.nix b/hosts/nixos/default.nix deleted file mode 100644 index b3d7c1b..0000000 --- a/hosts/nixos/default.nix +++ /dev/null @@ -1,357 +0,0 @@ -{ - config, - inputs, - pkgs, - ... -}: - -let - user = "olaf"; - keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOk8iAnIaa1deoc7jw8YACPNVka1ZFJxhnU4G74TmS+p" ]; -in -{ - imports = [ - ../../modules/nixos/disk-config.nix - ../../modules/shared - ]; - - # Use the systemd-boot EFI boot loader. - boot = { - loader = { - systemd-boot = { - enable = true; - configurationLimit = 42; - }; - efi.canTouchEfiVariables = true; - }; - initrd.availableKernelModules = [ - "xhci_pci" - "ahci" - "nvme" - "usbhid" - "usb_storage" - "sd_mod" - ]; - # Uncomment for AMD GPU - # initrd.kernelModules = [ "amdgpu" ]; - kernelPackages = pkgs.linuxPackages_latest; - kernelModules = [ "uinput" ]; - }; - - # Set your time zone. - time.timeZone = "America/New_York"; - - # The global useDHCP flag is deprecated, therefore explicitly set to false here. - # Per-interface useDHCP will be mandatory in the future, so this generated config - # replicates the default behaviour. - networking = { - hostName = "%HOST%"; # Define your hostname. - useDHCP = false; - interfaces."%INTERFACE%".useDHCP = true; - }; - - nix = { - nixPath = [ "nixos-config=/home/${user}/.local/share/src/nixos-config:/etc/nixos" ]; - settings = { - allowed-users = [ "${user}" ]; - trusted-users = [ - "@admin" - "${user}" - ]; - substituters = [ - "https://nix-community.cachix.org" - "https://cache.nixos.org" - ]; - trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ]; - }; - - package = pkgs.nix; - extraOptions = '' - experimental-features = nix-command flakes - ''; - }; - - # Manages keys and such - programs = { - gnupg.agent.enable = true; - - # Needed for anything GTK related - dconf.enable = true; - - # My shell - zsh.enable = true; - }; - - services = { - displayManager.defaultSession = "none+bspwm"; - xserver = { - enable = true; - - # Uncomment these for AMD or Nvidia GPU - # videoDrivers = [ "amdgpu" ]; - # videoDrivers = [ "nvidia" ]; - - # Uncomment this for Nvidia GPU - # This helps fix tearing of windows for Nvidia cards - # services.xserver.screenSection = '' - # Option "metamodes" "nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On}" - # Option "AllowIndirectGLXProtocol" "off" - # Option "TripleBuffer" "on" - # ''; - - # LightDM Display Manager - displayManager.lightdm = { - enable = true; - greeters.slick.enable = true; - background = ../../modules/nixos/config/login-wallpaper.png; - }; - - # Tiling window manager - windowManager.bspwm = { - enable = true; - }; - - xkb = { - # Turn Caps Lock into Ctrl - layout = "us"; - options = "ctrl:nocaps"; - }; - }; - - # Better support for general peripherals - libinput.enable = true; - - # Let's be able to SSH into this machine - openssh.enable = true; - - # Sync state between machines - # Sync state between machines - syncthing = { - enable = true; - openDefaultPorts = true; - dataDir = "/home/${user}/.local/share/syncthing"; - configDir = "/home/${user}/.config/syncthing"; - user = "${user}"; - group = "users"; - guiAddress = "127.0.0.1:8384"; - overrideFolders = true; - overrideDevices = true; - - settings = { - devices = { }; - options.globalAnnounceEnabled = false; # Only sync on LAN - }; - }; - - # Picom, my window compositor with fancy effects - # - # Notes on writing exclude rules: - # - # class_g looks up index 1 in WM_CLASS value for an application - # class_i looks up index 0 - # - # To find the value for a specific application, use `xprop` at the - # terminal and then click on a window of the application in question - # - picom = { - enable = true; - settings = { - animations = true; - animation-stiffness = 300.0; - animation-dampening = 35.0; - animation-clamping = false; - animation-mass = 1; - animation-for-workspace-switch-in = "auto"; - animation-for-workspace-switch-out = "auto"; - animation-for-open-window = "slide-down"; - animation-for-menu-window = "none"; - animation-for-transient-window = "slide-down"; - corner-radius = 12; - rounded-corners-exclude = [ - "class_i = 'polybar'" - "class_g = 'i3lock'" - ]; - round-borders = 3; - round-borders-exclude = [ ]; - round-borders-rule = [ ]; - shadow = true; - shadow-radius = 8; - shadow-opacity = 0.4; - shadow-offset-x = -8; - shadow-offset-y = -8; - fading = false; - inactive-opacity = 0.8; - frame-opacity = 0.7; - inactive-opacity-override = false; - active-opacity = 1.0; - focus-exclude = [ - ]; - - opacity-rule = [ - "100:class_g = 'i3lock'" - "60:class_g = 'Dunst'" - "100:class_g = 'Alacritty' && focused" - "90:class_g = 'Alacritty' && !focused" - ]; - - blur-kern = "3x3box"; - blur = { - method = "kernel"; - strength = 8; - background = false; - background-frame = false; - background-fixed = false; - kern = "3x3box"; - }; - - shadow-exclude = [ - "class_g = 'Dunst'" - ]; - - blur-background-exclude = [ - "class_g = 'Dunst'" - ]; - - backend = "glx"; - vsync = false; - mark-wmwin-focused = true; - mark-ovredir-focused = true; - detect-rounded-corners = true; - detect-client-opacity = false; - detect-transient = true; - detect-client-leader = true; - use-damage = true; - log-level = "info"; - - wintypes = { - normal = { - fade = true; - shadow = false; - }; - tooltip = { - fade = true; - shadow = false; - opacity = 0.75; - focus = true; - full-shadow = false; - }; - dock = { - shadow = false; - }; - dnd = { - shadow = false; - }; - popup_menu = { - opacity = 1.0; - }; - dropdown_menu = { - opacity = 1.0; - }; - }; - }; - }; - - gvfs.enable = true; # Mount, trash, and other functionalities - tumbler.enable = true; # Thumbnail support for images - - # Emacs runs as a daemon - emacs = { - enable = true; - package = pkgs.emacs-unstable; - }; - }; - - # When emacs builds from no cache, it exceeds the 90s timeout default - systemd.user.services.emacs = { - serviceConfig.TimeoutStartSec = "7min"; - }; - - # Enable CUPS to print documents - # services.printing.enable = true; - # services.printing.drivers = [ pkgs.brlaser ]; # Brother printer driver - - # Enable sound - # sound.enable = true; - # hardware.pulseaudio.enable = true; - - # Video support - hardware = { - graphics.enable = true; - # nvidia.modesetting.enable = true; - - # Enable Xbox support - # xone.enable = true; - - # Crypto wallet support - ledger.enable = true; - }; - - # Add docker daemon - virtualisation.docker.enable = true; - virtualisation.docker.logDriver = "json-file"; - - # It's me, it's you, it's everyone - users.users = { - ${user} = { - isNormalUser = true; - extraGroups = [ - "wheel" # Enable ‘sudo’ for the user. - "docker" - ]; - shell = pkgs.zsh; - openssh.authorizedKeys.keys = keys; - }; - - root = { - openssh.authorizedKeys.keys = keys; - }; - }; - - # Don't require password for users in `wheel` group for these commands - security.sudo = { - enable = true; - extraRules = [ - { - commands = [ - { - command = "${pkgs.systemd}/bin/reboot"; - options = [ "NOPASSWD" ]; - } - ]; - groups = [ "wheel" ]; - } - ]; - }; - - fonts.packages = with pkgs; [ - dejavu_fonts - emacs-all-the-icons-fonts - feather-font # from overlay - jetbrains-mono - font-awesome - noto-fonts - noto-fonts-color-emoji - ]; - - environment.systemPackages = with pkgs; [ - # Emacs with automatic package management from overlay - (emacsWithPackagesFromUsePackage { - config = ../config/emacs/emacs.el; - defaultInitFile = true; - package = emacs-unstable; - alwaysEnsure = true; - extraEmacsPackages = - epkgs: with epkgs; [ - magit - company - nix-mode - use-package - ]; - }) - gitAndTools.gitFull - inetutils - ]; - - system.stateVersion = "21.05"; # Don't change this -} diff --git a/modules/darwin/home-manager.nix b/modules/darwin/home-manager.nix index a7e1f85..46134fb 100644 --- a/modules/darwin/home-manager.nix +++ b/modules/darwin/home-manager.nix @@ -50,13 +50,14 @@ in # # If you have previously added these apps to your Mac App Store profile (but not installed them on this system), # you may receive an error message "Redownload Unavailable with This Apple ID". - # This message is safe to ignore. (https://github.com/dustinlyons/nixos-config/issues/83) + # This message is safe to ignore. masApps = { "1Password for Safari" = 1569813296; # (8.10.82) "Affinity Designer 2" = 1616831348; "Affinity Photo 2: Image Editor" = 1616822987; "Affinity Publisher 2" = 1606941598; + "Apple Remote Desktop" = 409907375; # (3.11) # "DaisyDisk" = 411643860; # (4.32) # Don't use this, we need the official version that is not sandboxed "Fantastical - Calendar" = 975937182; " Fedistar" = 6445863996; # (1.13.1) @@ -68,6 +69,7 @@ in "Night Sky" = 475772902; # 475772902 "Native SQLite Manager" = 1416282836; # (1.31.0) "Remarkable Desktop" = 1276493162; # (3.19.0) + "Slack for Desktop" = 803453959; # (4.45.60) "WiFi Explorer: Scanner" = 494803304; # (3.5.6) "Wireguard" = 1451685025; # (1.0.16) diff --git a/modules/nixos/README.md b/modules/nixos/README.md deleted file mode 100644 index 22dc572..0000000 --- a/modules/nixos/README.md +++ /dev/null @@ -1,10 +0,0 @@ -## Layout -``` -. -├── config # Config files not written in Nix -├── default.nix # Defines module, system-level config, -├── disk-config.nix # Disks, partitions, and filesystems -├── files.nix # Non-Nix, static configuration files (now immutable!) -├── home-manager.nix # Defines user programs -├── packages.nix # List of packages to install for NixOS -``` diff --git a/modules/nixos/config/login-wallpaper.png b/modules/nixos/config/login-wallpaper.png deleted file mode 100644 index 7a91f64..0000000 Binary files a/modules/nixos/config/login-wallpaper.png and /dev/null differ diff --git a/modules/nixos/config/polybar/bars.ini b/modules/nixos/config/polybar/bars.ini deleted file mode 100644 index 2cd1a7a..0000000 --- a/modules/nixos/config/polybar/bars.ini +++ /dev/null @@ -1,498 +0,0 @@ -;; ┌────────────────────────────────────────────────────┐ -;; │░█▀█░█▀█░█░░░█░█░█▀▄░█▀█░█▀▄░░░░░░░░░█▀▄░█▀█░█▀▄░█▀▀│ -;; │░█▀▀░█░█░█░░░░█░░█▀▄░█▀█░█▀▄░░░░▀░░░░█▀▄░█▀█░█▀▄░▀▀█│ -;; │░▀░░░▀▀▀░▀▀▀░░▀░░▀▀░░▀░▀░▀░▀░░░░▀░░░░▀▀░░▀░▀░▀░▀░▀▀▀│ -;; │░Created░By░Aditya░Shakya░@adi1090x░░░░░░░░░░░░░░░░░│ -;; └────────────────────────────────────────────────────┘ - -;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ - -[bar] -fill =  -empty =  -indicator = ⏽ -; Nerd font :   ,  ⏽,  樂 籠 錄 , 雷 絛 - -;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ - -[module/volume] -type = internal/alsa - -; Soundcard to be used -; Usually in the format hw:# where # is the card number -; You can find the different card numbers in `/proc/asound/cards` -master-soundcard = default -speaker-soundcard = default -headphone-soundcard = default - -; Name of the master, speaker and headphone mixers -; Use the following command to list available mixer controls: -; $ amixer scontrols | sed -nr "s/.*'([[:alnum:]]+)'.*/\1/p" -; If master, speaker or headphone-soundcard isn't the default, -; use `amixer -c # scontrols` instead where # is the number -; of the master, speaker or headphone soundcard respectively -; -; Default: Master -master-mixer = Master - -; Optionally define speaker and headphone mixers -; Default: none -;;speaker-mixer = Speaker -; Default: none -;;headphone-mixer = Headphone - -; NOTE: This is required if headphone_mixer is defined -; Use the following command to list available device controls -; $ amixer controls | sed -r "/CARD/\!d; s/.*=([0-9]+).*name='([^']+)'.*/printf '%3.0f: %s\n' '\1' '\2'/e" | sort -; You may also need to use `amixer -c # controls` as above for the mixer names -; Default: none -;;headphone-id = 9 - -; Use volume mapping (similar to amixer -M and alsamixer), where the increase in volume is linear to the ear -; Default: false -;;mapped = true - -; Interval for volume increase/decrease (in percent points) -; Default: 5 -interval = 5 - -; Available tags: -; (default) -; -; -format-volume = - -; Available tags: -; (default) -; -; -format-muted = -format-muted-prefix =  - -; Available tokens: -; %percentage% (default) -label-volume = %percentage%% - -; Available tokens: -; %percentage% (default -label-muted = " Muted" -label-muted-foreground = ${color.foreground-alt} - -; Only applies if is used -ramp-volume-0 =  -ramp-volume-1 =  -ramp-volume-2 =  - -; Only applies if is used -bar-volume-width = 10 -bar-volume-gradient = false - -bar-volume-indicator = ${bar.indicator} -bar-volume-indicator-foreground = ${color.foreground} - -bar-volume-fill = ${bar.fill} -bar-volume-foreground-0 = ${color.foreground} -bar-volume-foreground-1 = ${color.foreground} -bar-volume-foreground-2 = ${color.foreground} - -bar-volume-empty = ${bar.empty} -bar-volume-empty-foreground = ${color.foreground} - -; If defined, it will replace when -; headphones are plugged in to `headphone_control_numid` -; If undefined, will be used for both -; Only applies if is used -ramp-headphones-0 =  - -;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ - -[module/brightness] -;type = internal/xbacklight -type = internal/backlight - -; Use the following command to list available cards: -; $ ls -1 /sys/class/backlight/ -;card = intel_backlight -card = amdgpu_bl0 - -; Available tags: -;