artemist/nixos-config
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Switch to unstable

Browse source
This commit is contained in:
Artemis Tosini 2023-08-30 20:58:52 +00:00
parent 4ee7ec54cc
commit 563766b72c
Signed by: artemist
GPG key ID: ADFFE553DCBB831E
13 changed files with 36 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
flake.lock
View file

@ -117,16 +117,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1692099905, "lastModified": 1693399033,
"narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=", "narHash": "sha256-yXhiMo8MnE86sGtPIHAKaLHhmhe8v9tqGGotlUgKJvY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f", "rev": "f5c15668f9842dd4d5430787d6aa8a28a07f7c10",
"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"
} }
@ -175,16 +174,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1692986144, "lastModified": 1693377291,
"narHash": "sha256-M4VFpy7Av9j+33HF5nIGm0k2+DXXW4qSSKdidIKg5jY=", "narHash": "sha256-vYGY9bnqEeIncNarDZYhm6KdLKgXMS+HA2mTRaWEc80=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "74e5bdc5478ebbe7ba5849f0d765f92757bb9dbf", "rev": "e7f38be3775bab9659575f192ece011c033655f0",
"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"
} }
@ -205,22 +204,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1693003285,
"narHash": "sha256-5nm4yrEHKupjn62MibENtfqlP6pWcRTuSKrMiH9bLkc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5690c4271f2998c304a45c91a0aeb8fb69feaea7",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"pre-commit-hooks-nix": { "pre-commit-hooks-nix": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
@ -274,7 +257,6 @@
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"private": "private", "private": "private",
"rustybar": "rustybar", "rustybar": "rustybar",
"utils": "utils_2", "utils": "utils_2",

16
flake.nix
View file

@ -1,7 +1,6 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
utils.url = "github:numtide/flake-utils"; utils.url = "github:numtide/flake-utils";
@ -11,7 +10,7 @@
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.05"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -29,18 +28,11 @@
}; };
}; };
outputs = { self, nixpkgs, home-manager, private, nixpkgs-unstable, utils, ... outputs = { self, nixpkgs, home-manager, private, utils, ... }@inputs:
}@inputs:
let let
makeSystem = conf: makeSystem = conf:
nixpkgs.lib.nixosSystem (nixpkgs.lib.recursiveUpdate conf rec { nixpkgs.lib.nixosSystem (nixpkgs.lib.recursiveUpdate conf rec {
specialArgs = { specialArgs = { inherit inputs; };
inherit inputs;
pkgs-unstable = import nixpkgs-unstable {
config.allowUnfree = true;
system = conf.system;
};
};
modules = [ modules = [
private.nixosModules.base private.nixosModules.base
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager

4
home/neovim/default.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-unstable, ... }: { config, pkgs, ... }:
let let
lsp-colors = pkgs.vimUtils.buildVimPluginFrom2Nix { lsp-colors = pkgs.vimUtils.buildVimPluginFrom2Nix {
@ -53,7 +53,7 @@ in {
python3Packages.ipython python3Packages.ipython
python3Packages.pylint python3Packages.pylint
nodePackages.pyright nodePackages.pyright
pkgs-unstable.rust-analyzer rust-analyzer
rnix-lsp rnix-lsp
]; ];

4
sets/1password.nix
View file

@ -1,9 +1,9 @@
{ pkgs-unstable, ... }: { pkgs, ... }:
{ {
programs._1password-gui = { programs._1password-gui = {
enable = true; enable = true;
package = pkgs-unstable._1password-gui; package = pkgs._1password-gui;
polkitPolicyOwners = [ "artemis" ]; polkitPolicyOwners = [ "artemis" ];
}; };
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;

2
sets/base.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-unstable, lib, ... }: { config, pkgs, lib, ... }:
{ {
nix = { nix = {

4
sets/fonts.nix
View file

@ -3,8 +3,8 @@
{ {
fonts = { fonts = {
fontconfig.enable = true; fontconfig.enable = true;
enableDefaultFonts = true; enableDefaultPackages = true;
fonts = with pkgs; [ packages = with pkgs; [
# MS fonts # MS fonts
cantarell-fonts cantarell-fonts
corefonts corefonts

6
sets/hardware.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-unstable, ... }: { config, pkgs, ... }:
let jlink = pkgs.callPackage ../externals/packages/jlink { }; let jlink = pkgs.callPackage ../externals/packages/jlink { };
in { in {
services.udev.packages = [ services.udev.packages = [
@ -9,13 +9,13 @@ in {
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
pkgs-unstable.kicad kicad
openocd openocd
picocom picocom
stlink stlink
jlink jlink
platformio platformio
pkgs-unstable.proxmark3-rrg proxmark3-rrg
]; ];
users = { users = {

6
sets/packages.nix
View file

@ -1,7 +1,7 @@
{ config, pkgs, pkgs-unstable, lib, ... }: { { config, pkgs, lib, ... }: {
environment.systemPackages = (with pkgs; [ environment.systemPackages = (with pkgs; [
# Audiovisual # Audiovisual
pkgs-unstable.darktable darktable
exiftool exiftool
flac flac
lame lame
@ -125,6 +125,6 @@
# Wine and tools # Wine and tools
cabextract cabextract
samba samba
pkgs-unstable.wineWowPackages.waylandFull wineWowPackages.waylandFull
])); ]));
} }

10
sets/sway.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-unstable, ... }: { { config, pkgs, ... }: {
imports = [ ./fonts.nix ]; imports = [ ./fonts.nix ];
security.polkit.enable = true; security.polkit.enable = true;
services = { services = {
@ -23,13 +23,13 @@
waypipe waypipe
wf-recorder wf-recorder
wl-clipboard wl-clipboard
pkgs-unstable.wofi wofi
pkgs-unstable.wofi-emoji wofi-emoji
xdg-user-dirs xdg-user-dirs
xdg_utils xdg_utils
xsettingsd xsettingsd
pkgs-unstable.swaylock swaylock
pkgs-unstable.swayidle swayidle
]; ];
hardware.opengl.enable = true; hardware.opengl.enable = true;

5
sets/workstation.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-unstable, ... }: { config, pkgs, ... }:
{ {
imports = [ ./sway.nix ./packages.nix ./pipewire.nix ./base.nix ../home ]; imports = [ ./sway.nix ./packages.nix ./pipewire.nix ./base.nix ../home ];
@ -18,7 +18,6 @@
nssmdns = true; nssmdns = true;
}; };
flatpak.enable = true; flatpak.enable = true;
fwupd.enable = true;
pcscd.enable = true; pcscd.enable = true;
printing.enable = true; printing.enable = true;
udev.packages = [ (pkgs.callPackage ../externals/rules/uhk.nix { }) ]; udev.packages = [ (pkgs.callPackage ../externals/rules/uhk.nix { }) ];
@ -36,7 +35,5 @@
}; };
}; };
nixpkgs.overlays = [ (final: prev: { brscan5 = pkgs-unstable.brscan5; }) ];
users.users.artemis.extraGroups = [ "scanner" ]; users.users.artemis.extraGroups = [ "scanner" ];
} }

4
system/rainbowdash/boot-config.nix
View file

@ -1,8 +1,8 @@
{ config, pkgs, pkgs-unstable, ... }: { config, pkgs, ... }:
{ {
boot = { boot = {
kernelPackages = pkgs-unstable.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
kernel.sysctl."vm.swappiness" = 5; kernel.sysctl."vm.swappiness" = 5;
tmp.cleanOnBoot = true; tmp.cleanOnBoot = true;
blacklistedKernelModules = [ "psmouse" ]; blacklistedKernelModules = [ "psmouse" ];

4
system/spike/boot-config.nix
View file

@ -1,8 +1,8 @@
{ config, pkgs, pkgs-unstable, ... }: { config, pkgs, ... }:
{ {
boot = { boot = {
kernelPackages = pkgs-unstable.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
kernelParams = [ "fbcon=rotate:1" ]; kernelParams = [ "fbcon=rotate:1" ];
kernel.sysctl."vm.swappiness" = 5; kernel.sysctl."vm.swappiness" = 5;
tmp.cleanOnBoot = true; tmp.cleanOnBoot = true;

4
system/starlight/boot-config.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, pkgs-unstable, ... }: { config, pkgs, ... }:
let let
net_opts = [ net_opts = [
"x-systemd.automount" "x-systemd.automount"
@ -9,7 +9,7 @@ let
]; ];
in { in {
boot = { boot = {
kernelPackages = pkgs-unstable.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
kernel.sysctl."vm.swappiness" = 5; kernel.sysctl."vm.swappiness" = 5;
tmp.cleanOnBoot = true; tmp.cleanOnBoot = true;