diff --git a/flake.lock b/flake.lock index 341499f..df4c399 100644 --- a/flake.lock +++ b/flake.lock @@ -1,212 +1,6 @@ { "nodes": { - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715486357, - "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1713612213, - "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "hyprcursor": "hyprcursor", - "hyprlang": "hyprlang", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs", - "systems": "systems", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1715468612, - "narHash": "sha256-AF5bXnJqS7sj9ioJ/X6g1vg91nM9rtpf4iMIdPLjrRc=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "33a7b7bb6b307d6e4a093f75ffdda0419cd7ffaf", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-plugins": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "systems": [ - "hyprland-plugins", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1715172513, - "narHash": "sha256-TjQ74AGpEgNx/+sM0VKnPAOlYEG22FUJ9+RwDDP/hoA=", - "owner": "hyprwm", - "repo": "hyprland-plugins", - "rev": "dcbdc9a08d1df753d6799bab823486f1fff5b8e6", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-plugins", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "xdph", - "nixpkgs" - ], - "systems": [ - "hyprland", - "xdph", - "systems" - ] - }, - "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1713121246, - "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1715287423, - "narHash": "sha256-B7AJIjOyWgVMKhu7DlOnWa0VprdhywUVHuB/j+EwSxM=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "e2fc1c0eb8b392110588f478cce644348ead7271", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "nixpkgs": { - "locked": { - "lastModified": 1715087517, - "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1715458492, - "narHash": "sha256-q0OFeZqKQaik2U8wwGDsELEkgoZMK7gvfF6tTXkpsqE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8e47858badee5594292921c2668c11004c3b0142", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1715266358, "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", @@ -224,77 +18,7 @@ }, "root": { "inputs": { - "home-manager": "home-manager", - "hyprland": "hyprland", - "hyprland-plugins": "hyprland-plugins", - "nixpkgs": "nixpkgs_2", - "sops-nix": "sops-nix" - } - }, - "sops-nix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1715482972, - "narHash": "sha256-y1uMzXNlrVOWYj1YNcsGYLm4TOC2aJrwoUY1NjQs9fM=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "b6cb5de2ce57acb10ecdaaf9bbd62a5ff24fa02e", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "sops-nix", - "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" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": "hyprland-protocols", - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1714662532, - "narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "1f228ba2f1f254195c0b571302b37482861abee3", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 18ae839..3ba88ee 100644 --- a/flake.nix +++ b/flake.nix @@ -4,21 +4,21 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - hyprland.url = "github:hyprwm/Hyprland"; - hyprland-plugins = { - url = "github:hyprwm/hyprland-plugins"; - inputs.hyprland.follows = "hyprland"; - }; + # hyprland.url = "github:hyprwm/Hyprland"; + # hyprland-plugins = { + # url = "github:hyprwm/hyprland-plugins"; + # inputs.hyprland.follows = "hyprland"; + # }; - sops-nix = { - url = "github:Mic92/sops-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # sops-nix = { + # url = "github:Mic92/sops-nix"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # home-manager = { + # url = "github:nix-community/home-manager"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; }; outputs = { @@ -37,7 +37,7 @@ system.configurationRevision = self.lastModifiedDate; }) ./hosts/default/configuration.nix - inputs.home-manager.nixosModules.default + # inputs.home-manager.nixosModules.default ]; }; }; diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 30db2d4..f13332e 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -6,14 +6,24 @@ pkgs, inputs, ... -}: { +}: let + home-manager = builtins.fetchTarball { + url = "https://github.com/nix-community/home-manager/archive/master.tar.gz"; + sha256 = "0bhwgi7mjrngv1fyv8cl0iwqkn1al7dj65rbw1b6wffrq776x572"; + }; + sops = builtins.fetchTarball { + url = "https://github.com/Mic92/sops-nix/archive/master.tar.gz"; + sha256 = "1wzm5hs3cda6l7q9ls5nw16bifb00v5kan1xcab57bb5fg6qqnyb"; + }; +in { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - inputs.home-manager.nixosModules.default - + # inputs.home-manager.nixosModules.default + (import "${home-manager}/nixos") + (import "${sops}/modules/sops") # Secrets Manager - inputs.sops-nix.nixosModules.sops + # inputs.sops-nix.nixosModules.sops ]; sops.validateSopsFiles = false; @@ -114,6 +124,14 @@ ]; programs = { + # home-manager = { + # enable = true; + # }; + + # sops-nix = { + # enable = true; + # }; + steam = { enable = true; }; diff --git a/nixos-switch.log b/nixos-switch.log index 88758b4..0fdab38 100644 --- a/nixos-switch.log +++ b/nixos-switch.log @@ -1,2 +1,21 @@ building the system configuration... warning: Git tree '/etc/nixos' is dirty +these 18 derivations will be built: + /nix/store/p2mii7339mdzyhag4j8aagb5s65vrdjw-nixos-version.drv + /nix/store/a1y6yhslcq22mzppfl52v6i2hm3kl35d-system-path.drv + /nix/store/1xb5ppq4gmawds33yham45j6dryviavs-dbus-1.drv + /nix/store/djp4g9j80lay8rm7v6x4xvay99fl4bsi-etc-pam-environment.drv + /nix/store/i6mkwfapfyl3bl641wigg7wdi17czr5f-X-Restart-Triggers-dbus.drv + /nix/store/bj42hi6vj1nsgq2ii4qb4cx20kxamify-unit-dbus.service.drv + /nix/store/f3yqvzmmj1m9xnjb78xgpjz44yarg9vs-user-units.drv + /nix/store/qhsg5dbzhzjz2i2jkgp5lp6svdf34c23-set-environment.drv + /nix/store/q9g74j9a5qnmmr3b4lhrmc05cbx8490w-etc-profile.drv + /nix/store/86m52xgizinbwcx2xfh5z6plfxxi7fpl-unit-dbus.service.drv + /nix/store/c3vz0k0s1gzvs1l79yw225px2cr2ja5p-unit-home-manager-root.service.drv + /nix/store/cj40jri980wf7dw71lngq9g1g12spgzs-unit-accounts-daemon.service.drv + /nix/store/8npl4dnqq70aqwvz9jl1agyzrnx5rcv4-X-Restart-Triggers-polkit.drv + /nix/store/ljmaz0krqhji8hvz706v18qi5ard3l4a-unit-polkit.service.drv + /nix/store/s9c5qkb9wr57mb5pwmxmvfyy5lslhfwc-unit-home-manager-itsscb.service.drv + /nix/store/xg5b7v0ib84j559sxpff7y3z0ydpdw09-system-units.drv + /nix/store/7cabla1rgkh95qb9b2v7pvhlgsbfr1jm-etc.drv + /nix/store/m8k3s40fifzswnj10j9wrkrm99v8lvf4-nixos-system-scbnb-24.05.20240509.f1010e0.drv