qenya/nixfiles
1
0
Fork 0
Code Issues 4 Pull requests Actions Activity

Compare commits

base: qenya:8b04d9039ec1cc7782c8adfb11d15121e550bbfd
Branches Tags
qenya:main
qenya:flakes
qenya:lix
qenya:multihost
...
compare: qenya:309e44aa8a5e2e3f2821bfd61398414d37f4b426
Branches Tags
qenya:main
qenya:flakes
qenya:lix
qenya:multihost

3 commits
8b04d9039e ... 309e44aa8a

Author SHA1 Message Date
Katherina Walshe-Grey 309e44aa8a flake.nix: rationalise nixpkgs versions 2024-09-26 13:40:33 +01:00
Katherina Walshe-Grey 3fc692f0c2 flake.lock: Update 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/23cbb250f3bf4f516a2d0bf03c51a30900848075' (2024-09-22)
  → 'github:NixOS/nixpkgs/759537f06e6999e141588ff1c9be7f3a5c060106' (2024-09-25)
• Updated input 'nixpkgsSmall':
    'github:NixOS/nixpkgs/7ca0f93c530406c1610defff0b9bf643333cf992' (2024-09-23)
  → 'github:NixOS/nixpkgs/37df9bcf93431c7f9f9358aec2d7ed0a52d7ba1d' (2024-09-25)
• Updated input 'nur':
    'github:nix-community/NUR/0d7209843407825066ccf9743c40d50b6d68674f' (2024-09-24)
  → 'github:nix-community/NUR/936785778bca86332d6b201dda67a38585cab885' (2024-09-26)
• Updated input 'plasma-manager':
    'github:nix-community/plasma-manager/6f1db348fcb89fd6b0b9c32e279d29ee6b4d1272' (2024-09-22)
  → 'github:nix-community/plasma-manager/a02fef2ece8084aff0b41700bb57d24d73574cd1' (2024-09-24)
• Updated input 'randomcat':
    'github:randomnetcat/nix-configs/2a6bd13e96db07e2e904fcc1b93faf5484725c91' (2024-09-24)
  → 'github:randomnetcat/nix-configs/7458a718acedf2590cbfc212e7070afdd3b8c4dc' (2024-09-26)
 2024-09-26 12:48:03 +01:00
Katherina Walshe-Grey 7ce034f2d0 flake.nix: only expose self to nixos modules, not all inputs 2024-09-26 12:36:09 +01:00
3 changed files with 117 additions and 63 deletions
Show stats Expand all files Collapse all files

4
common/users/qenya.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, inputs, ... }:
{ config, lib, pkgs, self, ... }:
let keys = import ../../keys.nix;
in {
@ -12,5 +12,5 @@ in {
programs.zsh.enable = true;
home-manager.users."qenya" = inputs.self.homeManagerModules."qenya";
home-manager.users."qenya" = self.homeManagerModules."qenya";
}

139
flake.lock
View file

@ -2,7 +2,9 @@
"nodes": {
"actual": {
"inputs": {
"nixpkgs": "nixpkgs"
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1725392458,
@ -133,6 +135,26 @@
"type": "github"
}
},
"home-manager-unstable": {
"inputs": {
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1727346017,
"narHash": "sha256-z7OCFXXxIseJhEHiCkkUOkYxD9jtLU8Kf5Q9WC0SjJ8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c124568e1054a62c20fbe036155cc99237633327",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_2": {
"inputs": {
"nixpkgs": [
@ -156,43 +178,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1725103162,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
"lastModified": 1727264057,
"narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgsSmall": {
"locked": {
"lastModified": 1727076372,
"narHash": "sha256-gXIWudYhY/4LjQPvrGn9lN4fbHjw/mf1mb9KKJK//4I=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7ca0f93c530406c1610defff0b9bf643333cf992",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1726969270,
"narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "23cbb250f3bf4f516a2d0bf03c51a30900848075",
"rev": "759537f06e6999e141588ff1c9be7f3a5c060106",
"type": "github"
},
"original": {
@ -202,13 +192,61 @@
"type": "github"
}
},
"nixpkgs-small": {
"locked": {
"lastModified": 1727284797,
"narHash": "sha256-roj2jFZ/VNBQBBmUvvYRGiWbegZEgRk9Y1dhcY8kgLA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "37df9bcf93431c7f9f9358aec2d7ed0a52d7ba1d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1727122398,
"narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable-small": {
"locked": {
"lastModified": 1727320268,
"narHash": "sha256-B4AK91+9frHerQ6mFAtaR46ECMRtZufrtXFj/b5NqYU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ea2838e1ce0a9da2abf88275843aca29d9f82b30",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 1727141325,
"narHash": "sha256-oqM2LaC0RLXgKZmFpj+aFM8qf5Iw9ilMJPWGZbGdTAk=",
"lastModified": 1727348207,
"narHash": "sha256-PvgB7Wolpm8Q20Hquz1j/xXK7MuN6REVmt6jxpvRUwU=",
"owner": "nix-community",
"repo": "NUR",
"rev": "0d7209843407825066ccf9743c40d50b6d68674f",
"rev": "936785778bca86332d6b201dda67a38585cab885",
"type": "github"
},
"original": {
@ -220,18 +258,18 @@
"plasma-manager": {
"inputs": {
"home-manager": [
"home-manager"
"home-manager-unstable"
],
"nixpkgs": [
"nixpkgs"
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1727020652,
"narHash": "sha256-zwTXt1bcf+wycX389ZyJFzUO2gzCb16ButXxiX2iA7Y=",
"lastModified": 1727210241,
"narHash": "sha256-lufS6uzSbSrggNCSgubymMQWnQMh7PvQ+lRZ8qH9Uoc=",
"owner": "nix-community",
"repo": "plasma-manager",
"rev": "6f1db348fcb89fd6b0b9c32e279d29ee6b4d1272",
"rev": "a02fef2ece8084aff0b41700bb57d24d73574cd1",
"type": "github"
},
"original": {
@ -243,11 +281,11 @@
"randomcat": {
"flake": false,
"locked": {
"lastModified": 1727143958,
"narHash": "sha256-W2DK8AehT9Q5IaYWzUuUYyVRSvu3DdHwr8ioWJluUD8=",
"lastModified": 1727310986,
"narHash": "sha256-Vo+sWtfO053kPKY6F4X0LkU0yris25F5AVRMvCyI9Lw=",
"owner": "randomnetcat",
"repo": "nix-configs",
"rev": "2a6bd13e96db07e2e904fcc1b93faf5484725c91",
"rev": "7458a718acedf2590cbfc212e7070afdd3b8c4dc",
"type": "github"
},
"original": {
@ -263,8 +301,11 @@
"birdsong": "birdsong",
"colmena": "colmena",
"home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_2",
"nixpkgsSmall": "nixpkgsSmall",
"home-manager-unstable": "home-manager-unstable",
"nixpkgs": "nixpkgs",
"nixpkgs-small": "nixpkgs-small",
"nixpkgs-unstable": "nixpkgs-unstable",
"nixpkgs-unstable-small": "nixpkgs-unstable-small",
"nur": "nur",
"plasma-manager": "plasma-manager",
"randomcat": "randomcat"

37
flake.nix
View file

@ -1,20 +1,27 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgsSmall.url = "github:NixOS/nixpkgs/nixos-24.05-small";
nixpkgs-small.url = "github:NixOS/nixpkgs/nixos-24.05-small";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-unstable-small.url = "github:NixOS/nixpkgs/nixos-unstable-small";
home-manager = {
url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs";
};
plasma-manager = {
url = "github:nix-community/plasma-manager";
inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager";
home-manager-unstable = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
plasma-manager = {
url = "github:nix-community/plasma-manager";
inputs.nixpkgs.follows = "nixpkgs-unstable";
inputs.home-manager.follows = "home-manager-unstable";
};
# TODO: remove dependency on NUR (#16)
nur.url = "github:nix-community/NUR";
agenix = {
@ -33,11 +40,17 @@
flake = false;
};
actual.url = "git+https://git.xeno.science/xenofem/actual-nix?ref=main";
# Third-party flake providing package and NixOS module for Actual Budget as
# nixpkgs are having trouble: https://github.com/NixOS/nixpkgs/issues/269069
actual = {
url = "git+https://git.xeno.science/xenofem/actual-nix?ref=main";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
birdsong.url = "git+https://git.qenya.tel/qenya/birdsong?ref=main";
};
outputs = inputs@{ self, nixpkgs, nixpkgsSmall, home-manager, plasma-manager, nur, agenix, colmena, randomcat, actual, birdsong, ... }: {
outputs = inputs@{ self, nixpkgs, nixpkgs-small, home-manager, plasma-manager, nur, agenix, colmena, randomcat, actual, birdsong, ... }: {
nixosConfigurations = (colmena.lib.makeHive self.outputs.colmena).nodes;
# The name of this output type is not standardised. I have picked
@ -61,11 +74,11 @@
nodeNixpkgs = {
kilgharrah = import nixpkgs { system = "x86_64-linux"; };
tohru = import nixpkgs { system = "x86_64-linux"; };
yevaud = import nixpkgsSmall { system = "x86_64-linux"; };
orm = import nixpkgsSmall { system = "x86_64-linux"; };
kalessin = import nixpkgsSmall { system = "aarch64-linux"; };
yevaud = import nixpkgs-small { system = "x86_64-linux"; };
orm = import nixpkgs-small { system = "x86_64-linux"; };
kalessin = import nixpkgs-small { system = "aarch64-linux"; };
};
specialArgs = { inherit inputs; };
specialArgs = { inherit self; };
};
defaults = { config, lib, pkgs, ... }: {