diff --git a/README.md b/README.md deleted file mode 100644 index f73e4cf..0000000 --- a/README.md +++ /dev/null @@ -1,58 +0,0 @@ -# Sakamoto NixOS - -Sakamoto NixOS is built with various profiles intended for reproducibility. - -## Available Hosts - -- MacBook M series -- Linux - -## Installation - -1. Install [Nix](https://nixos.org/download/). - -2. Ensure Nix is installed properly by running the following (this also gives you `nano` for editing later): - - ```sh - nix-shell -p nano - ``` - -3. Clone the git repository: - - ```sh - git clone https://git.sakamoto.dev/kenji/nixos.git ~/.config/nixos && cd ~/.config/nixos/ - ``` - -4. Copy `info.default.nix` and rename it to `info.local.nix`: - - ```sh - cp ~/.config/nixos/info.default.nix ~/.config/nixos/info.local.nix - ``` - - ๐Ÿšจ **CRITICAL STEP:** Edit `info.local.nix`: - - ```sh - nano ~/.config/nixos/info.local.nix - ``` - - Modify it to fit your system โ€” especially your **username**. - If you accidentally leave the default `biscuit`, that user will be created. - **Login password for `biscuit` is ``.** - -5. Execute the following command based on your host: - - - **MacBook M series:** - - ```sh - sudo nix run nix-darwin --extra-experimental-features "nix-command flakes" -- switch --flake ~/.config/nixos#macos - ``` - - - **Linux:** - - ```sh - sudo nixos-rebuild --flake ~/.config/nixos#desktop --impure - sudo nix run home-manager -- init --switch - home-manager switch --flake ~/.config/nixos#desktop --impure - nix-channel --add https://nixos.org/channels/nixos-unstable nixos nix-channel --update - reboot - ``` diff --git a/assets/wallpapers/ascii-nixos.png b/assets/wallpapers/ascii-nixos.png deleted file mode 100644 index 2cd684f..0000000 Binary files a/assets/wallpapers/ascii-nixos.png and /dev/null differ diff --git a/assets/wallpapers/pixel-setup.jpeg b/assets/wallpapers/pixel-setup.jpeg deleted file mode 100644 index 3734f93..0000000 Binary files a/assets/wallpapers/pixel-setup.jpeg and /dev/null differ diff --git a/assets/wallpapers/ultrawide-nixos-default.png b/assets/wallpapers/ultrawide-nixos-default.png deleted file mode 100644 index 289e905..0000000 Binary files a/assets/wallpapers/ultrawide-nixos-default.png and /dev/null differ diff --git a/assets/wallpapers/ultrawide-tree-shadow.png b/assets/wallpapers/ultrawide-tree-shadow.png deleted file mode 100644 index 5638179..0000000 Binary files a/assets/wallpapers/ultrawide-tree-shadow.png and /dev/null differ diff --git a/config.nix b/config.nix index 0ed20d6..79af2d2 100644 --- a/config.nix +++ b/config.nix @@ -1,81 +1,63 @@ { - hostname = "hakase"; - username = "kenji"; - timezone = "America/Chicago"; + myConfig = { + general = { + Hostname = "nixos"; + Timezone = "America/Chicago"; + Username = "kenji"; - vpn = { - vpnEnable = false; - vpnSecretFile = "/home/kenji/Wireguard/secret"; - }; - - gitProfile = { - user = "biscuit"; - email = "biscuit@sakamoto.dev"; - defaultBranch = "master"; - }; - - terminal = { - termFont = "JetBrainsMono Nerd Font"; # e.g., JetBrainsMono Nerd Font - termSize = "18"; - termShell = "fish"; - shellAliases = { - ls = "ls --color=auto"; - update = '' - sh -c ' - if [ "$(uname)" = "Darwin" ]; then - sudo darwin-rebuild switch --flake ~/.config/nixos#macos - else - sudo nixos-rebuild switch --flake ~/.config/nixos#desktop --impure && home-manager switch --flake ~/.config/nixos#desktop --impure - fi - ' - ''; - agu = "pkill gjs & ags run ~/.config/nixos/pkgs/ags/biscuit/app.ts & disown (jobs -p) &"; + Terminal = { + font = "JetBrainsMono Nerd Font"; + size = "12"; + shell = "fish"; # or zsh + aliases = { + ls = "ls --color=auto"; + }; + }; + Git = { + user = ""; + email = ""; + defaultBranch = "master"; + }; + }; + linux = { + Boot = { + mode = "grub"; # systemd or grub + }; + Gaming = { + enable = true; + }; + Apps = { + packages = pkgs: + with pkgs; [ + jellyfin-media-player + ]; + }; + Hyprland = { + monitors = []; + }; + }; + optionals = { + Builds = { + trustedUsers = [ + "@groups" + ]; + buildMachines = [ + { + hostName = ""; + sshUser = ""; + sshKey = ""; + system = ""; + supportedFeatures = ["big-parallel" "kvm" "nixos-test"]; + } + ]; + }; + Ssh = { + extraConfig = '' + Host macair + User biscuit + HostName 192.168.68.81 + ''; + }; }; }; - - allowUnfree = true; # allows installation of commercial apps. - touchpadSupport = false; - - logitech-hardware = { - enable = true; - }; - - # Custom Applications - linux-apps = { - gamingDesktop = true; # adds steam - my-apps = pkgs: - with pkgs; [ - jellyfin-media-player - ]; - }; - - hyprconf = { - monitor = [ - "DP-1,highres@165,0x1080,auto" - "HDMI-A-4,highres@highrr,0x0,auto" - ]; - }; - - sshExtraConfig = '' - Host macair - User biscuit - HostName 192.168.68.81 - ''; - - # BUILD (optional), you can remove these blocks. - builder = { - trustedUsers = [ - "@groups" - "biscuit" - ]; - buildMachines = [ - { - hostName = "192.168.68.81"; - sshUser = "biscuit"; - sshKey = "/home/biscuit/.ssh/id_rsa.pub"; - system = "x86_64-linux"; - supportedFeatures = ["big-parallel" "kvm" "nixos-test"]; - } - ]; - }; } diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 21eb703..0000000 --- a/flake.lock +++ /dev/null @@ -1,1002 +0,0 @@ -{ - "nodes": { - "ags": { - "inputs": { - "astal": "astal", - "nixpkgs": ["nixpkgs"] - }, - "locked": { - "lastModified": 1744557573, - "narHash": "sha256-XAyj0iDuI51BytJ1PwN53uLpzTDdznPDQFG4RwihlTQ=", - "owner": "aylur", - "repo": "ags", - "rev": "3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "ags", - "type": "github" - } - }, - "aquamarine": { - "inputs": { - "hyprutils": ["hyprland", "hyprutils"], - "hyprwayland-scanner": ["hyprland", "hyprwayland-scanner"], - "nixpkgs": ["hyprland", "nixpkgs"], - "systems": ["hyprland", "systems"] - }, - "locked": { - "lastModified": 1747864449, - "narHash": "sha256-PIjVAWghZhr3L0EFM2UObhX84UQxIACbON0IC0zzSKA=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "389372c5f4dc1ac0e7645ed29a35fd6d71672ef5", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, - "astal": { - "inputs": { - "nixpkgs": ["ags", "nixpkgs"] - }, - "locked": { - "lastModified": 1742571008, - "narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=", - "owner": "aylur", - "repo": "astal", - "rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "astal", - "type": "github" - } - }, - "darwin": { - "inputs": { - "nixpkgs": ["nixpkgs"] - }, - "locked": { - "lastModified": 1749194393, - "narHash": "sha256-vt6hM9DNywnXXuW1qPDLzECmbDcmxhh58wpb0EEQjAo=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "19346808c445f23b08652971be198b9df6c33edc", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, - "devshell": { - "inputs": { - "nixpkgs": ["nix-neovim", "nixvim", "nixpkgs"] - }, - "locked": { - "lastModified": 1735644329, - "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", - "owner": "numtide", - "repo": "devshell", - "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "revCount": 69, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": ["nix-neovim", "nixvim", "nixpkgs"] - }, - "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": ["nixvim", "nixpkgs"] - }, - "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_7" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "git-hooks": { - "inputs": { - "flake-compat": ["nix-neovim", "nixvim", "flake-compat"], - "gitignore": "gitignore_2", - "nixpkgs": ["nix-neovim", "nixvim", "nixpkgs"] - }, - "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": ["hyprland", "pre-commit-hooks", "nixpkgs"] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { - "inputs": { - "nixpkgs": ["nix-neovim", "nixvim", "git-hooks", "nixpkgs"] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": ["nixpkgs"] - }, - "locked": { - "lastModified": 1748979197, - "narHash": "sha256-mKYwYcO9RmA2AcAFIXGDBOw5iv/fbjw6adWvMbnfIuk=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "34a13086148cbb3ae65a79f753eb451ce5cac3d3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": ["nix-neovim", "nixvim", "nixpkgs"] - }, - "locked": { - "lastModified": 1738878603, - "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "hyprcursor": { - "inputs": { - "hyprlang": ["hyprland", "hyprlang"], - "nixpkgs": ["hyprland", "nixpkgs"], - "systems": ["hyprland", "systems"] - }, - "locked": { - "lastModified": 1745948457, - "narHash": "sha256-lzTV10FJTCGNtMdgW5YAhCAqezeAzKOd/97HbQK8GTU=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "ac903e80b33ba6a88df83d02232483d99f327573", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": ["hyprland", "hyprutils"], - "nixpkgs": ["hyprland", "nixpkgs"], - "systems": ["hyprland", "systems"] - }, - "locked": { - "lastModified": 1745015490, - "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "60754910946b4e2dc1377b967b7156cb989c5873", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprgraphics": "hyprgraphics", - "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": ["nixpkgs"], - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1749049255, - "narHash": "sha256-QXg2B/bF/f9IeSiZwJuhdnz2xcnpu/hDfz4eIHWVhz8=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "d7a87ce6e2535f1029fc93b062d2828e8549c525", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": ["hyprland", "nixpkgs"], - "systems": ["hyprland", "systems"] - }, - "locked": { - "lastModified": 1743714874, - "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": ["hyprland", "hyprland-qtutils", "hyprlang"], - "nixpkgs": ["hyprland", "hyprland-qtutils", "nixpkgs"], - "systems": ["hyprland", "hyprland-qtutils", "systems"] - }, - "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": ["hyprland", "hyprlang"], - "hyprutils": ["hyprland", "hyprland-qtutils", "hyprlang", "hyprutils"], - "nixpkgs": ["hyprland", "nixpkgs"], - "systems": ["hyprland", "systems"] - }, - "locked": { - "lastModified": 1745951494, - "narHash": "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "4be1d324faf8d6e82c2be9f8510d299984dfdd2e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": ["hyprland", "hyprutils"], - "nixpkgs": ["hyprland", "nixpkgs"], - "systems": ["hyprland", "systems"] - }, - "locked": { - "lastModified": 1747484975, - "narHash": "sha256-+LAQ81HBwG0lwshHlWe0kfWg4KcChIPpnwtnwqmnoEU=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "163c83b3db48a17c113729c220a60b94596c9291", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": ["hyprland", "nixpkgs"], - "systems": ["hyprland", "systems"] - }, - "locked": { - "lastModified": 1746635225, - "narHash": "sha256-W9G9bb0zRYDBRseHbVez0J8qVpD5QbizX67H/vsudhM=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "674ea57373f08b7609ce93baff131117a0dfe70d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": ["hyprland", "nixpkgs"], - "systems": ["hyprland", "systems"] - }, - "locked": { - "lastModified": 1747584298, - "narHash": "sha256-PH9qZqWLHvSBQiUnA0NzAyQA3tu2no2z8kz0ZeHWj4w=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "e511882b9c2e1d7a75d45d8fddd2160daeafcbc3", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, - "ixx": { - "inputs": { - "flake-utils": [ - "nix-neovim", - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": ["nix-neovim", "nixvim", "nuschtosSearch", "nixpkgs"] - }, - "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.6", - "repo": "ixx", - "type": "github" - } - }, - "ixx_2": { - "inputs": { - "flake-utils": ["nixvim", "nuschtosSearch", "flake-utils"], - "nixpkgs": ["nixvim", "nuschtosSearch", "nixpkgs"] - }, - "locked": { - "lastModified": 1748294338, - "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.8", - "repo": "ixx", - "type": "github" - } - }, - "matugen": { - "inputs": { - "nixpkgs": ["nixpkgs"], - "systems": "systems_3" - }, - "locked": { - "lastModified": 1745334376, - "narHash": "sha256-GZAesQW51EwCEB9w5caxgi87LiAMhVfP6GqZmet9VZc=", - "owner": "InioX", - "repo": "Matugen", - "rev": "4619cca93513470dc2a1833d9a138297cbccaf2e", - "type": "github" - }, - "original": { - "owner": "InioX", - "repo": "Matugen", - "type": "github" - } - }, - "nix-darwin": { - "inputs": { - "nixpkgs": ["nix-neovim", "nixvim", "nixpkgs"] - }, - "locked": { - "lastModified": 1738743987, - "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, - "nix-neovim": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": ["nixpkgs"], - "nixvim": "nixvim", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1749068064, - "narHash": "sha256-pxszYA1LsrW89Z++jMshDqRpNx99QcvfpFIK5mdmneA=", - "ref": "refs/heads/master", - "rev": "be2e51f4ddec2389d282280871ca484f3f1f0892", - "revCount": 60, - "type": "git", - "url": "https://git.sakamoto.dev/kenji/nix-neovim.git" - }, - "original": { - "type": "git", - "url": "https://git.sakamoto.dev/kenji/nix-neovim.git" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1738797219, - "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1da52dd49a127ad74486b135898da2cef8c62665", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1738452942, - "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1736320768, - "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixvim": { - "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", - "git-hooks": "git-hooks", - "home-manager": "home-manager_2", - "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs", - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1739353096, - "narHash": "sha256-w/T2uYCoq4k6K46GX2CMGWsKfMvcqnxC41LIgnvGifE=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "78b6f8e1e5b37a7789216e17a96ebc117660f0e7", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, - "nixvim_2": { - "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": ["nixpkgs"], - "nuschtosSearch": "nuschtosSearch_2", - "systems": "systems_6" - }, - "locked": { - "lastModified": 1748942960, - "narHash": "sha256-gJf3WxvDbvCpzIBVju/5GY/olW7zs/B1zDmB52AWMUM=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "9328f4437d5f788d1c066b274a0aea492dc5fde2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils_2", - "ixx": "ixx", - "nixpkgs": ["nix-neovim", "nixvim", "nixpkgs"] - }, - "locked": { - "lastModified": 1738508923, - "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", - "owner": "NuschtOS", - "repo": "search", - "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, - "nuschtosSearch_2": { - "inputs": { - "flake-utils": "flake-utils_3", - "ixx": "ixx_2", - "nixpkgs": ["nixvim", "nixpkgs"] - }, - "locked": { - "lastModified": 1748298102, - "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=", - "owner": "NuschtOS", - "repo": "search", - "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": ["hyprland", "nixpkgs"] - }, - "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "root": { - "inputs": { - "ags": "ags", - "darwin": "darwin", - "home-manager": "home-manager", - "hyprland": "hyprland", - "matugen": "matugen", - "nix-neovim": "nix-neovim", - "nixpkgs": "nixpkgs_3", - "nixvim": "nixvim_2", - "unlisted-fonts": "unlisted-fonts" - } - }, - "rust-overlay": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1739327257, - "narHash": "sha256-rlGK8wxz/e50Z+PQRzuP+m03IrGkhcPGmgkBnkEZ9C8=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "e01f2c035b7b8a428c119b183f4cbc55f2eef07c", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": ["nix-neovim", "nixvim", "nixpkgs"] - }, - "locked": { - "lastModified": 1738680491, - "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "unlisted-fonts": { - "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": ["nixpkgs"] - }, - "locked": { - "lastModified": 1748987994, - "narHash": "sha256-13QQRwZx9tRDmL79+XBM1YaC4W68mVrVW2NCv2w25WA=", - "ref": "refs/heads/master", - "rev": "468d51f24d3dd22c543e657c359fb333ff4df726", - "revCount": 1, - "type": "git", - "url": "https://git.sakamoto.dev/kenji/nix-fonts.git" - }, - "original": { - "type": "git", - "url": "https://git.sakamoto.dev/kenji/nix-fonts.git" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": ["hyprland", "hyprland-protocols"], - "hyprlang": ["hyprland", "hyprlang"], - "hyprutils": ["hyprland", "hyprutils"], - "hyprwayland-scanner": ["hyprland", "hyprwayland-scanner"], - "nixpkgs": ["hyprland", "nixpkgs"], - "systems": ["hyprland", "systems"] - }, - "locked": { - "lastModified": 1745871725, - "narHash": "sha256-M24SNc2flblWGXFkGQfqSlEOzAGZnMc9QG3GH4K/KbE=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "76bbf1a6b1378e4ab5230bad00ad04bc287c969e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix index 81cc4e8..2627ace 100644 --- a/flake.nix +++ b/flake.nix @@ -1,97 +1,31 @@ { - description = "A very basic flake"; - + description = "A rewrite of the original Sakamoto NixOS config."; inputs = { - nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; - home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; # `follows` ensure it follows nixpkgs versiona. Avoids breaking updates. - darwin.url = "github:lnl7/nix-darwin"; - darwin.inputs.nixpkgs.follows = "nixpkgs"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - ags.url = "github:aylur/ags"; - ags.inputs.nixpkgs.follows = "nixpkgs"; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; - hyprland.url = "github:hyprwm/Hyprland"; - hyprland.inputs.nixpkgs.follows = "nixpkgs"; - - unlisted-fonts.url = "git+https://git.sakamoto.dev/kenji/nix-fonts.git"; - unlisted-fonts.inputs.nixpkgs.follows = "nixpkgs"; - - nixvim.url = "github:nix-community/nixvim"; - nixvim.inputs.nixpkgs.follows = "nixpkgs"; - - nix-neovim.url = "git+https://git.sakamoto.dev/kenji/nix-neovim.git"; - nix-neovim.inputs.nixpkgs.follows = "nixpkgs"; - - # kitty-catppuccin.url = "git+https://git.sakamoto.dev/kenji/nix-kitty-catppuccin.git"; - # kitty-catppuccin.inputs.nixpkgs.follows = "nixpkgs"; - - matugen.url = "github:/InioX/Matugen"; - matugen.inputs.nixpkgs.follows = "nixpkgs"; + flake-utils = { + url = "github:numtide/flake-utils"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, nixpkgs, - home-manager, - darwin, - ags, - hyprland, - unlisted-fonts, - nix-neovim, + flake-utils, ... - } @ inputs: let - config = import ./config.nix; - lib = nixpkgs.lib; - system = "x86_64-linux"; - # pkgs = nixpkgs.legacyPackages.${system}; # alternative, without overlays. Unused. - args = - { - inherit inputs system; + } @ inputs: + flake-utils.lib.eachDefaultSystem ( + system: let + config = import ./config.nix; + pkgs = nixpkgs.legacyPackages.${system}; + args = {inherit inputs system;} // config; + in { } - // config; - in { - # linux only - nixosConfigurations = { - desktop = lib.nixosSystem { - inherit system; - specialArgs = args; - modules = [ - ./nixos/desktop/configuration.nix - ]; - }; - }; - homeConfigurations = { - desktop = home-manager.lib.homeManagerConfiguration { - pkgs = import nixpkgs { - inherit system; - overlays = [ - # (final: prev: { - # ags_1 = prev.ags_1.overrideAttrs (old: { - # buildInputs = old.buildInputs ++ [pkgs.libdbusmenu-gtk3]; - # }); - # }) - ]; - }; - extraSpecialArgs = args; - modules = [./home/desktop/home.nix]; - }; - }; - # exclusive to macos M series - darwinConfigurations = { - macos = darwin.lib.darwinSystem { - system = "aarch64-darwin"; - specialArgs = args; - modules = [ - ./nixos/macos/darwin.nix - home-manager.darwinModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = args; - } - ]; - }; - }; - }; + ); } diff --git a/home/desktop/home.nix b/home/desktop/home.nix deleted file mode 100644 index 11cf45a..0000000 --- a/home/desktop/home.nix +++ /dev/null @@ -1,20 +0,0 @@ -{username, ...}: { - imports = [ - ../../modules/editor.nix - ../../modules/desktop/display-manager.nix - ../../modules/desktop/misc.nix - ../../modules/desktop/app.nix - ]; - - programs.home-manager.enable = true; - - home = { - username = "${username}"; - homeDirectory = "/home/${username}"; - packages = []; - sessionVariables = {}; - }; - - systemd.user.startServices = "sd-switch"; - home.stateVersion = "23.05"; -} diff --git a/home/macos/home.nix b/home/macos/home.nix deleted file mode 100644 index 89d55ef..0000000 --- a/home/macos/home.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - config, - pkgs, - inputs, - ... -}: { - imports = [ - ../../modules/editor.nix - ]; - - programs.home-manager.enable = true; - - home.packages = []; - home.stateVersion = "23.05"; -} diff --git a/modules/app.nix b/modules/app.nix deleted file mode 100644 index 38c5272..0000000 --- a/modules/app.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - linux-apps, - lib, - ... -}: { - imports = - [ - ] - ++ lib.optionals (linux-apps.gamingDesktop == true) [ - ../pkgs/steam/default.nix - ../pkgs/heroic/default.nix - ]; -} diff --git a/modules/desktop/app.nix b/modules/desktop/app.nix deleted file mode 100644 index 65f2dbe..0000000 --- a/modules/desktop/app.nix +++ /dev/null @@ -1,5 +0,0 @@ -{pkgs, ...}: let - info = import ../../config.nix; -in { - home.packages = info.linux-apps.my-apps pkgs; -} diff --git a/modules/desktop/display-manager.nix b/modules/desktop/display-manager.nix deleted file mode 100644 index 2b630d6..0000000 --- a/modules/desktop/display-manager.nix +++ /dev/null @@ -1,11 +0,0 @@ -{...}: { - imports = [ - ../../pkgs/hyprland/default.nix - ../../pkgs/ags/default.nix - ../../pkgs/swww/default.nix - ../../pkgs/waybar/default.nix - ../../pkgs/rofi/default.nix - ../../pkgs/hypridle/default.nix - ../../pkgs/hyprlock/default.nix - ]; -} diff --git a/modules/desktop/misc.nix b/modules/desktop/misc.nix deleted file mode 100644 index f223e2a..0000000 --- a/modules/desktop/misc.nix +++ /dev/null @@ -1,6 +0,0 @@ -{...}: { - imports = [ - ../../pkgs/btop/default.nix - ../../pkgs/matugen/default.nix - ]; -} diff --git a/modules/display-manager.nix b/modules/display-manager.nix deleted file mode 100644 index 9e2e5f1..0000000 --- a/modules/display-manager.nix +++ /dev/null @@ -1,11 +0,0 @@ -{...}: { - imports = [ - ../system/desktop/wayland.nix - ../system/desktop/sound.nix - ../system/desktop/misc.nix - ../system/desktop/browser.nix - ../system/desktop/font.nix - ../system/desktop/theme.nix - ../system/desktop/cursor.nix - ]; -} diff --git a/modules/editor.nix b/modules/editor.nix deleted file mode 100644 index 25fa28b..0000000 --- a/modules/editor.nix +++ /dev/null @@ -1,11 +0,0 @@ -{...}: { - imports = [ - ../pkgs/fastfetch/default.nix - ../pkgs/git/default.nix - ../pkgs/kitty/default.nix - ../pkgs/neovim/default.nix - ../pkgs/fish/default.nix - ../pkgs/starship/default.nix - ../pkgs/zsh/default.nix - ]; -} diff --git a/modules/system.nix b/modules/system.nix deleted file mode 100644 index f99923a..0000000 --- a/modules/system.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - vpn, - lib, - ... -}: { - imports = - [ - ../system/default.nix - ../system/users.nix - ] - ++ lib.optionals (vpn.vpnEnable == true) [ - ../system/vpn.nix - ]; -} diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix deleted file mode 100644 index 7b7723c..0000000 --- a/nixos/desktop/configuration.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - pkgs, - allowUnfree, - builder, - sshExtraConfig, - ... -}: { - imports = [ - # Include the results of the hardware scan. - /etc/nixos/hardware-configuration.nix - ../../modules/system.nix - ../../modules/display-manager.nix - ../../modules/app.nix - ]; - - environment.systemPackages = with pkgs; [ - vim - wget - ]; - - nixpkgs.config.allowUnfree = allowUnfree; - - nix.settings = { - trusted-users = builder.trustedUsers; - experimental-features = ["nix-command" "flakes"]; - }; - - programs.ssh.extraConfig = sshExtraConfig; - - nix.distributedBuilds = true; - nix.settings.builders-use-substitutes = true; - - # nix.buildMachines = builder.buildMachines; - system.stateVersion = "25.05"; -} diff --git a/nixos/desktop/hardware-configuration.nix b/nixos/desktop/hardware-configuration.nix deleted file mode 100644 index 991ab97..0000000 --- a/nixos/desktop/hardware-configuration.nix +++ /dev/null @@ -1,48 +0,0 @@ -# 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 = [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/3f2c4a5a-3124-462a-9fb9-cccc933bac63"; - fsType = "btrfs"; - options = [ "subvol=@" ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/18F8-7DC1"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - fileSystems."/mnt/CRUCIAL" = - { device = "/dev/disk/by-uuid/394f67b9-e75b-40cc-9b15-28bbda40fff4"; - fsType = "ext4"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/bbe1e281-4b1d-4d85-ba6a-6f5265f0e3a3"; } - ]; - - # 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.biscuit-default.useDHCP = lib.mkDefault true; - # networking.interfaces.enp11s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp10s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/nixos/macos/darwin.nix b/nixos/macos/darwin.nix deleted file mode 100644 index 14eaebc..0000000 --- a/nixos/macos/darwin.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - pkgs, - builder, - terminal, - username, - ... -}: { - # List packages installed in system profile. To search by name, run: - # $ nix-env -qaP | grep wget - environment.systemPackages = with pkgs; [ - python313 - ]; - - # Auto upgrade nix package and the daemon service. - # services.nix-daemon.enable = true; - # services.karabiner-elements.enable = true; - # nix.package = pkgs.nix; - - # Necessary for using flakes on this system. - nix.settings.experimental-features = "nix-command flakes"; - nix.settings.trusted-users = builder.trustedUsers; - - # Create /etc/zshrc that loads the nix-darwin environment. - programs.zsh.enable = true; # default shell on catalina - programs.fish.enable = true; - - # $ darwin-rebuild changelog - system.stateVersion = 5; - - # The platform the configuration will be used on. - nixpkgs.hostPlatform = "aarch64-darwin"; - - users.users.${username} = { - name = "${username}"; - home = "/Users/${username}"; - shell = pkgs.${terminal.termShell}; - }; - - home-manager.users.${username} = import ../../home/macos/home.nix; -} diff --git a/pkgs/ags/biscuit/.gitignore b/pkgs/ags/biscuit/.gitignore deleted file mode 100644 index 298eb4d..0000000 --- a/pkgs/ags/biscuit/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -node_modules/ -@girs/ diff --git a/pkgs/ags/biscuit/app.ts b/pkgs/ags/biscuit/app.ts deleted file mode 100644 index 8952ecf..0000000 --- a/pkgs/ags/biscuit/app.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { App } from "astal/gtk3" -import style from "./style.scss" -import Bar from "./widget/Bar" - -App.start({ - css: style, - instanceName: "js", - requestHandler(request, res) { - print(request) - res("ok") - }, - main: () => { - const monitors = App.get_monitors() - const primary = monitors.find(m => m.primary) || monitors[0] - return Bar(primary) - } -}) diff --git a/pkgs/ags/biscuit/colors.scss b/pkgs/ags/biscuit/colors.scss deleted file mode 100644 index 96044bb..0000000 --- a/pkgs/ags/biscuit/colors.scss +++ /dev/null @@ -1,3 +0,0 @@ -$background: #131318; -$foreground: #e4e1e9; -$primary: #bec2ff; diff --git a/pkgs/ags/biscuit/env.d.ts b/pkgs/ags/biscuit/env.d.ts deleted file mode 100644 index 467c0a4..0000000 --- a/pkgs/ags/biscuit/env.d.ts +++ /dev/null @@ -1,21 +0,0 @@ -declare const SRC: string - -declare module "inline:*" { - const content: string - export default content -} - -declare module "*.scss" { - const content: string - export default content -} - -declare module "*.blp" { - const content: string - export default content -} - -declare module "*.css" { - const content: string - export default content -} diff --git a/pkgs/ags/biscuit/package.json b/pkgs/ags/biscuit/package.json deleted file mode 100644 index 23b6342..0000000 --- a/pkgs/ags/biscuit/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "astal-shell", - "dependencies": { - "astal": "/home/biscuit/.local/share/ags" - } -} diff --git a/pkgs/ags/biscuit/style.scss b/pkgs/ags/biscuit/style.scss deleted file mode 100644 index 88d42f9..0000000 --- a/pkgs/ags/biscuit/style.scss +++ /dev/null @@ -1,143 +0,0 @@ -@use "sass:color"; -@use "./colors" as *; - -// default -// $bg: #212223; -// $fg: #f1f1f1; -// $accent: #378DF7; -// $radius: 7px; - -// Kanagawa Theme -// $bg: #1F1F28; -// $fg: #DCD7BA; -// $accent: #C0A36E; -// $radius: 7px; - -// mstcl -// $bg: #121212; -// $fg: #f1f1f1; -// $accent: #C0A36E; -// $radius: 7px; - -$bg: $background; -$fg: $foreground; -$accent: $primary; -$radius: 7px; - -window.Bar { - border: none; - box-shadow: none; - background-color: $bg; - color: $fg; - font-size: 1.1em; - font-weight: bold; - font-family: "JetBrainsMono Nerd Font"; - - label { - margin: 0 8px; - } - - .Workspaces { - button { - all: unset; - background-color: transparent; - - &:hover label { - background-color: color.adjust($fg, $alpha: -0.84); - border-color: color.adjust($accent, $alpha: -0.8); - } - - &:active label { - background-color: color.adjust($fg, $alpha: -0.8) - } - } - - label { - transition: 200ms; - padding: 0 8px; - margin: 2px; - border-radius: $radius; - border: 1pt solid transparent; - } - - .focused label { - color: $accent; - border-color: $accent; - } - } - - .SysTray { - margin-right: 8px; - - button { - padding: 0 4px; - } - } - - .Time { - .TimeHM { - font-weight: bold; - color: $accent; - } - - .TimeDate { - // color: color.adjust($fg, $lightness: -10%); - color: $fg; - opacity: 0.85; - font-weight: normal; - } - } - - - .FocusedClient { - color: color.adjust($fg, $lightness: -30%); - opacity: 0.7; - } - - .Media .Cover { - min-height: 1.2em; - min-width: 1.2em; - border-radius: $radius; - background-position: center; - background-size: contain; - } - - .Battery label { - padding-left: 0; - margin-left: 0; - } - - .AudioSlider { - * { - all: unset; - } - - icon { - margin-right: .6em; - } - - & { - margin: 0 1em; - } - - trough { - background-color: color.adjust($fg, $alpha: -0.8); - border-radius: $radius; - } - - highlight { - background-color: $accent; - min-height: .8em; - border-radius: $radius; - } - - slider { - background-color: $fg; - border-radius: $radius; - min-height: 1em; - min-width: 1em; - margin: -.2em; - } - } -} - diff --git a/pkgs/ags/biscuit/tsconfig.json b/pkgs/ags/biscuit/tsconfig.json deleted file mode 100644 index 9471e35..0000000 --- a/pkgs/ags/biscuit/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "compilerOptions": { - "experimentalDecorators": true, - "strict": true, - "target": "ES2022", - "module": "ES2022", - "moduleResolution": "Bundler", - // "checkJs": true, - // "allowJs": true, - "jsx": "react-jsx", - "jsxImportSource": "astal/gtk3", - } -} diff --git a/pkgs/ags/biscuit/widget/Bar.tsx b/pkgs/ags/biscuit/widget/Bar.tsx deleted file mode 100644 index 9941dc4..0000000 --- a/pkgs/ags/biscuit/widget/Bar.tsx +++ /dev/null @@ -1,189 +0,0 @@ -import { App } from "astal/gtk3" -import { Variable, GLib, bind } from "astal" -import { Astal, Gtk, Gdk } from "astal/gtk3" -import Hyprland from "gi://AstalHyprland" -import Mpris from "gi://AstalMpris" -import Battery from "gi://AstalBattery" -import Wp from "gi://AstalWp" -import Network from "gi://AstalNetwork" -import Tray from "gi://AstalTray" - -function SysTray() { - const tray = Tray.get_default() - - return - {bind(tray, "items").as(items => items.map(item => ( - ["dbusmenu", ag])} - menuModel={bind(item, "menuModel")}> - - - )))} - -} - -function Wifi() { - const network = Network.get_default() - const wifi = bind(network, "wifi") - - return - {wifi.as(wifi => wifi && ( - - ))} - - -} - -function AudioSlider() { - const speaker = Wp.get_default()?.audio.defaultSpeaker! - - return - - speaker.volume = value} - value={bind(speaker, "volume")} - /> - -} - -function BatteryLevel() { - const bat = Battery.get_default() - - return - - -} - -function Media() { - const mpris = Mpris.get_default() - - return - {bind(mpris, "players").as(ps => ps[0] ? ( - - - `background-image: url('${cover}');` - )} - /> - - ) : ( - -} - - -function Workspaces() { - const hypr = Hyprland.get_default(); - - return ( - - {bind(hypr, "focusedWorkspace").as((fw) => { - if (!fw) return null; - - // Determine the current chunk of 5 visible workspace buttons - const currentChunkStart = Math.floor((fw.id - 1) / 5) * 5 + 1; - const visibleIds = Array.from({ length: 5 }, (_, i) => currentChunkStart + i); - - return visibleIds.map((id) => { - // Try to get the real workspace, fall back to a dummy one if it doesn't exist - const ws = - hypr.workspaces.find((w) => w.id === id) ?? - Hyprland.Workspace.dummy(id, null); - - return ( - - ); - }); - })} - - ); -} - -function FocusedClient() { - const hypr = Hyprland.get_default(); - const focused = bind(hypr, "focusedClient"); - - return ( - - {focused.as(client => { - if (!client) return null; - - return ( - - ); -} -function Time({ format = "%H:%M|%a %b %d" }) { - const time = Variable("").poll(1000, () => - GLib.DateTime.new_now_local().format(format)! - ); - - return bind(time).as(str => { - const [hm, date] = str.split("|"); - - return ( - - - ); - }); -} - -export default function Bar(monitor: Gdk.Monitor) { - const { TOP, LEFT, RIGHT } = Astal.WindowAnchor - - return - - - - - - - - - - - - - - - -} diff --git a/pkgs/ags/default.nix b/pkgs/ags/default.nix deleted file mode 100644 index 60f4e69..0000000 --- a/pkgs/ags/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - inputs, - pkgs, - system, - ... -}: { - imports = [inputs.ags.homeManagerModules.default]; - - programs.ags = { - enable = true; - configDir = ./biscuit; - - extraPackages = let - agsPkgs = inputs.ags.packages.${system}; - in - with pkgs; [ - agsPkgs.battery - agsPkgs.hyprland - agsPkgs.mpris - agsPkgs.wireplumber - agsPkgs.notifd - agsPkgs.apps - agsPkgs.network - agsPkgs.tray - fzf - ]; - }; -} diff --git a/pkgs/btop/default.nix b/pkgs/btop/default.nix deleted file mode 100644 index 031a4e7..0000000 --- a/pkgs/btop/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{...}: { - programs.btop = { - enable = true; - settings = { - vim_keys = true; - }; - }; -} diff --git a/pkgs/fastfetch/default.nix b/pkgs/fastfetch/default.nix deleted file mode 100644 index 0e09cb7..0000000 --- a/pkgs/fastfetch/default.nix +++ /dev/null @@ -1,131 +0,0 @@ -{ - programs.fastfetch = { - enable = true; - - settings = { - logo = { - padding = { - top = 2; - left = 1; - right = 2; - }; - }; - - display = { - separator = " "; - }; - - modules = [ - # Title - { - type = "title"; - format = "{#1}โ•ญโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ {#}{user-name-colored}"; - } - - # System Information Header - { - type = "custom"; - format = "{#1}โ”‚ {#}System Information"; - } - { - type = "os"; - key = "โ”‚ {#keys}๓ฐน OS"; - } - { - type = "kernel"; - key = "โ”‚ {#keys}๓ฐ’‹ Kernel"; - } - { - type = "uptime"; - key = "โ”‚ {#keys}๓ฐ… Uptime"; - } - { - type = "packages"; - key = "โ”‚ {#keys}๓ฐ– Packages"; - format = "{all}"; - } - - { - type = "custom"; - format = "{#1}โ”‚"; - } - - # Desktop Environment - { - type = "custom"; - format = "{#1}โ”‚ {#}Desktop Environment"; - } - { - type = "de"; - key = "โ”‚ {#keys}๓ฐงจ DE"; - } - { - type = "wm"; - key = "โ”‚ {#keys}๓ฑ‚ฌ WM"; - } - { - type = "wmtheme"; - key = "โ”‚ {#keys}๓ฐ‰ผ Theme"; - } - { - type = "display"; - key = "โ”‚ {#keys}๓ฐน‘ Resolution"; - } - { - type = "shell"; - key = "โ”‚ {#keys}๓ฐžท Shell"; - } - { - type = "terminalfont"; - key = "โ”‚ {#keys}๓ฐ›– Font"; - } - - { - type = "custom"; - format = "{#1}โ”‚"; - } - - # Hardware Information - { - type = "custom"; - format = "{#1}โ”‚ {#}Hardware Information"; - } - { - type = "cpu"; - key = "โ”‚ {#keys}๓ฐป  CPU"; - } - { - type = "gpu"; - key = "โ”‚ {#keys}๓ฐขฎ GPU"; - } - { - type = "memory"; - key = "โ”‚ {#keys}๓ฐ› Memory"; - } - { - type = "disk"; - key = "โ”‚ {#keys}๓ฐ‹Š Disk (/)"; - folders = "/"; - } - - { - type = "custom"; - format = "{#1}โ”‚"; - } - - # Colors - { - type = "colors"; - key = "โ”‚"; - symbol = "circle"; - } - - # Footer - { - type = "custom"; - format = "{#1}โ•ฐโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ•ฏ"; - } - ]; - }; - }; -} diff --git a/pkgs/fish/default.nix b/pkgs/fish/default.nix deleted file mode 100644 index c618985..0000000 --- a/pkgs/fish/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - pkgs, - terminal, - ... -}: { - programs.zoxide.enable = true; - programs.fish = { - enable = true; - interactiveShellInit = '' - set fish_greeting - fish_vi_key_bindings - zoxide init fish | source - - ''; - shellAliases = terminal.shellAliases; - - plugins = with pkgs.fishPlugins; [ - ]; - }; -} diff --git a/pkgs/git/default.nix b/pkgs/git/default.nix deleted file mode 100644 index 89084da..0000000 --- a/pkgs/git/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{gitProfile, ...}: { - programs.git = { - enable = true; - extraConfig = { - user.name = "${gitProfile.user}"; - user.email = "${gitProfile.email}"; - init.defaultBranch = "${gitProfile.defaultBranch}"; - }; - }; -} diff --git a/pkgs/heroic/default.nix b/pkgs/heroic/default.nix deleted file mode 100644 index 3353d0a..0000000 --- a/pkgs/heroic/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{pkgs, ...}: { - home.packages = [ - pkgs.heroic - ]; -} diff --git a/pkgs/hypridle/default.nix b/pkgs/hypridle/default.nix deleted file mode 100644 index 84fb945..0000000 --- a/pkgs/hypridle/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{...}: { - services.hypridle = { - enable = true; - settings = { - general = { - lock_cmd = "pidof hyprlock || hyprlock"; # avoid starting multiple hyprlock instances. - before_sleep_cmd = "loginctl lock-session"; # lock before suspend. - after_sleep_cmd = "hyprctl dispatch dpms on && agu"; # avoid needing to press a key twice to turn on the display. - }; - - listener = [ - # { - # timeout = 150; - # on-timeout = "brightnessctl -s set 10"; # set monitor backlight to minimum, avoid 0 on OLED monitor. - # on-resume = "brightnessctl -r"; # restore monitor backlight. - # } - # { - # timeout = 150; - # on-timeout = "brightnessctl -sd rgb:kbd_backlight set 0"; # turn off keyboard backlight. - # on-resume = "brightnessctl -rd rgb:kbd_backlight"; # turn on keyboard backlight. - # } - # { - # timeout = 300; - # on-timeout = "loginctl lock-session"; # lock screen when timeout has passed. - # } - # { - # timeout = 330; - # on-timeout = "hyprctl dispatch dpms off"; # screen off after 5.5min. - # on-resume = "hyprctl dispatch dpms on && brightnessctl -r"; # screen on and restore brightness on resume. - # } - { - timeout = 300; - on-timeout = "systemctl suspend"; # suspend PC after 30min. - } - ]; - }; - }; -} diff --git a/pkgs/hyprland/default.nix b/pkgs/hyprland/default.nix deleted file mode 100644 index 6017d13..0000000 --- a/pkgs/hyprland/default.nix +++ /dev/null @@ -1,225 +0,0 @@ -{ - hyprconf, - username, - terminal, - ... -}: { - wayland.windowManager.hyprland = { - enable = true; - xwayland.enable = true; - settings = { - "$mod" = "SUPER"; - "$term" = "kitty --single-instance"; - "$browser" = "firefox"; - - monitor = hyprconf.monitor; - - exec-once = [ - "[workspace 20 silent] kitty --single-insance --hold fastfetch" - "[workspace 20 silent] firefox" - "[workspace 1] kitty --single-instance --hold fastfetch" - "pkill gjs & ags run" - # "matugen image /home/${username}/.config/nixos/assets/wallpapers/ultrawide-nixos-default.png" - "hyprctl setcursor Bibata-Original-Classic 24" - ]; - - general = { - gaps_in = 2; - gaps_out = 5; - border_size = 2; - # col.active_border = "#0DB7D4FF"; - # col.inactive_border = "#31313600"; - # col = { - # "inactive_border" = "rgba(595959aa)"; - # "active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg"; - # }; - resize_on_border = false; - allow_tearing = false; - layout = "dwindle"; - }; - decoration = { - rounding = 0; - rounding_power = 2; - active_opacity = 1.0; - inactive_opacity = 1.0; - - dim_inactive = true; - dim_strength = 0.1; - dim_special = 0.8; - - shadow = { - enabled = true; - range = 4; - render_power = 3; - color = "rgba(1a1a1aee)"; - }; - - blur = { - enabled = true; - size = 3; - passes = 1; - vibrancy = 0.1696; - }; - }; - - animations = { - enabled = true; - bezier = [ - "linear, 0, 0, 1, 1" - "md3_standard, 0.2, 0, 0, 1" - "md3_decel, 0.05, 0.7, 0.1, 1" - "md3_accel, 0.3, 0, 0.8, 0.15" - "overshot, 0.05, 0.9, 0.1, 1.1" - "crazyshot, 0.1, 1.5, 0.76, 0.92" - "hyprnostretch, 0.05, 0.9, 0.1, 1.0" - "menu_decel, 0.1, 1, 0, 1" - "menu_accel, 0.38, 0.04, 1, 0.07" - "easeInOutCirc, 0.85, 0, 0.15, 1" - "easeOutCirc, 0, 0.55, 0.45, 1" - "easeOutExpo, 0.16, 1, 0.3, 1" - "softAcDecel, 0.26, 0.26, 0.15, 1" - "md2, 0.4, 0, 0.2, 1" - ]; - - animation = [ - "windows, 1, 3, md3_decel, popin 60%" - "windowsIn, 1, 3, md3_decel, popin 60%" - "windowsOut, 1, 3, md3_accel, popin 60%" - "border, 1, 10, default" - "fade, 1, 3, md3_decel" - "layersIn, 1, 3, menu_decel, slide" - "layersOut, 1, 1.6, menu_accel" - "fadeLayersIn, 1, 2, menu_decel" - "fadeLayersOut, 1, 0.5, menu_accel" - "workspaces, 1, 7, menu_decel, slide" - "specialWorkspace, 1, 3, md3_decel, slidevert" - ]; - }; - - dwindle = { - pseudotile = true; - preserve_split = true; - }; - - master = { - new_status = "master"; - }; - - misc = { - force_default_wallpaper = -1; - disable_hyprland_logo = true; - }; - - input = { - kb_layout = "us"; - follow_mouse = 1; - sensitivity = -0.5; - force_no_accel = true; - repeat_delay = 250; - repeat_rate = 35; - - touchpad = { - natural_scroll = false; - }; - - numlock_by_default = true; - }; - - gestures = { - workspace_swipe = false; - }; - - binds = { - workspace_back_and_forth = true; - scroll_event_delay = 0; - }; - - device = [ - { - name = "epic-mouse-v1"; - sensitivity = -0.5; - } - ]; - - bind = - [ - "$mod, Return, exec, $term" - "$mod, Q, killactive," - "$mod, M, exit," - "$mod, E, exec, $fileManager" - "$mod, V, togglefloating," - "$mod, R, exec, $menu" - "$mod, P, pseudo," - "$mod, B, togglesplit," - "$mod, W, exec, $browser" - - "$mod, H, movefocus, l" - "$mod, L, movefocus, r" - "$mod, K, movefocus, u" - "$mod, J, movefocus, d" - - "$mod SHIFT, K, movewindow, u" - "$mod SHIFT, J, movewindow, d" - "$mod SHIFT, H, movewindow, l" - "$mod SHIFT, L, movewindow, r" - - "$mod CTRL, K, resizeactive, 0 -50" - "$mod CTRL, J, resizeactive, 0 50" - "$mod CTRL, H, resizeactive, -50 0" - "$mod CTRL, L, resizeactive, 50 0" - - "$mod, S, togglespecialworkspace, magic" - "$mod SHIFT, S, movetoworkspace, special:magic" - - "$mod, mouse_down, workspace, e+1" - "$mod, mouse_up, workspace, e-1" - - "$mod, F, fullscreen, 0" - - "$mod, Space, exec, pkill rofi || rofi -show drun" - "$mod, C, exec, pkill rofi || rofi -show calc -modi calc -no-show-match -no-sort" - ] - ++ ( - # workspaces - builtins.concatLists (builtins.genList ( - i: let - ws = i + 1; - in [ - "$mod, ${toString ws}, workspace, ${toString ws}" - "$mod SHIFT, ${toString ws}, movetoworkspace, ${toString ws}" - ] - ) - 9) - ) - ++ [ - "$mod, 0, workspace, 10" - "$mod, 0, movetoworkspace, 10" - ]; - - bindm = [ - "$mod, mouse:272, movewindow" - "$mod, mouse:273, resizewindow" - ]; - - bindel = [ - ",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+" - ",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" - ",XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" - ",XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle" - ",XF86MonBrightnessUp, exec, brightnessctl s 10%+" - ",XF86MonBrightnessDown, exec, brightnessctl s 10%-" - ]; - - bindl = [ - ",XF86AudioNext, exec, playerctl next" - ",XF86AudioPause, exec, playerctl play-pause" - ",XF86AudioPlay, exec, playerctl play-pause" - ",XF86AudioPrev, exec, playerctl previous" - ]; - env = [ - "HYPRCURSOR_THEME, Bibata-Original-Classic" - "HYPRCURSOR_SIZE, 24" - ]; - }; - }; -} diff --git a/pkgs/hyprlock/default.nix b/pkgs/hyprlock/default.nix deleted file mode 100644 index 3658ee1..0000000 --- a/pkgs/hyprlock/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{...}: { - programs.hyprlock = { - enable = true; - settings = { - }; - }; -} diff --git a/pkgs/kitty/default.nix b/pkgs/kitty/default.nix deleted file mode 100755 index 00fbcd8..0000000 --- a/pkgs/kitty/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{terminal, ...}: { - programs.kitty = { - enable = true; - - themeFile = "kanagawa"; - settings = { - confirm_os_window_close = 0; - window_padding_width = 10; - - font_size = terminal.termSize; - font_family = terminal.termFont; - bold_font = "auto"; - italic_font = "auto"; - bold_italic_font = "auto"; - # optimization - input_delay = 0; - repaint_delay = 2; - sync_to_monitor = false; - wayland_enable_ime = false; - allow_remote_control = true; - }; - extraConfig = "include colors.conf"; - }; -} diff --git a/pkgs/matugen/custom/config.toml b/pkgs/matugen/custom/config.toml deleted file mode 100644 index 12a558b..0000000 --- a/pkgs/matugen/custom/config.toml +++ /dev/null @@ -1,70 +0,0 @@ -[config] -# If set to enabled, it will check for updates when you run the matugen command, notifying you that an update is avaiable. -# WARNING: Matugen needs to be compiled with the `update-informer` feature for this to work. -version_check = false - -[config.wallpaper] -# The base command to run for applying the wallpaper, shouldn't have spaces in it. -command = "swww" - -# The arguments that will be provided to the command. -# Keywords like {{ mode }} or anything that works inside of hooks doesn't work here. -# The last argument will be the image path. -arguments = ["img", "--transition-type", "center", "--transition-fps", "120"] - -# For example, killing the wallpaper daemon. Usage is like a normal hook. -# pre_hook = "" - -[config.custom_keywords] -test = "aaaa" - -[templates.name1] -# Relative paths will be resolved from the path `config.toml` is in. -input_path = "./colors.whatever-extension" -output_path = "./a/colors-generated.whatever-extension" - -# This will use a different input path depending on what mode you use. -# input_path_modes = { dark = "./colors.whatever-extension", light = "./colors.whatever-extension" } - -# This will compare all of the colors inside the array with the color you set as `compare_to`, and returns the closest color to it. -# You can then use `{{closest_color}}` inside templates and hooks. -colors_to_compare = [ - { name = "black", color = "#000000" }, - { name = "red", color = "#ff0000" }, - { name = "maroon", color = "#800000" }, - { name = "yellow", color = "#ffff00" }, - { name = "olive", color = "#808000" }, - { name = "lime", color = "#00ff00" }, - { name = "green", color = "#008000" }, - { name = "aqua", color = "#00ffff" }, - { name = "teal", color = "#008080" }, - { name = "blue", color = "#0000ff" }, - { name = "navy", color = "#000080" }, - { name = "fuchsia", color = "#ff00ff" }, - { name = "purple", color = "#800080" }, -] -compare_to = "{{colors.primary.default.hex}}" - -# Runs before the template is exported. You can use keywords here, -pre_hook = 'echo "source color {{colors.source_color.default.hex}}, source image {{image}}, closest color {{closest_color}}"' -# Runs after the template is exported. You can use keywords here. -post_hook = 'echo "after gen"' - -# Only hex values -# https://m3.material.io/styles/color/advanced/adjust-existing-colors#1cc12e43-237b-45b9-8fe0-9a3549c1f61e -# Blend is set to true by default. -[config.custom_colors] -green = "#00ff00" -red = "#ff0000" -blue = { color = "#0000ff", blend = false } - -### --- my config -[templates.kitty] -input_path = '~/.config/nixos/pkgs/matugen/custom/templates/kitty.conf' -output_path = '~/.config/kitty/colors.conf' -post_hook = "kitty @ set-colors -a -c ~/.config/kitty/colors.conf" - -[templates.ags] -input_path = '~/.config/nixos/pkgs/matugen/custom/templates/ags.scss' -output_path = '~/.config/nixos/pkgs/ags/biscuit/colors.scss' -post_hook = "pkill gjs & ags run ~/.config/nixos/pkgs/ags/biscuit/app.ts & disown (jobs -p) &" diff --git a/pkgs/matugen/custom/templates/ags.scss b/pkgs/matugen/custom/templates/ags.scss deleted file mode 100644 index 0ad29c0..0000000 --- a/pkgs/matugen/custom/templates/ags.scss +++ /dev/null @@ -1,3 +0,0 @@ -$background: {{colors.surface.dark.hex}}; -$foreground: {{colors.on_surface.dark.hex}}; -$primary: {{colors.primary.dark.hex}}; diff --git a/pkgs/matugen/custom/templates/kitty.conf b/pkgs/matugen/custom/templates/kitty.conf deleted file mode 100644 index 91b8e4b..0000000 --- a/pkgs/matugen/custom/templates/kitty.conf +++ /dev/null @@ -1,41 +0,0 @@ -cursor {{colors.on_surface.default.hex}} -cursor_text_color {{colors.on_surface_variant.default.hex}} - -foreground {{colors.on_surface.default.hex}} -background {{colors.surface.default.hex}} -selection_foreground {{colors.on_secondary.default.hex}} -selection_background {{colors.secondary_fixed_dim.default.hex}} -url_color {{colors.primary.default.hex}} - -# black -color8 #262626 -color0 #4c4c4c - -# red -color1 #ac8a8c -color9 #c49ea0 - -# green -color2 #8aac8b -color10 #9ec49f - -# yellow -color3 #aca98a -color11 #c4c19e - -# blue -/* color4 #8f8aac */ -color4 {{colors.primary.default.hex}} -color12 #a39ec4 - -# magenta -color5 #ac8aac -color13 #c49ec4 - -# cyan -color6 #8aacab -color14 #9ec3c4 - -# white -color15 #e7e7e7 -color7 #f0f0f0 diff --git a/pkgs/matugen/default.nix b/pkgs/matugen/default.nix deleted file mode 100644 index 6d3d98d..0000000 --- a/pkgs/matugen/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - pkgs, - inputs, - system, - ... -}: { - imports = [inputs.matugen.nixosModules.default]; - home.file.".config/matugen/config.toml" = { - source = builtins.toPath ./custom/config.toml; - }; -} diff --git a/pkgs/neovim/custom/dashboard.nix b/pkgs/neovim/custom/dashboard.nix deleted file mode 100644 index 480d83c..0000000 --- a/pkgs/neovim/custom/dashboard.nix +++ /dev/null @@ -1,174 +0,0 @@ -{ - plugins = { - alpha = { - enable = true; - layout = [ - { - type = "padding"; - val = 2; - } - { - type = "text"; - val = [ - " โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆ โ–ˆ โ–ˆโ–ˆ" - " โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆโ–ˆ โ–ˆ โ–ˆ" - " โ–ˆโ–ˆ โ–ˆ โ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆ" - " โ–ˆ โ–ˆ โ–ˆ โ–ˆโ–ˆ โ–ˆ โ–ˆ โ–ˆโ–ˆ โ–ˆ" - " โ–ˆ โ–ˆ โ–ˆโ–ˆ โ–ˆ โ–ˆโ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆ" - " โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆ โ–ˆโ–ˆโ–ˆ โ–ˆ โ–ˆโ–ˆโ–ˆ โ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆโ–ˆ" - " โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆ โ–ˆ โ–ˆโ–ˆโ–ˆ โ–ˆ โ–ˆโ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆ โ–ˆ" - " โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆ โ–ˆ โ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆโ–ˆ" - " โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ" - " โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆ โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ" - " โ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ" - " โ–ˆ โ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ" - " โ–ˆโ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆโ–ˆ โ–ˆ โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆ" - " โ–ˆ โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆ โ–ˆ โ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆ" - " โ–ˆ โ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆ โ–ˆโ–ˆโ–ˆ" - " โ–ˆ" - " โ–ˆ" - " โ–ˆโ–ˆ" - ]; - opts = { - position = "center"; - hl = "Type"; - }; - } - { - type = "padding"; - val = 4; - } - { - type = "group"; - val = [ - { - type = "button"; - val = " ๏…› New File "; - on_press.__raw = "function() vim.cmd[[ene]] end"; - opts = { - shortcut = "n"; - keymap = [ - "n" - "n" - "ene" - { - noremap = true; - silent = true; - nowait = true; - } - ]; - position = "center"; - width = 50; - align_shortcut = "right"; - hl_shortcut = "Keyword"; - }; - } - { - type = "padding"; - val = 2; - } - { - type = "button"; - val = " ๏€‚ Find File "; - opts = { - shortcut = "f"; - keymap = [ - "n" - "f" - "lua require('fzf-lua').files({ cwd = vim.loop.cwd() })" - { - noremap = true; - silent = true; - nowait = true; - } - ]; - position = "center"; - width = 50; - align_shortcut = "right"; - hl_shortcut = "Keyword"; - }; - } - { - type = "padding"; - val = 2; - } - { - type = "button"; - val = " ๏ƒ… Recent Files "; - on_press.__raw = "function() require('telescope.builtin').oldfiles() end"; - opts = { - shortcut = "r"; - keymap = [ - "n" - "r" - "lua require('fzf-lua').oldfiles({ cwd = vim.loop.cwd() })" - { - noremap = true; - silent = true; - nowait = true; - } - ]; - position = "center"; - width = 50; - align_shortcut = "right"; - hl_shortcut = "Keyword"; - }; - } - { - type = "padding"; - val = 2; - } - { - type = "button"; - val = " ๏€ข Find Text "; - on_press.__raw = "function() require('telescope.builtin').live_grep() end"; - opts = { - shortcut = "g"; - keymap = [ - "n" - "g" - "lua require('fzf-lua').live_grep()" - { - noremap = true; - silent = true; - nowait = true; - } - ]; - position = "center"; - width = 50; - align_shortcut = "right"; - hl_shortcut = "Keyword"; - }; - } - { - type = "padding"; - val = 2; - } - { - type = "button"; - val = " ๏ฆ Quit Neovim "; - on_press.__raw = "function() vim.cmd[[qa]] end"; - opts = { - shortcut = "q"; - keymap = [ - "n" - "q" - "qa" - { - noremap = true; - silent = true; - nowait = true; - } - ]; - position = "center"; - width = 50; - align_shortcut = "right"; - hl_shortcut = "Keyword"; - }; - } - ]; - } - ]; - }; - }; -} diff --git a/pkgs/neovim/custom/telescope.nix b/pkgs/neovim/custom/telescope.nix deleted file mode 100644 index 791b6c8..0000000 --- a/pkgs/neovim/custom/telescope.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: { - # `plugins.mini.enable` with `plugins.mini.modules.icons` and `plugins.mini.mockDevIcons`. - # plugins.web-devicons.enable = true; - plugins.mini = { - enable = true; - mockDevIcons = true; - modules = [ - ]; - }; - plugins.telescope = { - enable = true; - }; -} diff --git a/pkgs/neovim/default.nix b/pkgs/neovim/default.nix deleted file mode 100644 index 45ea1cd..0000000 --- a/pkgs/neovim/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - pkgs, - inputs, - ... -}: let - nix-neovim = inputs.nix-neovim.packages.${pkgs.system}.default; -in { - programs.neovim.enable = false; - home.packages = [ - nix-neovim - pkgs.lazygit - # ripgrep - ]; -} diff --git a/pkgs/rofi/default.nix b/pkgs/rofi/default.nix deleted file mode 100644 index 729125b..0000000 --- a/pkgs/rofi/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{pkgs, ...}: { - programs.rofi = { - enable = true; - plugins = with pkgs; [ - rofi-calc - ]; - }; -} diff --git a/pkgs/rofi/launcher/colors/onedark.rasi b/pkgs/rofi/launcher/colors/onedark.rasi deleted file mode 100644 index 7c76108..0000000 --- a/pkgs/rofi/launcher/colors/onedark.rasi +++ /dev/null @@ -1,16 +0,0 @@ -/** - * - * Author : Aditya Shakya (adi1090x) - * Github : @adi1090x - * - * Colors - **/ - -* { - background: #1E2127FF; - background-alt: #282B31FF; - foreground: #FFFFFFFF; - selected: #61AFEFFF; - active: #98C379FF; - urgent: #E06C75FF; -} diff --git a/pkgs/rofi/launcher/config.rasi b/pkgs/rofi/launcher/config.rasi deleted file mode 100644 index fe2c342..0000000 --- a/pkgs/rofi/launcher/config.rasi +++ /dev/null @@ -1,171 +0,0 @@ -/** - * - * Author : Aditya Shakya (adi1090x) - * Github : @adi1090x - * - * Rofi Theme File - * Rofi Version: 1.7.3 - **/ - -/*****----- Configuration -----*****/ -configuration { - modi: "drun"; - show-icons: true; - display-drun: "๏€‚"; - drun-display-format: "{name}"; -} - -/*****----- Global Properties -----*****/ -@import "shared/colors.rasi" -@import "shared/fonts.rasi" - -/*****----- Main Window -----*****/ -window { - transparency: "real"; - location: center; - anchor: center; - fullscreen: false; - width: 400px; - x-offset: 0px; - y-offset: 0px; - - enabled: true; - margin: 0px; - padding: 0px; - border: 0px solid; - border-radius: 12px; - border-color: @selected; - background-color: @background; - cursor: "default"; -} - -/*****----- Main Box -----*****/ -mainbox { - enabled: true; - spacing: 0px; - margin: 0px; - padding: 0px; - border: 0px solid; - border-radius: 0px 0px 0px 0px; - border-color: @selected; - background-color: transparent; - children: [ "inputbar", "listview" ]; -} - -/*****----- Inputbar -----*****/ -inputbar { - enabled: true; - spacing: 10px; - margin: 0px; - padding: 15px; - border: 0px solid; - border-radius: 0px; - border-color: @selected; - background-color: @selected; - text-color: @background; - children: [ "prompt", "entry" ]; -} - -prompt { - enabled: true; - background-color: inherit; - text-color: inherit; -} -textbox-prompt-colon { - enabled: true; - expand: false; - str: "::"; - background-color: inherit; - text-color: inherit; -} -entry { - enabled: true; - background-color: inherit; - text-color: inherit; - cursor: text; - placeholder: "Search..."; - placeholder-color: inherit; -} - -/*****----- Listview -----*****/ -listview { - enabled: true; - columns: 1; - lines: 6; - cycle: true; - dynamic: true; - scrollbar: false; - layout: vertical; - reverse: false; - fixed-height: true; - fixed-columns: true; - - spacing: 5px; - margin: 0px; - padding: 0px; - border: 0px solid; - border-radius: 0px; - border-color: @selected; - background-color: transparent; - text-color: @foreground; - cursor: "default"; -} -scrollbar { - handle-width: 5px ; - handle-color: @selected; - border-radius: 0px; - background-color: @background-alt; -} - -/*****----- Elements -----*****/ -element { - enabled: true; - spacing: 10px; - margin: 0px; - padding: 8px; - border: 0px solid; - border-radius: 0px; - border-color: @selected; - background-color: transparent; - text-color: @foreground; - cursor: pointer; -} -element normal.normal { - background-color: @background; - text-color: @foreground; -} -element selected.normal { - background-color: @background-alt; - text-color: @foreground; -} -element-icon { - background-color: transparent; - text-color: inherit; - size: 32px; - cursor: inherit; -} -element-text { - background-color: transparent; - text-color: inherit; - highlight: inherit; - cursor: inherit; - vertical-align: 0.5; - horizontal-align: 0.0; -} - -/*****----- Message -----*****/ -error-message { - padding: 15px; - border: 2px solid; - border-radius: 12px; - border-color: @selected; - background-color: @background; - text-color: @foreground; -} -textbox { - background-color: @background; - text-color: @foreground; - vertical-align: 0.5; - horizontal-align: 0.0; - highlight: none; -} diff --git a/pkgs/rofi/launcher/launcher.sh b/pkgs/rofi/launcher/launcher.sh deleted file mode 100644 index c294cca..0000000 --- a/pkgs/rofi/launcher/launcher.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -## Author : Aditya Shakya (adi1090x) -## Github : @adi1090x -# -## Rofi : Launcher (Modi Drun, Run, File Browser, Window) -# -## Available Styles -# -## style-1 style-2 style-3 style-4 style-5 -## style-6 style-7 style-8 style-9 style-10 -## style-11 style-12 style-13 style-14 style-15 - -dir="$HOME/.config/wofi/launcher/config.rasi" -theme='style-1' - -## Run -wofi \ - -show drun \ - -theme ${dir}/${theme}.rasi diff --git a/pkgs/rofi/launcher/shared/colors.rasi b/pkgs/rofi/launcher/shared/colors.rasi deleted file mode 100644 index d3ca8b2..0000000 --- a/pkgs/rofi/launcher/shared/colors.rasi +++ /dev/null @@ -1,18 +0,0 @@ -/** - * - * Author : Aditya Shakya (adi1090x) - * Github : @adi1090x - * - * Colors - * - * Available Colors Schemes - * - * adapta catppuccin everforest navy paper - * arc cyberpunk gruvbox nord solarized - * black dracula lovelace onedark yousai - * - **/ - -/* Import color-scheme from `colors` directory */ - -@import "~/.config/wofi/colors/onedark.rasi" diff --git a/pkgs/rofi/launcher/shared/fonts.rasi b/pkgs/rofi/launcher/shared/fonts.rasi deleted file mode 100644 index 50499c9..0000000 --- a/pkgs/rofi/launcher/shared/fonts.rasi +++ /dev/null @@ -1,12 +0,0 @@ -/** - * - * Author : Aditya Shakya (adi1090x) - * Github : @adi1090x - * - * Fonts - * - **/ - -* { - font: "Iosevka Nerd Font 10"; -} diff --git a/pkgs/starship/default.nix b/pkgs/starship/default.nix deleted file mode 100644 index 1a73a8a..0000000 --- a/pkgs/starship/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{lib, ...}: { - programs.starship = { - enable = true; - settings = { - format = lib.concatStrings [ - "$username" - "$hostname" - "$directory" - "$git_branch" - "$git_state" - "$git_status" - "$cmd_duration" - "$line_break" - "$python" - "$character" - ]; - - directory = { - style = "blue"; - }; - - character = { - success_symbol = "[โ†’](purple)"; - error_symbol = "[โ†’](red)"; - vimcmd_symbol = "[โ†](green)"; - }; - - git_branch = { - format = "[$branch]($style)"; - style = "bright-black"; - }; - git_status = { - format = "[(*$conflicted$untracked$modified$staged$renamed$deleted) $ahead_behind$stashed]($style)"; - style = "cyan"; - conflicted = "โ€‹"; - untracked = "โ€‹"; - modified = "โ€‹"; - staged = "โ€‹"; - renamed = "โ€‹"; - deleted = "โ€‹"; - stashed = "โ‰ก"; - }; - git_state = { - format = "([$state( $progress_current/$progress_total)]($style)) "; - style = "bright-black"; - }; - - cmd_duration = { - format = "[$duration]($style) "; - style = "yellow"; - }; - - python = { - format = "[$virtualenv]($style) "; - style = "bright-black"; - }; - }; - }; - # home.file.".config/starship.toml" = { - # source = builtins.toPath ./pure.toml; - # }; -} diff --git a/pkgs/steam/default.nix b/pkgs/steam/default.nix deleted file mode 100644 index 1b4091b..0000000 --- a/pkgs/steam/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - programs.steam = { - enable = true; - }; -} diff --git a/pkgs/swww/default.nix b/pkgs/swww/default.nix deleted file mode 100644 index 4b1bfe2..0000000 --- a/pkgs/swww/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{...}: { - services.swww.enable = true; -} diff --git a/pkgs/swww/wallpapers/ascii-nixos.png b/pkgs/swww/wallpapers/ascii-nixos.png deleted file mode 100644 index 2cd684f..0000000 Binary files a/pkgs/swww/wallpapers/ascii-nixos.png and /dev/null differ diff --git a/pkgs/waybar/default.nix b/pkgs/waybar/default.nix deleted file mode 100644 index 6898199..0000000 --- a/pkgs/waybar/default.nix +++ /dev/null @@ -1,229 +0,0 @@ -{ username, hostname, ... }: { - programs.waybar = { - enable = true; - settings = [ - { - margin-top = 10; - margin-left = 10; - margin-right = 10; - layer = "top"; - position = "top"; - - modules-left = [ - "custom/start" - "hyprland/submap" - "hyprland/workspaces" - "hyprland/window" - ]; - modules-right = [ - "tray" - "temperature" - "cpu" - "memory" - "disk" - "network" - "pulseaudio" - "battery" - "power-profiles-daemon" - "clock" - ]; - "cpu" = { - states = { - critical = 85; - }; - interval = 1; - format = "๏‹› {usage:2}%"; - on-click = "kitty btop"; - }; - "memory" = { - states = { - critical = 85; - }; - interval = 1; - format = "๏”ธ {percentage}%"; - on-click = "kitty btop"; - }; - "disk" = { - states = { - critical = 85; - }; - interval = 5; - format = "๏‡€ {percentage_used}%"; - on-click = "kitty btop"; - }; - "network" = { - format-ethernet = "๏ž– {bandwidthDownOctets}"; - format-wifi = "๏‡ซ {signalStrength}%"; - format-disconnected = "๎ˆญ"; - format-disabled = "๎ˆญ"; - tooltip = false; - on-click = "rofi-network-manager"; - }; - "temperature" = { - critical-threshold = 80; - format = "๏‹‡ {temperatureC}ยฐC"; - interval = 1; - on-click = "kitty btop"; - }; - "power-profiles-daemon" = { - format = "{icon} {profile}"; - format-icons = { - performance = "๏˜ฅ"; - power-saver = "๏ฌ"; - balanced = "๎‘ณ"; - }; - }; - "hyprland/workspaces" = { - format = "{name}"; - format-icons = { - default = " "; - active = " "; - urgent = " "; - }; - on-scroll-down = "hyprctl dispatch workspace e+1"; - on-scroll-up = "hyprctl dispatch workspace e-1"; - }; - "hyprland/window" = { - icon = true; - max-length = 45; - separate-outputs = false; - rewrite = { - "" = "${username}@${hostname}"; - "~" = "${username}@${hostname}"; - }; - on-click-right = "hyprctl dispatch fullscreen 0"; - on-click-middle = "hyprctl dispatch killactive"; - on-click = "hyprctl dispatch fullscreen 1"; - }; - "hyprland/submap" = { - format = "๏„œ {}"; - on-click = "hyprctl dispatch submap reset"; - }; - "clock" = { - format = "{:%b %d, %I:%M %p}"; - }; - "tray" = { - spacing = 12; - }; - "taskbar" = { - icon-size = 10; - icon-theme = "Papirus-Dark"; - on-click = "activate"; - on-click-right = "fullscreen"; - on-click-middle = "close"; - on-scroll-up = "maximize"; - on-scroll-down = "minimize"; - }; - "pulseaudio" = { - format = "{icon} {volume}% {format_source}"; - format-bluetooth = "{volume}% {icon}๏Š” {format_source}"; - format-bluetooth-muted = "๏šฉ {icon}๏Š” {volume}% {format_source_muted}"; - format-muted = "๏šฉ {volume}% {format_source_muted}"; - format-source = ""; - format-source-muted = "๏”น"; - format-icons = { - headphone = "๏–"; - hands-free = "๏–"; - headset = "๏–"; - phone = "๏‚•"; - portable = "๏‚•"; - car = "๏†น"; - default = [ - "๏€ฆ" - "๏€ง" - "๏€จ" - ]; - }; - on-click = "pavucontrol"; - on-click-right = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; - }; - "battery" = { - states = { - warning = 30; - critical = 15; - }; - format = "{icon} {capacity}%"; - format-charging = "๏ƒง {capacity}%"; - format-plugged = "๏‡ฆ {capacity}%"; - format-icons = [ - "๏‰„" - "๏‰ƒ" - "๏‰‚" - "๏‰" - "๏‰€" - ]; - interval = 1; - on-click = ""; - }; - "custom/start" = { - format = "๏‹œ"; - on-click-right = "rofi -show power-menu -modi power-menu:rofi-power-menu"; - on-click = "rofi -show drun"; - }; - } - ]; - style = '' - * { - font-size: 12px; - font-family: Font Awesome, monospace; - font-weight: bold; - color: @text; - transition: none; - } - - window#waybar { - background: rgba(0,0,0,0); - border: none; - } - - #workspaces button { - border-radius: 0px; - margin: 0px; - background: none; - border: none; - } - - #workspaces button:hover, #custom-start:hover, #window:hover { - border: none; - outline: none; - background: none; - color: @text; - background-size: 300% 300%; - background: @surface0; - } - - #workspaces button.active, #submap { - background: @surface1; - } - - #custom-start { - padding: 0px 5px; - color: @sky; - font-size: 16px; - } - - #window, #submap { - padding: 0px 5px; - } - - .modules-left, .modules-right { - background-color: @crust; - border: 2px solid @surface1; - border-radius: 10px; - padding: 0 5px; - } - #submap, #workspaces, #cpu, #memory, #disk, #clock, #window, #tray, #pulseaudio, #battery, #network, #temperature, #power-profiles-daemon, #custom-exit, #custom-start { - margin: 0 5px; - } - .critical, .muted, .performance { - color: @red; - } - .warning, .urgent { - color: @yellow; - } - .charging, .plugged, .power-saver { - color: @green; - } - ''; - }; -} diff --git a/pkgs/zsh/custom/config.omp.json b/pkgs/zsh/custom/config.omp.json deleted file mode 100644 index a6e6a5d..0000000 --- a/pkgs/zsh/custom/config.omp.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json", - "blocks": [ - { - "alignment": "left", - "segments": [ - { - "foreground": "#ffdd86", - "style": "plain", - "template": "{{ .UserName }}@{{ .HostName }} ", - "type": "session" - }, - { - "foreground": "#42a9ff", - "style": "plain", - "properties": { - "style": "full" - }, - "template": "{{ .Path }} ", - "type": "path" - }, - { - "properties": { - "branch_icon": "", - "fetch_status": true - }, - "style": "plain", - "template": "git:{{ if or (.Working.Changed) (.Staging.Changed) (gt .StashCount 0) }}<#ffdd86>{{ .HEAD }}{{ else }}{{ .HEAD }}{{ end }}{{ if .Staging.Changed }} <#98c379>{{ .Staging.String }}{{ end }}{{ if .Working.Changed }} <#d16971>{{ .Working.String }}{{ end }}", - "type": "git" - } - ], - "type": "prompt" - }, - { - "alignment": "left", - "newline": true, - "segments": [ - { - "foreground": "#ffdd86", - "foreground_templates": [ - "{{ if gt .Code 0 }}#42a9ff{{ end }}" - ], - "properties": { - "always_enabled": true - }, - "style": "plain", - "template": "> ", - "type": "status" - } - ], - "type": "prompt" - } - ], - "version": 3 -} diff --git a/pkgs/zsh/default.nix b/pkgs/zsh/default.nix deleted file mode 100644 index 930298f..0000000 --- a/pkgs/zsh/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - pkgs, - terminal, - ... -}: { - home.packages = with pkgs; [ - zoxide - ]; - - programs.zsh.enable = true; - programs.zoxide.enable = true; - - programs.zsh = { - enableCompletion = false; - syntaxHighlighting.enable = false; - shellAliases = terminal.shellAliases; - history.size = 10000; - antidote = { - enable = true; - plugins = [ - "MichaelAquilina/zsh-autoswitch-virtualenv" - "jeffreytse/zsh-vi-mode" - "zdharma-continuum/fast-syntax-highlighting kind:defer" - "zsh-users/zsh-autosuggestions kind:defer" - "zsh-users/zsh-history-substring-search kind:defer" - ]; - }; - initContent = '' - # zsh-autocomplete - # bindkey -M menuselect '^M' .accept-line # run code when selected completion - - autoload -Uz compinit - if [ "$(date +'%j')" != "$(stat -f '%Sm' -t '%j' ~/.zcompdump 2>/dev/null)" ]; then - compinit - else - compinit -C - fi - ''; - }; -} diff --git a/system/default.nix b/system/default.nix deleted file mode 100644 index 1ddaa10..0000000 --- a/system/default.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ - pkgs, - hostname, - timezone, - touchpadSupport, - inputs, - logitech-hardware, - ... -}: { - environment.systemPackages = with pkgs; - [ - python3 - python3Packages.pip - python3Packages.pygobject3 - python3Packages.setuptools - python3Packages.wheel - - gobject-introspection - gtk3 - libxml2 - - git - - cargo - gcc - rustc - nodejs - yarn - - busybox - - p7zip - - btop - tldr - - jq - lm_sensors - ] - ++ [ - inputs.matugen.packages.${pkgs.system}.default - ] - ++ lib.optionals (logitech-hardware.enable == true) [ - solaar - ]; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - hardware = { - logitech.wireless.enable = logitech-hardware.enable; - bluetooth = { - enable = true; - powerOnBoot = true; - }; - }; - - i18n.defaultLocale = "en_US.UTF-8"; - console = { - font = "Lat2-Terminus16"; - useXkbConfig = true; # use xkb.options in tty. - }; - - networking.hostName = "${hostname}"; - networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. - - time.timeZone = "${timezone}"; - - services = { - openssh.enable = true; - libinput.enable = touchpadSupport; - blueman.enable = true; - }; - - programs.bash = { - interactiveShellInit = '' - if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] - then - shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" - exec ${pkgs.fish}/bin/fish $LOGIN_OPTION - fi - ''; - }; - - programs = { - zsh.enable = true; - fish.enable = true; - }; - - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Copy the NixOS configuration file and link it from the resulting system - # (/run/current-system/configuration.nix). This is useful in case you - # accidentally delete configuration.nix. - # ONLY WORKS non-flake - # system.copySystemConfiguration = true; -} diff --git a/system/desktop/browser.nix b/system/desktop/browser.nix deleted file mode 100644 index 4a963df..0000000 --- a/system/desktop/browser.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ - config, - pkgs, - ... -}: let - lock-false = { - Value = false; - Status = "locked"; - }; - lock-true = { - Value = true; - Status = "locked"; - }; -in { - programs = { - firefox = { - enable = true; - languagePacks = ["en-US"]; - - /* - ---- POLICIES ---- - */ - # Check about:policies#documentation for options. - policies = { - DisableTelemetry = true; - DisableFirefoxStudies = true; - EnableTrackingProtection = { - Value = true; - Locked = true; - Cryptomining = true; - Fingerprinting = true; - }; - DisablePocket = true; - DisableFirefoxAccounts = true; - DisableAccounts = true; - DisableFirefoxScreenshots = true; - OverrideFirstRunPage = ""; - OverridePostUpdatePage = ""; - DontCheckDefaultBrowser = true; - DisplayBookmarksToolbar = "never"; # alternatives: "always" or "newtab" - DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" - SearchBar = "unified"; # alternative: "separate" - - /* - ---- EXTENSIONS ---- - */ - # Check about:support for extension/add-on ID strings. - # Valid strings for installation_mode are "allowed", "blocked", - # "force_installed" and "normal_installed". - ExtensionSettings = { - "*".installation_mode = "blocked"; # blocks all addons except the ones specified below - # uBlock Origin: - "uBlock0@raymondhill.net" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; - installation_mode = "force_installed"; - }; - "{446900e4-71c2-419f-a6a7-df9c091e268b}" = { - install_url = "https://addons.mozilla.org/firefox/downloads/file/4493940/bitwarden_password_manager-2025.5.0.xpi"; - installation_mode = "force_installed"; - }; - "tridactyl.vim@cmcaine.co.uk" = { - install_url = "https://addons.mozilla.org/firefox/downloads/file/4405615/tridactyl_vim-1.24.2.xpi"; - installation_mode = "force_installed"; - }; - # Privacy Badger: - # "jid1-MnnxcxisBPnSXQ@jetpack" = { - # install_url = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi"; - # installation_mode = "force_installed"; - # }; - # 1Password: - # "{d634138d-c276-4fc8-924b-40a0ea21d284}" = { - # install_url = "https://addons.mozilla.org/firefox/downloads/latest/1password-x-password-manager/latest.xpi"; - # installation_mode = "force_installed"; - }; - }; - - /* - ---- PREFERENCES ---- - */ - # Check about:config for options. - preferences = { - # "browser.contentblocking.category" = { - # Value = "strict"; - # Status = "locked"; - # }; - "browser.contentblocking.category" = "strict"; - "extensions.pocket.enabled" = false; - "extensions.screenshots.disabled" = true; - "browser.topsites.contile.enabled" = false; - "browser.formfill.enable" = false; - "browser.search.suggest.enabled" = false; - "browser.search.suggest.enabled.private" = false; - "browser.urlbar.suggest.searches" = false; - "browser.urlbar.showSearchSuggestionsFirst" = false; - "browser.newtabpage.activity-stream.feeds.section.topstories" = false; - "browser.newtabpage.activity-stream.feeds.snippets" = false; - "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; - "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = false; - "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = false; - "browser.newtabpage.activity-stream.section.highlights.includeVisited" = false; - "browser.newtabpage.activity-stream.showSponsored" = false; - "browser.newtabpage.activity-stream.system.showSponsored" = false; - "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; - }; - }; - }; -} diff --git a/system/desktop/cursor.nix b/system/desktop/cursor.nix deleted file mode 100644 index bb0c1be..0000000 --- a/system/desktop/cursor.nix +++ /dev/null @@ -1,6 +0,0 @@ -{pkgs, ...}: { - environment.systemPackages = with pkgs; [ - bibata-cursors - hyprcursor - ]; -} diff --git a/system/desktop/font.nix b/system/desktop/font.nix deleted file mode 100644 index 170f109..0000000 --- a/system/desktop/font.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - pkgs, - inputs, - system, - ... -}: let - unlisted-fonts = inputs.unlisted-fonts.packages.${pkgs.system}; -in { - fonts.packages = with pkgs; [ - unlisted-fonts.monolisa - unlisted-fonts.rubik - nerd-fonts.fira-code - nerd-fonts.jetbrains-mono - nerd-fonts.iosevka - ]; -} diff --git a/system/desktop/misc.nix b/system/desktop/misc.nix deleted file mode 100644 index 744d24c..0000000 --- a/system/desktop/misc.nix +++ /dev/null @@ -1,3 +0,0 @@ -{pkgs, ...}: { - services.printing.enable = true; -} diff --git a/system/desktop/sound.nix b/system/desktop/sound.nix deleted file mode 100644 index 74dff58..0000000 --- a/system/desktop/sound.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, ... }: { - # Enable sound. - # services.pulseaudio.enable = true; - # OR - environment.systemPackages = with pkgs; [ - pavucontrol - ]; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - pulse.enable = true; - }; -} diff --git a/system/desktop/theme.nix b/system/desktop/theme.nix deleted file mode 100644 index 33b6047..0000000 --- a/system/desktop/theme.nix +++ /dev/null @@ -1,4 +0,0 @@ -{pkgs, ...}: { - environment.systemPackages = with pkgs; [ - ]; -} diff --git a/system/desktop/wayland.nix b/system/desktop/wayland.nix deleted file mode 100644 index de04502..0000000 --- a/system/desktop/wayland.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - pkgs, - inputs, - ... -}: { - environment.systemPackages = with pkgs; [ - wl-clipboard - hypridle - hyprlock - ]; - programs.hyprland = { - enable = true; - # package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; - # portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; - }; - hardware = { - graphics.enable = true; - }; - services = { - # displayManager.sddm.wayland = true; - displayManager.gdm.enable = true; - }; -} diff --git a/system/users.nix b/system/users.nix deleted file mode 100644 index 0273916..0000000 --- a/system/users.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - pkgs, - username, - terminal, - ... -}: { - users = { - defaultUserShell = pkgs.${terminal.termShell}; - users = { - ${username} = { - isNormalUser = true; - extraGroups = ["wheel" "networkmanager" "input"]; - initialHashedPassword = "$6$Qab6SSvEJM2YRtVA$7Oyl7E3pp/FKtCC.2Tb2tyzp3yp7BFHFAKngUYJssQJ.v1Q2mqsgW9m7njpaKNcka2vyCwrnmw1R.YPlFqR0p1"; - useDefaultShell = true; - packages = [ - ]; - }; - }; - }; -} diff --git a/system/vpn.nix b/system/vpn.nix deleted file mode 100644 index 7fd0bf0..0000000 --- a/system/vpn.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - vpn, - username, - ... -}: { - networking.wg-quick.interfaces = { - biscuit-default = { - address = ["10.2.0.2/32"]; - # listenPort = 51820; - # FIXME change privateKey to variable and add env (make sure it is inaccessible!) - privateKeyFile = vpn.vpnSecretFile; - dns = ["10.2.0.1"]; - peers = [ - { - publicKey = "GbuOJ8Dho0iXlS0+ma2teQ4RxhBALWK6RB94qA1GZDA="; - allowedIPs = ["0.0.0.0/0"]; - endpoint = "79.127.147.2:51820"; - # persistentKeepAlive = 25; - } - ]; - }; - }; -}