diff --git a/flake.lock b/flake.lock index e2a72a8..074c31f 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1710784390, - "narHash": "sha256-DaYRkYxkznDA+dvP9Qk9DoMQy6oowqe5KDi+DX1sPBA=", + "lastModified": 1710954445, + "narHash": "sha256-vU2OGteZS6dMKZcu+btwsNN4HxIwhEb8dzP+h5NgKps=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "ab818205cb4916ec49fb67f8940771c550ffb5bb", + "rev": "2952a351037582a8aeb11be9cf57901d872bcf30", "type": "github" }, "original": { @@ -113,11 +113,11 @@ ] }, "locked": { - "lastModified": 1710602287, - "narHash": "sha256-6hjHSfH3jfTDxD6hELL7RGoqv2pnyVAtS81H5Le6qkk=", + "lastModified": 1710821861, + "narHash": "sha256-Y+x3q7VkPpRok7Om2bwB2v1JDK/OCZmiFaBrIOJRojY=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "930bf3891c5a1279b23e16f3f10ce02c47b9b4cb", + "rev": "7809f0a6aee6900de59b720bf966d4a0315276bc", "type": "github" }, "original": { @@ -353,11 +353,11 @@ ] }, "locked": { - "lastModified": 1710820906, - "narHash": "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=", + "lastModified": 1710974515, + "narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=", "owner": "nix-community", "repo": "home-manager", - "rev": "022464438a85450abb23d93b91aa82e0addd71fb", + "rev": "1c2acec99933f9835cc7ad47e35303de92d923a4", "type": "github" }, "original": { @@ -390,11 +390,11 @@ ] }, "locked": { - "lastModified": 1710404304, - "narHash": "sha256-tYsUAsZgt9TT7d+r1KRYHWyBRWedJ39SXNBVSCQVsGQ=", + "lastModified": 1710915975, + "narHash": "sha256-yOc0AD6ba7mbialNciZGzuSQLMo4CopoZGEfcUugA4I=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "ffa51458aec4d53aac85b6dee1ee2ec29f4e953f", + "rev": "179d73fbe14c5bdb835d10bcc1c783466112bfa6", "type": "github" }, "original": { @@ -416,11 +416,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1710753783, - "narHash": "sha256-Av5QpYJvJYNefRCKhsOfSzTBaqQ2o+rj60/NVzGytOQ=", + "lastModified": 1710898409, + "narHash": "sha256-vk+NUeKBb8pyTkZvHVq7+or25fpnSeaaSBGHSGKXL44=", "owner": "martinvonz", "repo": "jj", - "rev": "54bb3b4114b1ee7fcd01e47553803f157c3635f5", + "rev": "4fbe6aecc95152eda44cb4b185ab369e23e1393f", "type": "github" }, "original": { @@ -480,11 +480,11 @@ ] }, "locked": { - "lastModified": 1710525749, - "narHash": "sha256-LpV/mJLeShTPecVQZnIAb9PTCGziuMuGOJQUeAb2u/w=", + "lastModified": 1710858553, + "narHash": "sha256-CHSkAhNaWIMXlJX7skC2t5wr/qaNlMgWQsezNqr15mw=", "owner": "YaLTeR", "repo": "niri", - "rev": "0c57815fbf47c69af9ed11fa8ebc1b52158a3ba2", + "rev": "db49deb7fd2fbe805ceec060aa4dec65009ad7a7", "type": "github" }, "original": { @@ -582,12 +582,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710631334, - "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", - "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", - "revCount": 598085, + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", + "revCount": 598982, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.598085%2Brev-c75037bbf9093a2acb617804ee46320d6d1fea5a/018e4cfd-3f0a-7531-8a72-60a3a8a3d087/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.598982%2Brev-b06025f1533a1e07b6db3e75151caa155d1c7eb3/018e577a-86bd-7b2f-b434-442e9ada5378/source.tar.gz" }, "original": { "type": "tarball", diff --git a/flake.nix b/flake.nix index 3d421c0..e46fdaa 100644 --- a/flake.nix +++ b/flake.nix @@ -46,6 +46,20 @@ ]; }; + # mac nix + "mac-nixos" = nixpkgs.lib.nixosSystem { + system = "aarch64-linux"; + modules = [ + ./hosts/mac-nixos/configuration.nix + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.matt = import ./hosts/mac-nixos/home.nix; + } + ]; + }; + # Pi4 "nixos-pi4" = nixpkgs.lib.nixosSystem { system = "aarch64-linux"; diff --git a/hosts/mac-nixos/configuration.nix b/hosts/mac-nixos/configuration.nix index 993c41e..1cb272d 100644 --- a/hosts/mac-nixos/configuration.nix +++ b/hosts/mac-nixos/configuration.nix @@ -36,14 +36,17 @@ xserver = { enable = true; + desktopManager.gnome.enable = true; + # Enable the Plasma 6 Desktop Environment. displayManager = { - sddm.enable = true; - defaultSession = "plasma"; + sddm.enable = false; + # defaultSession = "plasma"; + gdm.enable = true; }; }; - desktopManager.plasma6.enable = true; + desktopManager.plasma6.enable = false; # enable auto discovery of printers avahi = { diff --git a/hosts/mac-nixos/home.nix b/hosts/mac-nixos/home.nix new file mode 100644 index 0000000..d5a99ca --- /dev/null +++ b/hosts/mac-nixos/home.nix @@ -0,0 +1,36 @@ +{ pkgs, ... }: +{ + + home.username = "matt"; + home.homeDirectory = "/home/matt"; + home.stateVersion = "23.11"; + programs.home-manager.enable = true; + + programs = { + fish.enable = true; + java.enable = true; + }; + + programs.git = { + enable = true; + userName = "mjallen18"; + userEmail = "matt.l.jallen@gmail.com"; + aliases = { + co = "checkout"; + ci = "commit"; + cia = "commit --amend"; + s = "status"; + st = "status"; + b = "branch"; + # p = "pull --rebase"; + pu = "push"; + }; + }; + + programs.command-not-found.enable = true; + + home.packages = with pkgs; [ + nixfmt + deadnix + ]; +}