diff --git a/flake.lock b/flake.lock index 58a3262..3080d80 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1626960455, - "narHash": "sha256-N3+qOtsADo59UcG8PxqNMhT94wqTQ73k08gpy1dLaWU=", + "lastModified": 1627822587, + "narHash": "sha256-AAFgsVe/ahLh1Ij2o98x6IMxz3Z+Tr97bFwa4nthB1w=", "owner": "ryantm", "repo": "agenix", - "rev": "fb00f178b3a49a39cc964049075439b575d36d60", + "rev": "e6752e7b8592502df42066f156165471e62d902d", "type": "github" }, "original": { @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1626840404, - "narHash": "sha256-6HKRxPlVO4iKyPNAjkjku3JzGX1lgJ+93ieWAx7MY60=", + "lastModified": 1627447597, + "narHash": "sha256-e7q4jCq7MPHTa0HKxX5fJS1JwZ33BN9WohWUy6sOOgA=", "owner": "divnix", "repo": "bud", - "rev": "452ec18574b6e4d8b8a6aae9e190255d4c89768c", + "rev": "231fa20ed93944e5b484cb5d820c60c17f4dfc35", "type": "github" }, "original": { @@ -171,11 +171,11 @@ ] }, "locked": { - "lastModified": 1627072303, - "narHash": "sha256-XMrOWqYLLMVcTiTzzgaugUUSqlIRj3/l4JGrs1cvgMU=", + "lastModified": 1627484795, + "narHash": "sha256-ZnErne4CWPxN3G6jwEzSeTD++iIXdRa9+5ZTp2IuOQ0=", "owner": "divnix", "repo": "digga", - "rev": "cba3f8f76b7fd6816625d9e2e033bfa3462d7125", + "rev": "b52bb1001950eae6aca993232c1a88d0638b1dcf", "type": "github" }, "original": { @@ -263,11 +263,11 @@ ] }, "locked": { - "lastModified": 1627315633, - "narHash": "sha256-npaWU9f8/qcJjMURUYyp23ymiYZ+J+aP30GvPpYVryM=", + "lastModified": 1627836444, + "narHash": "sha256-hVH2FFoe1F+sAdnN9TXIpwZg9a5Saf0vmPINnCuSmYU=", "owner": "helix-editor", "repo": "helix", - "rev": "88d6f652390922b389667f469b6d308db569bdaf", + "rev": "ef6a2317b77af8faea15d41ff25553e7482f23f6", "type": "github" }, "original": { @@ -283,37 +283,41 @@ ] }, "locked": { - "lastModified": 1627079826, - "narHash": "sha256-+Bz7GgiWMm9aTuZ0fvYp4Tc4wVaN4Z7IwFS2IMJw7XA=", + "lastModified": 1627649712, + "narHash": "sha256-AJBasvMKpsyJmCLdjroBElCHY5AlalbVy+XY5vjbgXc=", "owner": "nix-community", "repo": "home-manager", - "rev": "996b43973969b3453e23dd06d2fc19765fb31e9d", + "rev": "b39647e52ed3c0b989e9d5c965e598ae4c38d7ef", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", + "ref": "release-21.05", "repo": "home-manager", "type": "github" } }, "latest": { "locked": { - "lastModified": 1626046891, - "narHash": "sha256-Zt8saH+hAehXskW0iFAzk+iMillYoFBxvLReYNqGT9E=", - "path": "/nix/store/hv23pdsi6n7z96pkljv25lfrfh1mnzz7-source", - "rev": "d8f8f31af9d77a48220e4e8a301d1e79774cb7d2", - "type": "path" + "lastModified": 1627391865, + "narHash": "sha256-tPoWBO9Nzu3wuX37WcnctzL6LoDCErJLnfLGqqmXCm4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8ecc61c91a596df7d3293603a9c2384190c1b89a", + "type": "github" }, "original": { "id": "nixpkgs", + "ref": "nixos-unstable", "type": "indirect" } }, "naersk": { "inputs": { "nixpkgs": [ - "latest" + "digga", + "deploy", + "nixpkgs" ] }, "locked": { @@ -376,16 +380,16 @@ }, "nixos": { "locked": { - "lastModified": 1627149512, - "narHash": "sha256-9vgq2jatom+9K2+pBp/XJGveHXoXh57b7XR8KV+HZkw=", + "lastModified": 1627805549, + "narHash": "sha256-+LHhcpzw6vAxF6q0VSLkZSEGpDC02JN21KM8eUWz+is=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26edbe155b550a54714a8bc727c176362aa5f4f5", + "rev": "16bf3980bfa0d8929639be93fa8491ebad9d61ec", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "master", + "ref": "release-21.05", "type": "indirect" } }, @@ -416,11 +420,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1625333638, - "narHash": "sha256-M6J9RN60XJyv6nUfDFCwnz5aVjhe8+GJnV8Q9VpdQQQ=", + "lastModified": 1627666012, + "narHash": "sha256-Dx93VcfFwFlUex2Me4i+lS2IFwNrSVEvTvZuP/vmmXQ=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "41775780a0b6b32b3d32dcc32bb9bc6df809062d", + "rev": "09ed30ff3bb67f5efe9c77e0d79aca01793526ca", "type": "github" }, "original": { @@ -452,11 +456,11 @@ ] }, "locked": { - "lastModified": 1626505081, - "narHash": "sha256-dcKU/hs4EIJIJu5nNqtX169nw+eHT6lIrNmOvg/Io4s=", + "lastModified": 1627818574, + "narHash": "sha256-52Z2FQW3u9JxNaSTDLQMNM9NdAssyVunBHRBYgBO7ug=", "owner": "colemickens", "repo": "nixpkgs-wayland", - "rev": "fd3be17ace1aa22ed6b1d0bd01a979deb098cbbd", + "rev": "883e4964f3ced728b1faff18853676a02374f8cb", "type": "github" }, "original": { @@ -495,11 +499,11 @@ ] }, "locked": { - "lastModified": 1627126476, - "narHash": "sha256-WvUITmKad4aqtSgICVgwpasrCcAd5yrdCF+27Hz4+bw=", + "lastModified": 1627523399, + "narHash": "sha256-j9CgnUQpWcb8OB4LRzPW8BdxvmoROJptgptDlPA8Heo=", "owner": "berberman", "repo": "nvfetcher", - "rev": "5a44a2b0675108d1abd0c8c820b20593b65c9512", + "rev": "fb8f2cc770ad3dd3e29d7ba3004692d4d53fba9b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 614740b..07338ac 100644 --- a/flake.nix +++ b/flake.nix @@ -3,8 +3,8 @@ inputs = { - nixos.url = "nixpkgs/master"; - latest.url = "nixpkgs"; + nixos.url = "nixpkgs/release-21.05"; + latest.url = "nixpkgs/nixos-unstable"; digga.url = "github:divnix/digga/main"; digga.inputs.nixpkgs.follows = "nixos"; @@ -15,7 +15,7 @@ bud.inputs.nixpkgs.follows = "nixos"; bud.inputs.devshell.follows = "digga/devshell"; - home.url = "github:nix-community/home-manager/master"; + home.url = "github:nix-community/home-manager/release-21.05"; home.inputs.nixpkgs.follows = "nixos"; darwin.url = "github:LnL7/nix-darwin"; diff --git a/overlays/overrides.nix b/overlays/overrides.nix index 851a697..56ab098 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -10,7 +10,14 @@ channels: final: prev: { nixpkgs-fmt qutebrowser signal-desktop - starship; + starship + hydrus + steam + steam-run + lutris + rust-analyzer + vscodium + vscode; haskellPackages = prev.haskellPackages.override diff --git a/users/patriot/default.nix b/users/patriot/default.nix index d554352..dbfab56 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -7,7 +7,6 @@ let nixosConfig = config; in { - users.users.patriot = { isNormalUser = true; createHome = true; @@ -23,7 +22,6 @@ in xdg.portal = { enable = true; gtkUsePortal = true; - wlr.enable = true; extraPortals = with pkgs; [ xdg-desktop-portal xdg-desktop-portal-gtk @@ -353,7 +351,6 @@ in # Font stuff fontPackage noto-fonts-cjk - noto-fonts-emoji-blob-bin font-awesome dejavu_fonts (nerdfonts.override { fonts = [ "Iosevka" ]; })