teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

feat: switch to nixos-unstable

Browse source
This commit is contained in:
teutat3s 2023-11-12 19:06:07 +01:00
parent ac516f2349
commit f63a3e4dcc
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
8 changed files with 41 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
flake.lock
View file

@ -159,16 +159,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695108154, "lastModified": 1699783872,
"narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=", "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "07682fff75d41f18327a871088d20af2710d4744", "rev": "280721186ab75a76537713ec310306f0eba3e407",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -226,6 +225,22 @@
"type": "github" "type": "github"
} }
}, },
"nixos-23-05": {
"locked": {
"lastModified": 1699596684,
"narHash": "sha256-XSXP8zjBZJBVvpNb2WmY0eW8O2ce+sVyj1T0/iBRIvg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "da4024d0ead5d7820f6bd15147d3fe2a0c0cec73",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixos-flake": { "nixos-flake": {
"locked": { "locked": {
"lastModified": 1698598244, "lastModified": 1698598244,
@ -258,16 +273,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1699291058, "lastModified": 1699099776,
"narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=", "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "41de143fda10e33be0f47eab2bfe08a50f234267", "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-23.05", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -317,6 +332,7 @@
"master": "master", "master": "master",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixos-22-05": "nixos-22-05", "nixos-22-05": "nixos-22-05",
"nixos-23-05": "nixos-23-05",
"nixos-flake": "nixos-flake", "nixos-flake": "nixos-flake",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",

5
flake.nix
View file

@ -6,7 +6,8 @@
inputs = { inputs = {
# Track channels with commits tested and built by hydra # Track channels with commits tested and built by hydra
nixos-22-05.url = "github:nixos/nixpkgs/nixos-22.05"; nixos-22-05.url = "github:nixos/nixpkgs/nixos-22.05";
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; nixos-23-05.url = "github:nixos/nixpkgs/nixos-23.05";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
unstable.url = "github:nixos/nixpkgs/nixos-unstable"; unstable.url = "github:nixos/nixpkgs/nixos-unstable";
master.url = "github:nixos/nixpkgs/master"; master.url = "github:nixos/nixpkgs/master";
@ -18,7 +19,7 @@
nix-darwin.url = "github:lnl7/nix-darwin/master"; nix-darwin.url = "github:lnl7/nix-darwin/master";
nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager/release-23.05"; home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";

4
modules/desktop-extended/default.nix
View file

@ -30,11 +30,11 @@ in {
]; ];
fonts = { fonts = {
fonts = with pkgs; [ packages = with pkgs; [
dejavu_fonts dejavu_fonts
fira-code fira-code
fira-code-symbols fira-code-symbols
google-fonts #google-fonts
lato lato
montserrat montserrat
nerdfonts nerdfonts

4
modules/graphical/default.nix
View file

@ -73,11 +73,11 @@ in {
services.yubikey-agent.enable = true; services.yubikey-agent.enable = true;
fonts = { fonts = {
fonts = with pkgs; [ packages = with pkgs; [
dejavu_fonts dejavu_fonts
powerline-fonts powerline-fonts
]; ];
enableDefaultFonts = true; enableDefaultPackages = true;
fontconfig.enable = true; fontconfig.enable = true;
fontconfig.defaultFonts = { fontconfig.defaultFonts = {
monospace = ["DejaVu Sans Mono for Powerline"]; monospace = ["DejaVu Sans Mono for Powerline"];

4
modules/terminal-life/bash/default.nix
View file

@ -100,8 +100,8 @@ in {
vi = "nvim"; vi = "nvim";
vim = "nvim"; vim = "nvim";
mutt = "neomutt"; mutt = "neomutt";
ls = "exa"; ls = "eza";
la = "exa --group-directories-first -lag"; la = "eza --group-directories-first -lag";
wget = "wget --hsts-file=$XDG_CACHE_HOME/wget-hsts"; wget = "wget --hsts-file=$XDG_CACHE_HOME/wget-hsts";
irssi = "irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_DATA_HOME/irssi"; irssi = "irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_DATA_HOME/irssi";
drone = "DRONE_TOKEN=$(secret-tool lookup drone token) drone"; drone = "DRONE_TOKEN=$(secret-tool lookup drone token) drone";

2
modules/terminal-life/default.nix
View file

@ -27,7 +27,7 @@ in {
asciinema asciinema
bat bat
blesh blesh
exa eza
fd fd
jump jump
(nnn.overrideAttrs (o: { (nnn.overrideAttrs (o: {

12
overlays/neovim-plugins.nix
View file

@ -2,22 +2,22 @@ final: prev: {
vimPlugins = vimPlugins =
prev.vimPlugins prev.vimPlugins
// { // {
instant-nvim-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix { instant-nvim-nvfetcher = prev.vimUtils.buildVimPlugin {
inherit (prev.sources.instant-nvim-nvfetcher) pname version src; inherit (prev.sources.instant-nvim-nvfetcher) pname version src;
}; };
vimagit-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix { vimagit-nvfetcher = prev.vimUtils.buildVimPlugin {
inherit (prev.sources.vimagit-nvfetcher) pname version src; inherit (prev.sources.vimagit-nvfetcher) pname version src;
}; };
vim-caddyfile-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix { vim-caddyfile-nvfetcher = prev.vimUtils.buildVimPlugin {
inherit (prev.sources.vim-caddyfile-nvfetcher) pname version src; inherit (prev.sources.vim-caddyfile-nvfetcher) pname version src;
}; };
vim-workspace-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix { vim-workspace-nvfetcher = prev.vimUtils.buildVimPlugin {
inherit (prev.sources.vim-workspace-nvfetcher) pname version src; inherit (prev.sources.vim-workspace-nvfetcher) pname version src;
}; };
vim-beautify-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix { vim-beautify-nvfetcher = prev.vimUtils.buildVimPlugin {
inherit (prev.sources.vim-beautify-nvfetcher) pname version src; inherit (prev.sources.vim-beautify-nvfetcher) pname version src;
}; };
vim-apprentice-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix { vim-apprentice-nvfetcher = prev.vimUtils.buildVimPlugin {
inherit (prev.sources.vim-apprentice-nvfetcher) pname version src; inherit (prev.sources.vim-apprentice-nvfetcher) pname version src;
}; };
}; };

2
users/teutat3s/home.nix
View file

@ -81,7 +81,7 @@ in {
complete -C ${pkgs.consul}/bin/consul consul complete -C ${pkgs.consul}/bin/consul consul
complete -C ${pkgs.nomad_1_4}/bin/nomad nomad complete -C ${pkgs.nomad_1_4}/bin/nomad nomad
complete -C ${pkgs.vault}/bin/vault vault complete -C ${pkgs.vault}/bin/vault vault
complete -C ${pkgs.terraform}/bin/terraform terraform complete -C ${flake.inputs.nixos-22-05.legacyPackages.${pkgs.system}.terraform}/bin/terraform terraform
complete -C ${pkgs.waypoint}/bin/waypoint waypoint complete -C ${pkgs.waypoint}/bin/waypoint waypoint
complete -C '${pkgs.awscli2}/bin/aws_completer' ${pkgs.awscli2}/bin/aws complete -C '${pkgs.awscli2}/bin/aws_completer' ${pkgs.awscli2}/bin/aws
''; '';