diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml deleted file mode 100644 index 73d2db0..0000000 --- a/.github/workflows/update.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: update-flake-lock -on: - workflow_dispatch: # allows manual triggering - schedule: - - cron: '/60 * * * *' - -jobs: - lockfile: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v1 - - name: Update flake.lock - uses: DeterminateSystems/update-flake-lock@v19 - with: - pr-title: "Update flake.lock" # Title of PR to be created - pr-labels: | # Labels to be set on the PR - dependencies - automated diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 55a5381..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -peerix-private -peerix-public -result diff --git a/common.nix b/common.nix deleted file mode 100644 index 26be151..0000000 --- a/common.nix +++ /dev/null @@ -1,206 +0,0 @@ -{ home-manager, nixpkgs, nur, prismlauncher, inputs, ... }: - -{ - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - users.jopejoe1 = import ./home/jopejoe1.nix; - users.root = import ./home/root.nix; - }; - nixpkgs = { - config.allowUnfree = true; - overlays = [ prismlauncher.overlay nur.overlay ]; - }; - - system.stateVersion = "23.05"; - nix.registry = { - flake-utils.flake = flake-utils; - home-manager.flake = home-manager; - nix-darwin.flake = nix-darwin; - nixos-hardware.flake = nixos-hardware; - nur.flake = nur; - nixpkgs.flake = nixpkgs; - }; - nix.nixPath = [ "nixpkgs=/etc/channels/nixpkgs" "nixos-config=/etc/nixos/configuration.nix" "/nix/var/nix/profiles/per-user/root/channels" ]; - - environment.etc."channels/nixpkgs".source = inputs.nixpkgs.outPath; - - - services = { - xserver = { - enable = true; - - libinput.enable = true; - - displayManager.sddm = { - enable = true; - enableHidpi = true; - }; - desktopManager.plasma5 = { - enable = true; - useQtScaling = true; - }; - }; - - openssh = { - enable = true; - ports = [ 22 ]; - openFirewall = true; - allowSFTP = true; - settings = { - X11forwarding = true; - PermitRootLogin = "no"; - passwordAuthentication = true; - kbdInteractiveAuthentication = true; - }; - }; - }; - - programs.kdeconnect = { - enable = true; - package = pkgs.plasma5Packages.kdeconnect-kde; - }; - - xdg = { - sounds.enable = true; - mime.enable = true; - menus.enable = true; - icons.enable = true; - autostart.enable = true; - portal = { - enable = true; - extraPortals = with pkgs; [ xdg-desktop-portal ]; - }; - }; - - i18n = { - defaultLocale = "en_NZ.UTF-8"; - extraLocaleSettings = { - LC_ADDRESS = "de_DE.UTF-8"; - LC_IDENTIFICATION = "de_DE.UTF-8"; - LC_MEASUREMENT = "de_DE.UTF-8"; - LC_MONETARY = "de_DE.UTF-8"; - LC_NAME = "de_DE.UTF-8"; - LC_NUMERIC = "de_DE.UTF-8"; - LC_PAPER = "de_DE.UTF-8"; - LC_TELEPHONE = "de_DE.UTF-8"; - LC_TIME = "de_DE.UTF-8"; - LC_CTYPE = "de_DE.UTF-8"; - LC_COLLATE = "de_DE.UTF-8"; - LC_MESSAGES = "en_NZ.UTF-8"; - }; - }; - - hardware.steam-hardware.enable = true; - - programs.steam = { - enable = true; - remotePlay.openFirewall = true; - dedicatedServer.openFirewall = true; - }; - - environment.variables = { - # Enable icons in tooling since we have nerdfonts. - LOG_ICONS = "true"; - }; - - fonts.fontDir.enable = true; - - nix = { - package = cfg.package; - settings = { - substituters = [ - "https://cache.nixos.org" - "https://nix-community.cachix.org" - "https://prismlauncher.cachix.org" - "https://nixos-search.cachix.org" - ]; - trusted-public-keys = [ - "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "prismlauncher.cachix.org-1:GhJfjdP1RFKtFSH3gXTIQCvZwsb2cioisOf91y/bK0w=" - "nixos-search.cachix.org-1:1HV3YF8az4fywnH+pAd+CXFEdpTXtv9WpoivPi+H70o=" - ]; - trusted-users = [ "root" ]; - sandbox = true; - require-sigs = true; - max-jobs = "auto"; - auto-optimise-store = true; - allowed-users = [ "*" ]; - experimental-features = [ "nix-command" "flakes" ]; - warn-dirty = false; - }; - - # flake-utils-plus - generateRegistryFromInputs = true; - generateNixPathFromInputs = true; - linkInputs = true; - }; - - security.rtkit.enable = true; - hardware.bluetooth.enable = true; - hardware.bluetooth.powerOnBoot = true; - - services.pipewire = { - enable = true; - alsa = { - enable = true; - support32Bit = true; - }; - pulse.enable = true; - jack.enable = true; - - wireplumber.enable = true; - }; - - hardware.pulseaudio.enable = mkForce false; - - environment.systemPackages = with pkgs; [ - sshfs - deploy-rs - nixfmt - nix-index - nix-prefetch-git - nixpkgs-review - nurl - nix-init - ]; - - services.hardware.openrgb.enable = true; - - services.printing = { - enable = true; - webInterface = true; - drivers = with pkgs; [ hplipWithPlugin ]; - }; - - hardware = { - sane = { - enable = true; - extraBackends = with pkgs; [ sane-airscan hplipWithPlugin ]; - }; - }; - - services.avahi = { - enable = true; - nssmdns = true; - openFirewall = true; - }; - - users.users.jopejoe1 = { - isNormalUser = true; - description = "jopejoe1 🚫"; - initialPassword = "password"; - packages = with pkgs; [ - git - kate - libsForQt5.ark - libreoffice-qt - texlive.combined.scheme-full - tela-icon-theme - ]; - openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCUWMJyy2qq2aacVv/J5raugh7UKEmCs+JpagQh30mYqwLV9YQtOfZ+A3Q1qOOLPHTTciLydsfz8K2jBGXEv49uqz9P33aw63RzSaLdcnXhBJRmZvJ3AujLBKDIo24PLOVasogtu01eyQALTg4npX+qlti2UsxLY5O8E5paFJvJ+5rGE3/34c4xA9xthUm7G7SCSt4AhVXwPGB1tqz1KLqGdTJQhvy80laEDSV4tAYpiabmjhNFKGpf8T7afnw1MzKXz+ba6exBcGaJfy2Q24DLztZsW7fsTE1iCdkbcmos9/jUR6NooKFgDr0M4CL2TVZB5pECSiOev06GMnLt+vpxjFL29YeGMaVMmNCedkL1z1mftbXLEL7934kEK9FpEpSwzbRTJ7iPvfYZuTHiT6fi2Ep7n+zzRS+/ZgDUDLSqZYEBmE4dO4LgcqzOsJo5EgoyLGoqQ4OpvPRY12T3rCWUfEgOCXgToF0WlUyxCaPZCfvUjM4LXNlIy/dtivMxMs8= jopejoe1@yokai" - ]; - }; -} diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 1174bba..0000000 --- a/flake.lock +++ /dev/null @@ -1,593 +0,0 @@ -{ - "nodes": { - "agenix": { - "inputs": { - "darwin": [ - "nix-darwin" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1682101079, - "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=", - "owner": "ryantm", - "repo": "agenix", - "rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447", - "type": "github" - }, - "original": { - "owner": "ryantm", - "repo": "agenix", - "type": "github" - } - }, - "comma": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "naersk": [ - "naersk" - ], - "nixpkgs": [ - "nixpkgs" - ], - "utils": [ - "flake-utils" - ] - }, - "locked": { - "lastModified": 1680733215, - "narHash": "sha256-5HNH/Lqj8OU/piH3tvPRkINXHHkt6bRp0QYYR4xOybE=", - "owner": "nix-community", - "repo": "comma", - "rev": "ef97634016d17cc8cdea396ebcc002320494391a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "comma", - "type": "github" - } - }, - "deploy-rs": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "nixpkgs": [ - "nixpkgs" - ], - "utils": [ - "flake-utils" - ] - }, - "locked": { - "lastModified": 1683779844, - "narHash": "sha256-sIeOU0GsCeQEn5TpqE/jFRN4EGsPsjqVRsPdrzIDABM=", - "owner": "serokell", - "repo": "deploy-rs", - "rev": "c80189917086e43d49eece2bd86f56813500a0eb", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "deploy-rs", - "type": "github" - } - }, - "dns": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1635273082, - "narHash": "sha256-EHiDP2jEa7Ai5ZwIf5uld9RVFcV77+2SUxjQXwJsJa0=", - "owner": "kirelagin", - "repo": "dns.nix", - "rev": "c7b9645da9c0ddce4f9de4ef27ec01bb8108039a", - "type": "github" - }, - "original": { - "owner": "kirelagin", - "repo": "dns.nix", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils-plus": { - "inputs": { - "flake-utils": [ - "flake-utils" - ] - }, - "locked": { - "lastModified": 1657226504, - "narHash": "sha256-GIYNjuq4mJlFgqKsZ+YrgzWm0IpA4axA3MCrdKYj7gs=", - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "rev": "2bf0f91643c2e5ae38c1b26893ac2927ac9bd82a", - "type": "github" - }, - "original": { - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "type": "github" - } - }, - "flake-utils_2": { - "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "prismlauncher", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1683796878, - "narHash": "sha256-8y2RossxrzY/RthUj8vikfwQDp25XkWNi0lw2oEYVbc=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "fa720861b5b68536434360aa0ccf0a5fb9060a73", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "libnbtplusplus": { - "flake": false, - "locked": { - "lastModified": 1650031308, - "narHash": "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4=", - "owner": "PrismLauncher", - "repo": "libnbtplusplus", - "rev": "2203af7eeb48c45398139b583615134efd8d407f", - "type": "github" - }, - "original": { - "owner": "PrismLauncher", - "repo": "libnbtplusplus", - "type": "github" - } - }, - "naersk": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1679567394, - "narHash": "sha256-ZvLuzPeARDLiQUt6zSZFGOs+HZmE+3g4QURc8mkBsfM=", - "owner": "nix-community", - "repo": "naersk", - "rev": "88cd22380154a2c36799fe8098888f0f59861a15", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1683754942, - "narHash": "sha256-L+Bj8EL4XLmODRIuOkk9sI6FDECVzK+C8jeZFv7q6eY=", - "owner": "LnL7", - "repo": "nix-darwin", - "rev": "252541bd05a7f55f3704a3d014ad1badc1e3360d", - "type": "github" - }, - "original": { - "owner": "LnL7", - "repo": "nix-darwin", - "type": "github" - } - }, - "nix-vscode-extensions": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1683767603, - "narHash": "sha256-/m4uZXgQjtTmmfhgD60O6XsO9IYmN4kO6pnWMJ0FaP8=", - "owner": "nix-community", - "repo": "nix-vscode-extensions", - "rev": "5a2a367495acd16551f5fd3fac699259f51e69c2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-vscode-extensions", - "type": "github" - } - }, - "nixlib": { - "locked": { - "lastModified": 1681001314, - "narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixos-generators": { - "inputs": { - "nixlib": [ - "nixlib" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1683530131, - "narHash": "sha256-R0RSqj6JdZfru2x/cM19KJMHsU52OjtyxI5cccd+uFc=", - "owner": "nix-community", - "repo": "nixos-generators", - "rev": "10079333313ff62446e6f2b0e7c5231c7431d269", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-generators", - "type": "github" - } - }, - "nixos-hardware": { - "locked": { - "lastModified": 1683269598, - "narHash": "sha256-KNsb+nBbB1Fmxd07dt4E0KXMT4YeKJB7gQaA6Xfk+mo=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "51559e691f1493a26f94f1df1aaf516bb507e78b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixos-hardware", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1681845070, - "narHash": "sha256-XirizTKJ2wxkJuX1ldxKJ76W40nbybpAZljFpNeMChg=", - "owner": "AtaraxiaSjel", - "repo": "nixpkgs", - "rev": "706060e47d0808244bd33a27287cc53e21318666", - "type": "github" - }, - "original": { - "owner": "AtaraxiaSjel", - "ref": "update/ivpn", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1673800717, - "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nur": { - "locked": { - "lastModified": 1683797473, - "narHash": "sha256-FQ0Y8Z1HKdfJlyWSTcHMRYfFuh6HASd0StdtudlHtLk=", - "owner": "nix-community", - "repo": "NUR", - "rev": "dfd9b849697c4357ea62e45ef0a54ef42052ac35", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, - "peerix": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1661429880, - "narHash": "sha256-7/m468XZW82O7KhDtRdQ7RnPsh83+tA8N4U0FncFo1U=", - "owner": "cid-chan", - "repo": "peerix", - "rev": "32cd1b098b83c90726848bd6726f74e72c557abb", - "type": "github" - }, - "original": { - "owner": "cid-chan", - "repo": "peerix", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": [ - "prismlauncher", - "flake-utils" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "prismlauncher", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1678376203, - "narHash": "sha256-3tyYGyC8h7fBwncLZy5nCUjTJPrHbmNwp47LlNLOHSM=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "1a20b9708962096ec2481eeb2ddca29ed747770a", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "prismlauncher": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "flake-utils": "flake-utils_2", - "libnbtplusplus": [ - "libnbtplusplus" - ], - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1683359699, - "narHash": "sha256-Cb5C/4FySoopjJnqv67G5AQBRGUwSM+6BCDqizST1Mo=", - "owner": "PrismLauncher", - "repo": "PrismLauncher", - "rev": "ce5bb29c442cee3654c5f4287a999d5d6593032f", - "type": "github" - }, - "original": { - "owner": "PrismLauncher", - "repo": "PrismLauncher", - "type": "github" - } - }, - "root": { - "inputs": { - "agenix": "agenix", - "comma": "comma", - "deploy-rs": "deploy-rs", - "dns": "dns", - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "flake-utils-plus": "flake-utils-plus", - "home-manager": "home-manager", - "libnbtplusplus": "libnbtplusplus", - "naersk": "naersk", - "nix-darwin": "nix-darwin", - "nix-vscode-extensions": "nix-vscode-extensions", - "nixlib": "nixlib", - "nixos-generators": "nixos-generators", - "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", - "nur": "nur", - "peerix": "peerix", - "prismlauncher": "prismlauncher", - "snowfall-flake": "snowfall-flake", - "snowfall-lib": "snowfall-lib" - } - }, - "snowfall-flake": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "nixpkgs": [ - "nixpkgs" - ], - "snowfall-lib": [ - "snowfall-lib" - ], - "unstable": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1676352981, - "narHash": "sha256-4Avwfq71dSpVYSuQwxe9b+jbBOSjdm4qVEZcfyGivts=", - "owner": "snowfallorg", - "repo": "flake", - "rev": "ca46f77b9e42224ede87634d2d4d4ef90281fe21", - "type": "github" - }, - "original": { - "owner": "snowfallorg", - "repo": "flake", - "type": "github" - } - }, - "snowfall-lib": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "flake-utils-plus": [ - "flake-utils-plus" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1667153928, - "narHash": "sha256-SbXxxrxWzumig4ytez86B9FFkd9zH/qj+SSiMUwY8bI=", - "owner": "snowfallorg", - "repo": "lib", - "rev": "1ffe7109a0aade9df745432e1f5788cf67a05a3e", - "type": "github" - }, - "original": { - "owner": "snowfallorg", - "repo": "lib", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix index 5e535b9..dea5530 100644 --- a/flake.nix +++ b/flake.nix @@ -1,116 +1,45 @@ { + description = "jopejoe1 NixOS configuration"; + + nixConfig = { + experimental-features = [ "nix-command" "flakes" ]; + substituters = [ + "https://cache.nixos.org" + ]; + + extra-substituters = [ + "https://nix-community.cachix.org" + "https://prismlauncher.cachix.org" + "https://nixos-search.cachix.org" + ]; + + extra-trusted-public-keys = [ + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "prismlauncher.cachix.org-1:GhJfjdP1RFKtFSH3gXTIQCvZwsb2cioisOf91y/bK0w=" + "nixos-search.cachix.org-1:1HV3YF8az4fywnH+pAd+CXFEdpTXtv9WpoivPi+H70o=" + ]; + }; + inputs = { - # nixpkgs (Packges and modules) - nixpkgs.url = github:NixOS/nixpkgs;#/nixos-unstable; - #nixpkgs.url = github:jopejoe1/nixpkgs/noto-fonts; - - # Nix Hardware (Hardware configs) - nixos-hardware.url = github:NixOS/nixos-hardware; - - # NUR (User Packges) + nixpkgs.url = github:NixOS/nixpkgs; nur.url = github:nix-community/NUR; - - # Home Manger (Dot files) - home-manager = { + home-manager= { url = github:nix-community/home-manager; inputs.nixpkgs.follows = "nixpkgs"; }; - - # Nix Darwin (Mac OS support) - nix-darwin = { - url = github:LnL7/nix-darwin; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - # Image generators - nixos-generators = { - url = github:nix-community/nixos-generators; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.nixlib.follows = "nixlib"; - }; - - # PrismLauncher (git version of PrismLauncher) - prismlauncher = { - url = github:PrismLauncher/PrismLauncher; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-compat.follows = "flake-compat"; - inputs.libnbtplusplus.follows = "libnbtplusplus"; - }; - - # vscode extensions - nix-vscode-extensions = { - url = github:nix-community/nix-vscode-extensions; - inputs.flake-compat.follows = "flake-compat"; - inputs.flake-utils.follows = "flake-utils"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - peerix = { - url = github:cid-chan/peerix; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-compat.follows = "flake-compat"; - inputs.flake-utils.follows = "flake-utils"; - }; - - agenix = { - url = github:ryantm/agenix; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.darwin.follows = "nix-darwin"; - inputs.home-manager.follows = "home-manager"; - }; - - dns = { - url = github:kirelagin/dns.nix; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; - - # Dependcies - flake-compat = { - url = github:edolstra/flake-compat; - flake = false; - }; - - flake-utils.url = github:numtide/flake-utils; - nixlib.url = github:nix-community/nixpkgs.lib; - - libnbtplusplus = { - url = github:PrismLauncher/libnbtplusplus; - flake = false; - }; }; - outputs = { self, nixpkgs, nixos-hardware, prismlauncher, home-manager, nur, ... }@attrs: { - nixosConfigurations.yokai = nixpkgs.lib.nixosSystem { - system = "aarch64-linux"; - specialArgs = attrs; - modules = [ - ./systems/yokai/default.nix - ./common.nix - nixos-hardware.nixosModules.pine64-pinebook-pro - home-manager.nixosModules.home-manager - nur.nixosModules.nur - ]; - }; - nixosConfigurations.oni = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = attrs; - modules = [ - ./systems/oni/default.nix - ./common.nix - home-manager.nixosModules.home-manager - nur.nixosModules.nur - ]; - }; + outputs = inputs@{ + self, + nixpkgs, + home-manager, + ... + }: { nixosConfigurations.kami = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = attrs; - modules = [ - ./systems/kami/default.nix - ./common.nix - home-manager.nixosModules.home-manager - nur.nixosModules.nur - ]; + specialArgs = inputs; + modules = [ ./systems/kami ]; }; }; } diff --git a/home/jopejoe1.nix b/home/jopejoe1.nix deleted file mode 100644 index c773e59..0000000 --- a/home/jopejoe1.nix +++ /dev/null @@ -1,207 +0,0 @@ -{ options, config, pkgs, ... }: - -let - hcfg = config.home-manager.users.jopejoe1; -in -{ - home-manager.users.jopejoe1 = { - home = { - # Basic information for home-manager - username = "jopejoe1"; - homeDirectory = "/home/${hcfg.home.username}"; - - # Enviroment variables - sessionVariables = { - XCOMPOSECACHE = "${hcfg.xdg.cacheHome}/X11/xcompos"; - XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority"; - }; - - stateVersion = config.system.stateVersion; - }; - - accounts.email.accounts = { - main = { - address = "johannes@joens.email"; - flavor = "gmail.com"; - primary = true; - realName = "Johannes Joens"; - thunderbird.enable = true; - }; - }; - - # XDG base dirs - xdg = { - enable = true; - mime.enable = true; - cacheHome = "${hcfg.home.homeDirectory}/.cache"; - configHome = "${hcfg.home.homeDirectory}/.config"; - dataHome = "${hcfg.home.homeDirectory}/.local/share"; - stateHome = "${hcfg.home.homeDirectory}/.local/state"; - userDirs = { - enable = true; - createDirectories = false; - desktop = "${hcfg.home.homeDirectory}/Desktop"; - documents = "${hcfg.home.homeDirectory}/Documents"; - download = "${hcfg.home.homeDirectory}/Downloads"; - music = "${hcfg.home.homeDirectory}/Music"; - pictures = "${hcfg.home.homeDirectory}/Pictures"; - publicShare = "${hcfg.home.homeDirectory}/Public"; - templates = "${hcfg.home.homeDirectory}/Templates"; - videos = "${hcfg.home.homeDirectory}/Videos"; - }; - }; - programs = { - home-manager.enable = true; - git = { - enable = true; - package = pkgs.gitAndTools.gitFull; - userEmail = "johannes@joens.email"; - userName = "jopejoe1"; - }; - direnv = { - enable = true; - nix-direnv.enable = true; - }; - firefox = { - enable = true; - package = pkgs.wrapFirefox pkgs.firefox-devedition-unwrapped { - extraPolicies = { - AppAutoUpdate = false; - BackgroundAppUpdate = false; - CaptivePortal = false; - DefaultDownloadDirectory = "${hcfg.xdg.userDirs.download}"; - DisableAppUpdate = true; - DisableFirefoxAccounts = true; - DisableFirefoxStudies = true; - DisableForgetButton = true; - DisableFormHistory = true; - DisableMasterPasswordCreation = true; - DisablePasswordReveal = true; - DisablePocket = true; - DisableSetDesktopBackground = true; - DisableSystemAddonUpdate = true; - DisableTelemetry = true; - DontCheckDefaultBrowser = true; - ExtensionUpdate = false; - HardwareAcceleration = true; - ManualAppUpdateOnly = true; - NoDefaultBookmarks = true; - OfferToSaveLogins = false; - OfferToSaveLoginsDefault = false; - PasswordManagerEnabled = false; - PrimaryPassword = false; - SearchBar = "unified"; - StartDownloadsInTempDirectory = true; - EnableTrackingProtection = { - Value = true; - EmailTracking = true; - Cryptomining = true; - Fingerprinting = true; - Locked = true; - }; - FirefoxHome = { - Highlights = false; - Pocket = false; - Search = true; - Snippets = false; - SponsoredPocket = false; - SponsoredTopSites = false; - TopSites = true; - Locked = true; - }; - UserMessaging = { - ExtensionRecommendations = false; - SkipOnboarding = true; - }; - }; - }; - profiles = { - default = { - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ - ublock-origin - privacy-badger - bitwarden - clearurls - decentraleyes - duckduckgo-privacy-essentials - ghostery - libredirect - privacy-badger - languagetool - fastforward - return-youtube-dislikes - sponsorblock - augmented-steam - steam-database - refined-github - plasma-integration - bypass-paywalls-clean - lovely-forks - search-by-image - skip-redirect - terms-of-service-didnt-read - unpaywall - wappalyzer - wayback-machine - modrinthify - ]; - id = 0; - isDefault = true; - name = "default"; - search = { - default = "DuckDuckGo"; - force = true; - engines = { - "Nix Packages" = { - urls = [{ - template = "https://search.nixos.org/packages"; - params = [ - { name = "type"; value = "packages"; } - { name = "query"; value = "{searchTerms}"; } - ]; - }]; - icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - definedAliases = [ "@np" ]; - }; - "NixOS Wiki" = { - urls = [{ - template = "https://nixos.wiki/index.php"; - params = [ - { name = "search"; value = "{searchTerms}"; } - ]; - }]; - icon = "${hcfg.programs.firefox.profiles.default.search.engines."Nix Packages".icon}"; - definedAliases = [ "@nw" ]; - }; - "Bing".metaData.hidden = true; - "Google".metaData.hidden = true; - "eBay".metaData.hidden = true; - "Amazon.de".metaData.hidden = true; - "Wikipedia (en)".metaData.alias = "@wiki"; - }; - }; - settings = { - "privacy.resistFingerprinting" = true; - "privacy.trackingprotection.fingerprinting.enabled" = true; - "privacy.trackingprotection.cryptomining.enabled" = true; - "dom.event.clipboardevents.enabled" = false; - "dom.battery.enabled" = false; - "browser.safebrowsing.phishing.enabled" = false; - "browser.safebrowsing.malware.enabled" = false; - "browser.zoom.siteSpecific" = true; - "config.trim_on_minimize" = true; - "pdfjs.annotationEditorMode" = 0; - "pdfjs.annotationmode" = 2; - }; - }; - dev-edition-default = { - id = 1; - isDefault = false; - name = "dev-edition-default"; - path = "default"; - }; - }; - }; - }; - }; -} diff --git a/home/root.nix b/home/root.nix deleted file mode 100644 index 8cacc07..0000000 --- a/home/root.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ options, config, pkgs, ... }: - -let - hcfg = config.home-manager.users.root; -in -{ - config = mkIf cfg.enable { - home-manager.users.root = { - home = { - # Basic information for home-manager - username = "root"; - homeDirectory = "/${hcfg.home.username}"; - - # Enviroment variables - sessionVariables = { - XCOMPOSECACHE = "${hcfg.xdg.cacheHome}/X11/xcompos"; - XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority"; - }; - - stateVersion = config.system.stateVersion; - }; - - xdg = { - enable = true; - mime.enable = true; - cacheHome = "${hcfg.home.homeDirectory}/.cache"; - configHome = "${hcfg.home.homeDirectory}/.config"; - dataHome = "${hcfg.home.homeDirectory}/.local/share"; - stateHome = "${hcfg.home.homeDirectory}/.local/state"; - userDirs = { - enable = true; - createDirectories = false; - desktop = "${hcfg.home.homeDirectory}/Desktop"; - documents = "${hcfg.home.homeDirectory}/Documents"; - download = "${hcfg.home.homeDirectory}/Downloads"; - music = "${hcfg.home.homeDirectory}/Music"; - pictures = "${hcfg.home.homeDirectory}/Pictures"; - publicShare = "${hcfg.home.homeDirectory}/Public"; - templates = "${hcfg.home.homeDirectory}/Templates"; - videos = "${hcfg.home.homeDirectory}/Videos"; - }; - }; - - programs = { - home-manager.enable = true; - git = { - enable = true; - package = pkgs.gitAndTools.gitFull; - userEmail = "johannes@joens.email"; - userName = "jopejoe1"; - }; - bash = { - enable = true; - historyFile = "${hcfg.xdg.stateHome}/bash/history"; - shellAliases = { - gc = "nix store gc"; - rb = "git -C /etc/nixos pull && nix flake update /etc/nixos/ && sudo nixos-rebuild switch && git -C /etc/nixos add . && git -C /etc/nixos commit -m 'Updated flake.lock' && git -C /etc/nixos push"; - }; - }; - zsh.shellAliases = hcfg.programs.bash.shellAliases; - fish.shellAbbrs = hcfg.programs.bash.shellAliases; - }; - }; - }; -} diff --git a/systems/kami/hardware.nix b/systems/kami/hardware.nix index e4a01ca..912c534 100644 --- a/systems/kami/hardware.nix +++ b/systems/kami/hardware.nix @@ -1,18 +1,11 @@ # 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, inputs, ... }: +{ config, lib, pkgs, modulesPath, ... }: -let - inherit (inputs) nixos-hardware; -in { imports = with nixos-hardware.nixosModules; [ (modulesPath + "/installer/scan/not-detected.nix") - common-cpu-intel - common-gpu-nvidia - common-pc - common-pc-ssd ]; hardware.nvidia.prime = { diff --git a/systems/oni/default.nix b/systems/oni/default.nix deleted file mode 100644 index d5744c7..0000000 --- a/systems/oni/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ pkgs, config, lib, channel, ... }: - -with lib; -#with lib.internal; -{ - imports = [ ./hardware.nix ]; - - networking.networkmanager.enable = true; - networking.hostName = "oni"; - time.timeZone = "Europe/Berlin"; - hardware.opengl.enable = true; - - programs = { - dconf.enable = true; - droidcam.enable = true; - sysdig.enable = true; - xwayland.enable = true; - }; - - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.efi.efiSysMountPoint = "/boot/efi"; - - boot.loader.systemd-boot.configurationLimit = 10; - - # https://github.com/NixOS/nixpkgs/blob/c32c39d6f3b1fe6514598fa40ad2cf9ce22c3fb7/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix#L66 - boot.loader.systemd-boot.editor = false; -} diff --git a/systems/oni/hardware.nix b/systems/oni/hardware.nix deleted file mode 100644 index 0da55cb..0000000 --- a/systems/oni/hardware.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ config, lib, pkgs, modulesPath, inputs, ... }: - -let - inherit (inputs) nixos-hardware; -in -{ - imports = with nixos-hardware.nixosModules; [ - (modulesPath + "/installer/scan/not-detected.nix") - common-cpu-amd - common-gpu-amd - common-pc - common-pc-ssd - ]; - - boot = { - kernelPackages = pkgs.linuxPackages_zen; - - initrd = { - kernelModules = [ "amdgpu" ]; - availableKernelModules = [ "xhci_pci" "ahci" "ehci_pci" "usb_storage" "sd_mod" "sr_mod" ]; - }; - - extraModulePackages = [ ]; - }; - - fileSystems = { - "/" = { - device = "/dev/disk/by-uuid/c013c58e-540f-4547-b218-f7d34b07f7df"; - fsType = "ext4"; - }; - "/boot/efi" = { - device = "/dev/disk/by-uuid/F1C3-4668"; - fsType = "vfat"; - }; - }; - - swapDevices = [ { - device = "/dev/disk/by-uuid/8a721407-d8bc-4d2d-970a-7ff462107dc3"; - } ]; - - - # @NOTE(jakehamilton): NetworkManager will handle DHCP. - networking.interfaces.enp2s0.useDHCP = false; - networking.interfaces.wlp3s0.useDHCP = false; - - hardware.enableRedistributableFirmware = true; - - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/systems/yokai/default.nix b/systems/yokai/default.nix deleted file mode 100644 index c059e13..0000000 --- a/systems/yokai/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ pkgs, config, ... }: - -{ - imports = [ ./hardware.nix ]; - - networking.networkmanager.enable = true; - networking.hostName = "yokai"; - - time.timeZone = "Europe/Berlin"; - hardware.opengl.enable = true; - - programs = { - dconf.enable = true; - droidcam.enable = true; - xwayland.enable = true; - }; - - boot = { - # Boot loader configutation - loader = { - # Use the extlinux boot loader. (NixOS wants to enable GRUB by default) - grub.enable = false; - # Enables the generation of /boot/extlinux/extlinux.conf - generic-extlinux-compatible.enable = true; - systemd-boot.configurationLimit = 10; - }; -} diff --git a/systems/yokai/hardware.nix b/systems/yokai/hardware.nix deleted file mode 100644 index 1817c7f..0000000 --- a/systems/yokai/hardware.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ config, pkgs, modulesPath, ... }: - -{ - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot = { - kernelPackages = pkgs.linuxPackages_zen; - - initrd = { - availableKernelModules = [ "usbhid" ]; - }; - - extraModulePackages = [ ]; - }; - - fileSystems = { - "/" = { - device = "/dev/disk/by-label/NIXROOT"; - fsType = "ext4"; - }; - "/boot" = { - device = "/dev/disk/by-label/NIXBOOT"; - fsType = "vfat"; - }; - }; - - - swapDevices = [ { - device = "/var/lib/swapfile"; - size = (4*1024)+(2*1024); - } ]; - - hardware.enableRedistributableFirmware = true; -}