Tenatively upgrade main desktop to 22.05-staging
This commit is contained in:
parent
cad23c1600
commit
a8cae15240
|
@ -1,4 +1,4 @@
|
||||||
{ config, pkgs, unstable, doomEmacs, ... }:
|
{ config, pkgs, doomEmacs, ... }:
|
||||||
let
|
let
|
||||||
emacsPackage = (pkgs.emacsPackagesFor pkgs.emacsPgtkNativeComp).emacsWithPackages (epkgs: with epkgs; [
|
emacsPackage = (pkgs.emacsPackagesFor pkgs.emacsPgtkNativeComp).emacsWithPackages (epkgs: with epkgs; [
|
||||||
vterm
|
vterm
|
||||||
|
@ -10,7 +10,7 @@ in
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
emacsPackage
|
emacsPackage
|
||||||
# For markdown rendering
|
# For markdown rendering
|
||||||
pkgs.pythonPackages.grip
|
pkgs.python310Packages.grip
|
||||||
# For graph generation
|
# For graph generation
|
||||||
pkgs.graphviz
|
pkgs.graphviz
|
||||||
];
|
];
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
hunspell
|
hunspell
|
||||||
hunspellDicts.en-us
|
hunspellDicts.en-us
|
||||||
# Rust rewrites of common shell utilities
|
# Rust rewrites of common shell utilities
|
||||||
unstable.starship
|
starship
|
||||||
exa
|
exa
|
||||||
bat
|
bat
|
||||||
fd
|
fd
|
||||||
|
@ -32,7 +32,7 @@
|
||||||
# Command line file manager
|
# Command line file manager
|
||||||
broot
|
broot
|
||||||
# Much better curl
|
# Much better curl
|
||||||
unstable.httpie
|
httpie
|
||||||
# CLI spreadsheets
|
# CLI spreadsheets
|
||||||
visidata
|
visidata
|
||||||
# User friendly cut
|
# User friendly cut
|
||||||
|
|
17
flake.lock
17
flake.lock
|
@ -394,6 +394,22 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-staging": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1653437856,
|
||||||
|
"narHash": "sha256-ONO0zbEhvFjVIbIMnYsq0GjGrKSZuKjLqZhEw2Zqoh4=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "1774dcc1ca62f9deb31f776512e9482bcaf56192",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "staging-next-22.05",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1653060744,
|
"lastModified": 1653060744,
|
||||||
|
@ -586,6 +602,7 @@
|
||||||
"mozilla": "mozilla",
|
"mozilla": "mozilla",
|
||||||
"nix-doom-emacs": "nix-doom-emacs",
|
"nix-doom-emacs": "nix-doom-emacs",
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs_2",
|
||||||
|
"nixpkgs-staging": "nixpkgs-staging",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"polymc": "polymc",
|
"polymc": "polymc",
|
||||||
"sops-nix": "sops-nix"
|
"sops-nix": "sops-nix"
|
||||||
|
|
24
flake.nix
24
flake.nix
|
@ -4,6 +4,7 @@
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11";
|
||||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
|
nixpkgs-staging.url = "github:NixOS/nixpkgs/staging-next-22.05";
|
||||||
fenix = {
|
fenix = {
|
||||||
url = "github:nix-community/fenix";
|
url = "github:nix-community/fenix";
|
||||||
inputs.nixpgks.follows = "nixpkgs";
|
inputs.nixpgks.follows = "nixpkgs";
|
||||||
|
@ -39,7 +40,20 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, nixpkgs-unstable, fenix, emacs, mozilla, sops-nix, home-manager, darwin, polymc, nix-doom-emacs }:
|
outputs =
|
||||||
|
{ self
|
||||||
|
, nixpkgs
|
||||||
|
, nixpkgs-unstable
|
||||||
|
, nixpkgs-staging
|
||||||
|
, fenix
|
||||||
|
, emacs
|
||||||
|
, mozilla
|
||||||
|
, sops-nix
|
||||||
|
, home-manager
|
||||||
|
, darwin
|
||||||
|
, polymc
|
||||||
|
, nix-doom-emacs
|
||||||
|
}:
|
||||||
let
|
let
|
||||||
baseModules = [
|
baseModules = [
|
||||||
./applications/utils-core.nix
|
./applications/utils-core.nix
|
||||||
|
@ -64,7 +78,9 @@
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
# Setup overlays
|
# Setup overlays
|
||||||
nixpkgs.overlays = [ emacs.overlay ];
|
nixpkgs.overlays = [ emacs.overlay polymc.overlay ];
|
||||||
|
# System state version for compat
|
||||||
|
system.stateVersion = "21.11";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
sopsModules = [
|
sopsModules = [
|
||||||
|
@ -135,12 +151,12 @@
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
levitation = nixpkgs.lib.nixosSystem {
|
levitation = nixpkgs-staging.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
unstable = import nixpkgs-unstable {
|
unstable = import nixpkgs-unstable {
|
||||||
config = { allowUnfree = true; };
|
config = { allowUnfree = true; };
|
||||||
overlays = [ mozillaOverlay polymc.overlay ];
|
overlays = [ mozillaOverlay ];
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
};
|
};
|
||||||
fenix = fenix.packages.x86_64-linux;
|
fenix = fenix.packages.x86_64-linux;
|
||||||
|
|
2
home.nix
2
home.nix
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, config, unstable, ... }:
|
{ pkgs, config, ... }:
|
||||||
{
|
{
|
||||||
## Some general settings that were in the user configuration
|
## Some general settings that were in the user configuration
|
||||||
# Set time zone
|
# Set time zone
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
## Setup pipewire, including bluetooth audio
|
## Setup pipewire, including bluetooth audio
|
||||||
{ config, pkgs, unstable, ... }:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
# Disable normal audio subsystem explicitly
|
# Disable normal audio subsystem explicitly
|
||||||
sound.enable = false;
|
sound.enable = false;
|
||||||
|
@ -15,35 +15,6 @@
|
||||||
};
|
};
|
||||||
pulse.enable = true;
|
pulse.enable = true;
|
||||||
jack.enable = true;
|
jack.enable = true;
|
||||||
# Turn on the media session manager, and setup bluetooth
|
|
||||||
media-session = {
|
|
||||||
enable = true;
|
|
||||||
# Configure bluetooth support
|
|
||||||
config.bluez-monitor.rules = [
|
|
||||||
{
|
|
||||||
# Matches all cards
|
|
||||||
matches = [{ "device.name" = "~bluez_card.*"; }];
|
|
||||||
actions = {
|
|
||||||
"update-props" = {
|
|
||||||
"bluez5.reconnect-profiles" = [ "a2dp_sink" ];
|
|
||||||
# SBC-XQ is not expected to work on all headset + adapter combinations.
|
|
||||||
"bluez5.sbc-xq-support" = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
matches = [
|
|
||||||
# Matches all sources
|
|
||||||
{ "node.name" = "~bluez_input.*"; }
|
|
||||||
# Matches all outputs
|
|
||||||
{ "node.name" = "~bluez_output.*"; }
|
|
||||||
];
|
|
||||||
actions = {
|
|
||||||
"node.pause-on-idle" = false;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
# Turn on bluetooth services
|
# Turn on bluetooth services
|
||||||
services.blueman.enable = true;
|
services.blueman.enable = true;
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
{ config, pkgs, unstable, ... }:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
# Enable docker and use unstable version
|
# Enable docker and use unstable version
|
||||||
virtualisation.docker = {
|
virtualisation.docker = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = unstable.docker;
|
package = pkgs.docker;
|
||||||
# Automatically prune to keep things lean
|
# Automatically prune to keep things lean
|
||||||
autoPrune.enable = true;
|
autoPrune.enable = true;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
{ pkgs, unstable, ... }: {
|
{ pkgs, ... }: {
|
||||||
environment.systemPackages =
|
environment.systemPackages =
|
||||||
let
|
let
|
||||||
glfw-patched = unstable.glfw-wayland.overrideAttrs (attrs: {
|
glfw-patched = pkgs.glfw-wayland.overrideAttrs (attrs: {
|
||||||
patches = attrs.patches ++ [ ../patches/minecraft/0003-Don-t-crash-on-calls-to-focus-or-icon.patch ];
|
patches = attrs.patches ++ [ ../patches/minecraft/0003-Don-t-crash-on-calls-to-focus-or-icon.patch ];
|
||||||
});
|
});
|
||||||
in
|
in
|
||||||
with unstable; [
|
with pkgs; [
|
||||||
# Dwarf fortress
|
# Dwarf fortress
|
||||||
(pkgs.dwarf-fortress-packages.dwarf-fortress-full.override {
|
(dwarf-fortress-packages.dwarf-fortress-full.override {
|
||||||
enableFPS = true;
|
enableFPS = true;
|
||||||
})
|
})
|
||||||
# PolyMC minecraft stuff
|
# PolyMC minecraft stuff
|
||||||
|
|
|
@ -1,18 +1,23 @@
|
||||||
{ config, pkgs, unstable, ... }:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
nixpkgs.config.packageOverrides = pkgs: {
|
|
||||||
canon-cups-ufr2 = unstable.canon-cups-ufr2;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.printing = {
|
services.printing = {
|
||||||
enable = true;
|
enable = true;
|
||||||
drivers = [
|
drivers = with pkgs; [
|
||||||
pkgs.canon-cups-ufr2
|
canon-cups-ufr2
|
||||||
|
carps-cups
|
||||||
|
cnijfilter2
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Enable avahi for printer discovery
|
||||||
|
services.avahi = {
|
||||||
|
enable = true;
|
||||||
|
nssmdns = true;
|
||||||
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
canon-cups-ufr2
|
canon-cups-ufr2
|
||||||
cups
|
cups
|
||||||
|
cups-filters
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -61,7 +61,7 @@
|
||||||
# glib for sound stuff
|
# glib for sound stuff
|
||||||
glib
|
glib
|
||||||
# Glpaper for the background
|
# Glpaper for the background
|
||||||
glpaper
|
unstable.glpaper
|
||||||
# Screenshots
|
# Screenshots
|
||||||
sway-contrib.grimshot
|
sway-contrib.grimshot
|
||||||
# Albert for launcher
|
# Albert for launcher
|
||||||
|
|
Loading…
Reference in New Issue