From a78b85b344bf23cc1b5ae6320d4095704a31de67 Mon Sep 17 00:00:00 2001 From: Evan Reichard Date: Fri, 28 Mar 2025 13:52:51 -0400 Subject: [PATCH] almost --- .gitignore | 1 + README.md | 0 flake.lock | 31 ++--- flake.nix | 3 +- .../evanreichard@MBP-Personal/README.md | 0 .../evanreichard@MBP-Personal/default.nix | 0 .../evanreichard@MBP-Work/default.nix | 0 .../evanreichard@mbp-nixos/README.md | 40 ++++++ .../evanreichard@mbp-nixos/default.nix | 37 +++++ lib/common-system.nix | 103 -------------- lib/disk-config.nix | 43 ------ modules/home/programs/aws/default.nix | 0 modules/home/programs/btop/config/btop.conf | 0 .../btop/config/catppuccin_mocha.theme | 0 modules/home/programs/btop/default.nix | 0 modules/home/programs/direnv/default.nix | 0 .../programs/ghostty/config/fastfetch.jsonc | 0 .../home/programs/ghostty/config/ghostty.conf | 0 modules/home/programs/ghostty/default.nix | 0 modules/home/programs/git/config/.gitignore | 0 modules/home/programs/git/config/personal | 0 modules/home/programs/git/config/work | 0 modules/home/programs/git/default.nix | 0 .../programs/hyprland/config/hyprland.conf | 27 ++-- .../programs/hyprland/config/waybar-style.css | 0 .../programs/hyprland/config/wofi-style.css | 127 ++++++++++++++++++ .../home/programs/hyprland/config/wofi.conf | 3 + modules/home/programs/hyprland/default.nix | 14 +- modules/home/programs/k9s/default.nix | 0 .../home/programs/nvim/config/lua/.luarc.json | 0 .../nvim/config/lua/aerial-config.lua | 0 .../nvim/config/lua/autopairs-config.lua | 0 .../home/programs/nvim/config/lua/base.lua | 0 .../programs/nvim/config/lua/cmp-config.lua | 0 .../nvim/config/lua/comment-config.lua | 0 .../programs/nvim/config/lua/dap-config.lua | 0 .../nvim/config/lua/diffview-config.lua | 0 .../home/programs/nvim/config/lua/git-ref.lua | 0 .../programs/nvim/config/lua/git-signs.lua | 0 .../home/programs/nvim/config/lua/init.lua | 0 .../programs/nvim/config/lua/leap-config.lua | 0 modules/home/programs/nvim/config/lua/llm.lua | 0 .../programs/nvim/config/lua/lsp-config.lua | 0 .../nvim/config/lua/lsp-lines-config.lua | 0 .../nvim/config/lua/lualine-config.lua | 0 .../nvim/config/lua/neotree-config.lua | 0 .../programs/nvim/config/lua/noice-config.lua | 0 .../programs/nvim/config/lua/numb-config.lua | 0 .../nvim/config/lua/silicon-config.lua | 0 .../nvim/config/lua/telescope-config.lua | 0 .../nvim/config/lua/toggleterm-config.lua | 0 .../programs/nvim/config/lua/ts-config.lua | 0 .../programs/nvim/config/lua/weird-chars.lua | 0 .../nvim/config/lua/which-key-config.lua | 0 modules/home/programs/nvim/default.nix | 0 systems/aarch64-linux/mbp-nixos/.gitignore | 1 + systems/aarch64-linux/mbp-nixos/default.nix | 16 +-- .../mbp-nixos/hardware-configuration.nix | 37 +++++ .../x86_64-linux/nixos-builder/default.nix | 0 .../x86_64-linux/office-server/default.nix | 0 .../x86_64-linux/utility-desktop/default.nix | 0 systems/x86_64-virtual/rke2-image.nix | 0 systems/x86_64-virtual/usb-image.nix | 0 63 files changed, 297 insertions(+), 186 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 README.md mode change 100644 => 100755 flake.lock mode change 100644 => 100755 flake.nix mode change 100644 => 100755 homes/aarch64-darwin/evanreichard@MBP-Personal/README.md mode change 100644 => 100755 homes/aarch64-darwin/evanreichard@MBP-Personal/default.nix mode change 100644 => 100755 homes/aarch64-darwin/evanreichard@MBP-Work/default.nix create mode 100755 homes/aarch64-linux/evanreichard@mbp-nixos/README.md create mode 100755 homes/aarch64-linux/evanreichard@mbp-nixos/default.nix delete mode 100644 lib/common-system.nix delete mode 100644 lib/disk-config.nix mode change 100644 => 100755 modules/home/programs/aws/default.nix mode change 100644 => 100755 modules/home/programs/btop/config/btop.conf mode change 100644 => 100755 modules/home/programs/btop/config/catppuccin_mocha.theme mode change 100644 => 100755 modules/home/programs/btop/default.nix mode change 100644 => 100755 modules/home/programs/direnv/default.nix mode change 100644 => 100755 modules/home/programs/ghostty/config/fastfetch.jsonc mode change 100644 => 100755 modules/home/programs/ghostty/config/ghostty.conf mode change 100644 => 100755 modules/home/programs/ghostty/default.nix mode change 100644 => 100755 modules/home/programs/git/config/.gitignore mode change 100644 => 100755 modules/home/programs/git/config/personal mode change 100644 => 100755 modules/home/programs/git/config/work mode change 100644 => 100755 modules/home/programs/git/default.nix mode change 100644 => 100755 modules/home/programs/hyprland/config/hyprland.conf mode change 100644 => 100755 modules/home/programs/hyprland/config/waybar-style.css create mode 100755 modules/home/programs/hyprland/config/wofi-style.css create mode 100755 modules/home/programs/hyprland/config/wofi.conf mode change 100644 => 100755 modules/home/programs/hyprland/default.nix mode change 100644 => 100755 modules/home/programs/k9s/default.nix mode change 100644 => 100755 modules/home/programs/nvim/config/lua/.luarc.json mode change 100644 => 100755 modules/home/programs/nvim/config/lua/aerial-config.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/autopairs-config.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/base.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/cmp-config.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/comment-config.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/dap-config.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/diffview-config.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/git-ref.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/git-signs.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/init.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/leap-config.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/llm.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/lsp-config.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/lsp-lines-config.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/lualine-config.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/neotree-config.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/noice-config.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/numb-config.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/silicon-config.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/telescope-config.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/toggleterm-config.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/ts-config.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/weird-chars.lua mode change 100644 => 100755 modules/home/programs/nvim/config/lua/which-key-config.lua mode change 100644 => 100755 modules/home/programs/nvim/default.nix create mode 100755 systems/aarch64-linux/mbp-nixos/.gitignore mode change 100644 => 100755 systems/aarch64-linux/mbp-nixos/default.nix create mode 100755 systems/aarch64-linux/mbp-nixos/hardware-configuration.nix mode change 100644 => 100755 systems/x86_64-linux/nixos-builder/default.nix mode change 100644 => 100755 systems/x86_64-linux/office-server/default.nix mode change 100644 => 100755 systems/x86_64-linux/utility-desktop/default.nix mode change 100644 => 100755 systems/x86_64-virtual/rke2-image.nix mode change 100644 => 100755 systems/x86_64-virtual/usb-image.nix diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index 62106e8..faf654e --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .DS_Store _scratch result +._* diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/flake.lock b/flake.lock old mode 100644 new mode 100755 index defdca3..58b3923 --- a/flake.lock +++ b/flake.lock @@ -9,15 +9,16 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1742098834, - "narHash": "sha256-l98XVpNXW6hr0AsxCeQZbdf6EGT8OpHdkWBi7sdel4s=", + "lastModified": 1738646032, + "narHash": "sha256-57BdBE9anNpIpf48EiTVLGxg4mOQ04XjHCEP0gLTsFA=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "8457960249bcfd34c22838e20eaa7d8261428688", + "rev": "e77031211944723a38bebc043e48847c36e43668", "type": "github" }, "original": { "owner": "tpwrules", + "ref": "releasep2-2024-12-25", "repo": "nixos-apple-silicon", "type": "github" } @@ -27,11 +28,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1739841949, - "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", + "lastModified": 1741786315, + "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", "owner": "nix-community", "repo": "disko", - "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", + "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", "type": "github" }, "original": { @@ -152,11 +153,11 @@ ] }, "locked": { - "lastModified": 1737057290, - "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=", + "lastModified": 1742568034, + "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453", + "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11", "type": "github" }, "original": { @@ -167,11 +168,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738136902, - "narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=", + "lastModified": 1741402956, + "narHash": "sha256-y2hByvBM03s9T2fpeLjW6iprbxnhV9mJMmSwCHc41ZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c", + "rev": "ed0b1881565c1ffef490c10d663d4f542031dad3", "type": "github" }, "original": { @@ -183,11 +184,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1739758141, - "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", + "lastModified": 1742937945, + "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c618e28f70257593de75a7044438efc1c1fc0791", + "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix old mode 100644 new mode 100755 index 72e0884..c82efbc --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; apple-silicon = { - url = "github:tpwrules/nixos-apple-silicon"; + url = "github:tpwrules/nixos-apple-silicon/releasep2-2024-12-25"; + # ref = "releasep2-2024-12-25"; inputs.nixpkgs.follows = "nixpkgs"; }; nixos-generators = { diff --git a/homes/aarch64-darwin/evanreichard@MBP-Personal/README.md b/homes/aarch64-darwin/evanreichard@MBP-Personal/README.md old mode 100644 new mode 100755 diff --git a/homes/aarch64-darwin/evanreichard@MBP-Personal/default.nix b/homes/aarch64-darwin/evanreichard@MBP-Personal/default.nix old mode 100644 new mode 100755 diff --git a/homes/aarch64-darwin/evanreichard@MBP-Work/default.nix b/homes/aarch64-darwin/evanreichard@MBP-Work/default.nix old mode 100644 new mode 100755 diff --git a/homes/aarch64-linux/evanreichard@mbp-nixos/README.md b/homes/aarch64-linux/evanreichard@mbp-nixos/README.md new file mode 100755 index 0000000..2e30493 --- /dev/null +++ b/homes/aarch64-linux/evanreichard@mbp-nixos/README.md @@ -0,0 +1,40 @@ +# Nix Home Manager Configuration + +## Upgrade + +```bash +# Update System Channels +sudo nix-channel --add https://nixos.org/channels/nixpkgs-24.11-darwin nixpkgs +sudo nix-channel --update + +# Update Home Manager +nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz home-manager +nix-channel --update + +# Link Repo +ln -s /Users/evanreichard/Development/git/personal/nix/home-manager ~/.config/home-manager + +# Build Home Manager +home-manager switch +``` + +## Clean Garbage + +NOTE: This will remove previous generations + +```bash +sudo nix-collect-garbage --delete-old +nix-collect-garbage --delete-old +``` + +## OS Update + +`/etc/bashrc` may get overridden. To properly load Nix, prepend the following: + +```bash +# Nix +if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then + . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' +fi +# End Nix +``` diff --git a/homes/aarch64-linux/evanreichard@mbp-nixos/default.nix b/homes/aarch64-linux/evanreichard@mbp-nixos/default.nix new file mode 100755 index 0000000..690ef9d --- /dev/null +++ b/homes/aarch64-linux/evanreichard@mbp-nixos/default.nix @@ -0,0 +1,37 @@ +{ pkgs, ... }: +{ + reichardnix = { + programs.btop.enable = true; + programs.direnv.enable = true; + programs.ghostty.enable = true; + programs.git.enable = true; + programs.k9s.enable = true; + programs.nvim.enable = true; + programs.hyprland.enable = true; + + programs.aws.enable = false; + }; + + # Global Packages + programs.jq.enable = true; + programs.pandoc.enable = true; + home.packages = with pkgs; [ + android-tools + imagemagick + mosh + python311 + texliveSmall # Pandoc PDF Dep + google-cloud-sdk + tldr + ]; + + # SQLite Configuration + home.file.".sqliterc".text = '' + .headers on + .mode column + ''; + + # Enable Home Manager & Self Manage + home.stateVersion = "25.05"; + programs.home-manager.enable = true; +} diff --git a/lib/common-system.nix b/lib/common-system.nix deleted file mode 100644 index dfddbab..0000000 --- a/lib/common-system.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ config, lib, ... }: -{ - # NixOS Config - options = { - hostName = lib.mkOption { - type = lib.types.str; - description = "The node hostname"; - }; - enableXenGuest = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Whether to enable Xen guest support"; - }; - network = lib.mkOption { - type = lib.types.submodule { - options = { - interface = lib.mkOption { - type = lib.types.str; - description = "Network interface name"; - example = "enp0s3"; - }; - address = lib.mkOption { - type = lib.types.str; - description = "Static IP address"; - example = "10.0.20.200"; - }; - defaultGateway = lib.mkOption { - type = lib.types.str; - description = "Default gateway IP"; - example = "10.0.20.254"; - }; - nameservers = lib.mkOption { - type = lib.types.listOf lib.types.str; - description = "List of DNS servers"; - example = [ "10.0.20.254" "8.8.8.8" ]; - default = [ "8.8.8.8" "8.8.4.4" ]; - }; - }; - }; - default = null; - description = "Network configuration"; - }; - }; - - config = lib.mkMerge [ - { - # Basic System - system.stateVersion = "24.11"; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; - networking.hostName = config.hostName; - - # Boot Loader Options - boot.loader = { - systemd-boot.enable = true; - efi = { - canTouchEfiVariables = true; - efiSysMountPoint = "/boot"; - }; - }; - - # Enable SSH - services.openssh = { - enable = true; - settings = { - PasswordAuthentication = false; - PermitRootLogin = "prohibit-password"; - }; - }; - - # User Authorized Keys - users.users.root = { - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIe1n9l9pVF5+kjWJCOt3AvBVf1HOSZkEDZxCWVPSIkr evan@reichard" - ]; - hashedPassword = null; - }; - } - - # Network Configuration - (lib.mkIf (config.network != null) { - networking = { - inherit (config.network) defaultGateway nameservers; - interfaces.${config.network.interface}.ipv4.addresses = [{ - inherit (config.network) address; - prefixLength = 24; - }]; - }; - }) - - # Xen Guest Configuration - (lib.mkIf config.enableXenGuest { - services.xe-guest-utilities.enable = true; - - boot.initrd = { - availableKernelModules = [ "xen_blkfront" "xen_netfront" ]; - kernelModules = [ "xen_netfront" "xen_blkfront" ]; - supportedFilesystems = [ "ext4" "xenfs" ]; - }; - - boot.kernelModules = [ "xen_netfront" "xen_blkfront" "xenfs" ]; - }) - ]; -} diff --git a/lib/disk-config.nix b/lib/disk-config.nix deleted file mode 100644 index d54867e..0000000 --- a/lib/disk-config.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ config, lib, ... }: { - options = { - mainDiskID = lib.mkOption { - type = lib.types.str; - description = "Device path for the main disk"; - example = "/dev/disk/by-id/ata-VBOX_HARDDISK_VBcd9425b8-d666f9b8"; - }; - }; - - config = { - disko.devices = { - disk = { - main = { - type = "disk"; - device = config.mainDiskID; - content = { - type = "gpt"; - partitions = { - boot = { - size = "512M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ "umask=0077" ]; - }; - }; - root = { - size = "100%"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - }; - }; - }; - }; - }; - }; - }; - }; -} diff --git a/modules/home/programs/aws/default.nix b/modules/home/programs/aws/default.nix old mode 100644 new mode 100755 diff --git a/modules/home/programs/btop/config/btop.conf b/modules/home/programs/btop/config/btop.conf old mode 100644 new mode 100755 diff --git a/modules/home/programs/btop/config/catppuccin_mocha.theme b/modules/home/programs/btop/config/catppuccin_mocha.theme old mode 100644 new mode 100755 diff --git a/modules/home/programs/btop/default.nix b/modules/home/programs/btop/default.nix old mode 100644 new mode 100755 diff --git a/modules/home/programs/direnv/default.nix b/modules/home/programs/direnv/default.nix old mode 100644 new mode 100755 diff --git a/modules/home/programs/ghostty/config/fastfetch.jsonc b/modules/home/programs/ghostty/config/fastfetch.jsonc old mode 100644 new mode 100755 diff --git a/modules/home/programs/ghostty/config/ghostty.conf b/modules/home/programs/ghostty/config/ghostty.conf old mode 100644 new mode 100755 diff --git a/modules/home/programs/ghostty/default.nix b/modules/home/programs/ghostty/default.nix old mode 100644 new mode 100755 diff --git a/modules/home/programs/git/config/.gitignore b/modules/home/programs/git/config/.gitignore old mode 100644 new mode 100755 diff --git a/modules/home/programs/git/config/personal b/modules/home/programs/git/config/personal old mode 100644 new mode 100755 diff --git a/modules/home/programs/git/config/work b/modules/home/programs/git/config/work old mode 100644 new mode 100755 diff --git a/modules/home/programs/git/default.nix b/modules/home/programs/git/default.nix old mode 100644 new mode 100755 diff --git a/modules/home/programs/hyprland/config/hyprland.conf b/modules/home/programs/hyprland/config/hyprland.conf old mode 100644 new mode 100755 index 30d57c1..53c2a5d --- a/modules/home/programs/hyprland/config/hyprland.conf +++ b/modules/home/programs/hyprland/config/hyprland.conf @@ -22,7 +22,7 @@ ################ # See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=,preferred,auto,1.0 +monitor=,highres,auto,1.5 # monitor=HDMI-A-1,1920x1080,0x0,1 @@ -90,7 +90,6 @@ general { decoration { rounding = 10 - # Change transparency of focused and unfocused windows active_opacity = 1.0 inactive_opacity = 1.0 @@ -101,21 +100,19 @@ decoration { color = rgba(1a1a1aee) } - # https://wiki.hyprland.org/Configuring/Variables/#blur blur { enabled = true size = 3 passes = 1 - vibrancy = 0.1696 } } # https://wiki.hyprland.org/Configuring/Variables/#animations +#https://wiki.hyprland.org/Configuring/Animations/ animations { enabled = yes, please :) - # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more bezier = easeOutQuint,0.23,1,0.32,1 bezier = easeInOutCubic,0.65,0.05,0.36,1 @@ -186,21 +183,25 @@ input { sensitivity = 0 # -1.0 - 1.0, 0 means no modification. touchpad { - natural_scroll = false + disable_while_typing = true + natural_scroll = true + clickfinger_behavior = true } } # https://wiki.hyprland.org/Configuring/Variables/#gestures gestures { - workspace_swipe = false + workspace_swipe = true + workspace_swipe_fingers = 4 + workspace_swipe_invert = true } # Example per-device config # See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more -device { - name = epic-mouse-v1 - sensitivity = -0.5 -} +# device { +# name = epic-mouse-v1 +# sensitivity = -0.5 +# } ################### @@ -212,11 +213,11 @@ $mainMod = SUPER # Sets "Windows" key as main modifier # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more bind = $mainMod, Q, exec, $terminal -bind = $mainMod, C, killactive, +bind = $mainMod, W, killactive, bind = $mainMod, M, exit, bind = $mainMod, E, exec, $fileManager bind = $mainMod, V, togglefloating, -bind = $mainMod, R, exec, $menu +bind = $mainMod, SPACE, exec, $menu bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, J, togglesplit, # dwindle diff --git a/modules/home/programs/hyprland/config/waybar-style.css b/modules/home/programs/hyprland/config/waybar-style.css old mode 100644 new mode 100755 diff --git a/modules/home/programs/hyprland/config/wofi-style.css b/modules/home/programs/hyprland/config/wofi-style.css new file mode 100755 index 0000000..c1093e5 --- /dev/null +++ b/modules/home/programs/hyprland/config/wofi-style.css @@ -0,0 +1,127 @@ +window { + font-family: "Hack Nerd Font"; + background: transparent; +} + +#outer-box { + padding: 10px; + border-radius: 8px; + background: #2e3440; +} + +#scroll { + /* The Nordic gtk theme adds an outline to show scroll areas... */ + outline-color: transparent; +} + +#input { + color: #e5e9f0; + caret-color: #e5e9f0; + background: #3b4252; + border-top-color: #3b4252; + border-left-color: #3b4252; + border-right-color: #3b4252; + border-bottom-color: #3b4252; + box-shadow: 0 0 0 1px transparent inset; + outline-color: transparent !important; +} + +#input:focus { + background: #3b4252; + border-color: #3b4252 !important; + box-shadow: 0 0 0 1px transparent inset; + border-top-color: #3b4252 !important; + border-left-color: #3b4252 !important; + border-right-color: #3b4252 !important; + border-bottom-color: #3b4252 !important; + box-shadow: none !important; + outline-color: transparent !important; +} + +#input image.left { + color: #d8dee9; +} + +#input:focus image.left { + color: #e5e9f0; +} + +#input image.right { + color: #d8dee9; +} + +#input:focus image.right { + color: #e5e9f0; +} + +label { + /* We set backgrounds on the block level. */ + background: transparent; +} + +#scroll { + padding-top: 6px; +} + +#entry { + color: #4c566a; + padding: 8px 8px; + border-radius: 4px; + background: transparent; +} + +#entry:selected { + color: #eceff4; + background: #8fbcbb; + font-weight: bold; +} + +expander arrow { + margin-right: 8px; +} + +#entry #selected #text { + color: #eceff4; +} + +expander list { + margin-top: 8px; + /* background: #8fbcbb; */ + background: transparent; + padding-left: 16px; +} + +expander list #entry { + transition: none; + background: transparent; +} + +expander list #entry:hover, +expander list #entry:active { + /* color: #8fbcbb; + background: #e5e9f0; */ +} + +expander list #entry #selected { + background: #8fbcbb; +} + +expander list #entry #selected label { + color: #eceff4; + font-weight: bold; +} + +expander list #entry:hover, +expander list #entry:active { + background: #8fbcbb; +} + +expander list #entry:hover label, +expander list #entry:active label { + color: #eceff4; + font-weight: bold; +} + +expander list label { + color: #d8dee9; +} diff --git a/modules/home/programs/hyprland/config/wofi.conf b/modules/home/programs/hyprland/config/wofi.conf new file mode 100755 index 0000000..fe03dbe --- /dev/null +++ b/modules/home/programs/hyprland/config/wofi.conf @@ -0,0 +1,3 @@ +stylesheet=./style.css +term=foot +insensitive=true diff --git a/modules/home/programs/hyprland/default.nix b/modules/home/programs/hyprland/default.nix old mode 100644 new mode 100755 index 5e4e9a2..ec390b9 --- a/modules/home/programs/hyprland/default.nix +++ b/modules/home/programs/hyprland/default.nix @@ -1,4 +1,4 @@ -{ lib, config, namespace, ... }: +{ lib, pkgs, config, namespace, ... }: let inherit (lib) mkIf; cfg = config.${namespace}.programs.hyprland; @@ -125,5 +125,17 @@ in }; }]; }; + + home.packages = with pkgs; [ + hyprshot + wofi + wofi-emoji + brightnessctl + ]; + + xdg.configFile = { + "wofi/config".source = ./config/wofi.conf; + "wofi/style.css".source = ./config/wofi-style.css; + }; }; } diff --git a/modules/home/programs/k9s/default.nix b/modules/home/programs/k9s/default.nix old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/.luarc.json b/modules/home/programs/nvim/config/lua/.luarc.json old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/aerial-config.lua b/modules/home/programs/nvim/config/lua/aerial-config.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/autopairs-config.lua b/modules/home/programs/nvim/config/lua/autopairs-config.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/base.lua b/modules/home/programs/nvim/config/lua/base.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/cmp-config.lua b/modules/home/programs/nvim/config/lua/cmp-config.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/comment-config.lua b/modules/home/programs/nvim/config/lua/comment-config.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/dap-config.lua b/modules/home/programs/nvim/config/lua/dap-config.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/diffview-config.lua b/modules/home/programs/nvim/config/lua/diffview-config.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/git-ref.lua b/modules/home/programs/nvim/config/lua/git-ref.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/git-signs.lua b/modules/home/programs/nvim/config/lua/git-signs.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/init.lua b/modules/home/programs/nvim/config/lua/init.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/leap-config.lua b/modules/home/programs/nvim/config/lua/leap-config.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/llm.lua b/modules/home/programs/nvim/config/lua/llm.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/lsp-config.lua b/modules/home/programs/nvim/config/lua/lsp-config.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/lsp-lines-config.lua b/modules/home/programs/nvim/config/lua/lsp-lines-config.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/lualine-config.lua b/modules/home/programs/nvim/config/lua/lualine-config.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/neotree-config.lua b/modules/home/programs/nvim/config/lua/neotree-config.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/noice-config.lua b/modules/home/programs/nvim/config/lua/noice-config.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/numb-config.lua b/modules/home/programs/nvim/config/lua/numb-config.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/silicon-config.lua b/modules/home/programs/nvim/config/lua/silicon-config.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/telescope-config.lua b/modules/home/programs/nvim/config/lua/telescope-config.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/toggleterm-config.lua b/modules/home/programs/nvim/config/lua/toggleterm-config.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/ts-config.lua b/modules/home/programs/nvim/config/lua/ts-config.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/weird-chars.lua b/modules/home/programs/nvim/config/lua/weird-chars.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/config/lua/which-key-config.lua b/modules/home/programs/nvim/config/lua/which-key-config.lua old mode 100644 new mode 100755 diff --git a/modules/home/programs/nvim/default.nix b/modules/home/programs/nvim/default.nix old mode 100644 new mode 100755 diff --git a/systems/aarch64-linux/mbp-nixos/.gitignore b/systems/aarch64-linux/mbp-nixos/.gitignore new file mode 100755 index 0000000..2b8800b --- /dev/null +++ b/systems/aarch64-linux/mbp-nixos/.gitignore @@ -0,0 +1 @@ +firmware diff --git a/systems/aarch64-linux/mbp-nixos/default.nix b/systems/aarch64-linux/mbp-nixos/default.nix old mode 100644 new mode 100755 index 45cb610..c8a7c54 --- a/systems/aarch64-linux/mbp-nixos/default.nix +++ b/systems/aarch64-linux/mbp-nixos/default.nix @@ -19,7 +19,6 @@ # Networking Config networking = { firewall.enable = true; - hostName = "mpb-nixos"; networkmanager.enable = true; networkmanager.wifi.backend = "iwd"; useDHCP = lib.mkDefault true; @@ -33,11 +32,7 @@ useExperimentalGPUDriver = true; }; - # graphics = { - # enable = true; - # enable32Bit = true; - # }; - + graphics.enable = true; bluetooth.enable = true; bluetooth.powerOnBoot = true; }; @@ -50,17 +45,16 @@ # shell = pkgs.bash; # }; - # # Home Manager Config + # Home Manager Config # home-manager = { # useGlobalPkgs = true; # useUserPackages = true; - # users.evanreichard = import ../home-manager/home.nix; + # # users.evanreichard = import ../home-manager/home.nix; # }; # HyprLand Config programs.hyprland.enable = true; - # environment.sessionVariables.NIXOS_OZONE_WL = "1"; - # environment.sessionVariables.WLR_NO_HARDWARE_CURSORS = "1"; + # environment.sessionVariables.WLR_DRM_DEVICES = "/dev/dri/card0"; # System Packages environment.systemPackages = with pkgs; [ @@ -71,6 +65,8 @@ vim wget + # mesa-asahi-edge + # mesa # hyprlock # hypridle ]; diff --git a/systems/aarch64-linux/mbp-nixos/hardware-configuration.nix b/systems/aarch64-linux/mbp-nixos/hardware-configuration.nix new file mode 100755 index 0000000..d422838 --- /dev/null +++ b/systems/aarch64-linux/mbp-nixos/hardware-configuration.nix @@ -0,0 +1,37 @@ +# 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 = [ "usb_storage" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/6dce11fa-5075-44d4-b502-14d0a1b36e7f"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/2254-0F1E"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + swapDevices = [ ]; + + # 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.wlan0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; +} diff --git a/systems/x86_64-linux/nixos-builder/default.nix b/systems/x86_64-linux/nixos-builder/default.nix old mode 100644 new mode 100755 diff --git a/systems/x86_64-linux/office-server/default.nix b/systems/x86_64-linux/office-server/default.nix old mode 100644 new mode 100755 diff --git a/systems/x86_64-linux/utility-desktop/default.nix b/systems/x86_64-linux/utility-desktop/default.nix old mode 100644 new mode 100755 diff --git a/systems/x86_64-virtual/rke2-image.nix b/systems/x86_64-virtual/rke2-image.nix old mode 100644 new mode 100755 diff --git a/systems/x86_64-virtual/usb-image.nix b/systems/x86_64-virtual/usb-image.nix old mode 100644 new mode 100755