switched to unstable and refactored

This commit is contained in:
willifan 2024-10-04 21:07:31 +02:00
parent 63cfb1c741
commit c8a3355599
12 changed files with 167 additions and 146 deletions

236
flake.lock generated
View file

@ -34,30 +34,14 @@
"type": "github"
}
},
"base16-foot": {
"flake": false,
"locked": {
"lastModified": 1696725948,
"narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
"owner": "tinted-theming",
"repo": "base16-foot",
"rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-foot",
"type": "github"
}
},
"base16-helix": {
"flake": false,
"locked": {
"lastModified": 1696727917,
"narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=",
"lastModified": 1725860795,
"narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=",
"owner": "tinted-theming",
"repo": "base16-helix",
"rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb",
"rev": "7f795bf75d38e0eea9fed287264067ca187b88a9",
"type": "github"
},
"original": {
@ -66,50 +50,18 @@
"type": "github"
}
},
"base16-kitty": {
"flake": false,
"locked": {
"lastModified": 1665001328,
"narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=",
"owner": "kdrag0n",
"repo": "base16-kitty",
"rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805",
"type": "github"
},
"original": {
"owner": "kdrag0n",
"repo": "base16-kitty",
"type": "github"
}
},
"base16-tmux": {
"flake": false,
"locked": {
"lastModified": 1696725902,
"narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
"owner": "tinted-theming",
"repo": "base16-tmux",
"rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-tmux",
"type": "github"
}
},
"base16-vim": {
"flake": false,
"locked": {
"lastModified": 1663659192,
"narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=",
"owner": "chriskempson",
"lastModified": 1716150083,
"narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
"owner": "tinted-theming",
"repo": "base16-vim",
"rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d",
"rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
"type": "github"
},
"original": {
"owner": "chriskempson",
"owner": "tinted-theming",
"repo": "base16-vim",
"type": "github"
}
@ -142,11 +94,11 @@
]
},
"locked": {
"lastModified": 1727872461,
"narHash": "sha256-4Pw3fVhN6xey5+2gUBm9nQJAjBqivffr+a5ZsXYjzJ8=",
"lastModified": 1727977578,
"narHash": "sha256-DBORKcmQ7ZjA4qE1MsnF1MmZSokOGrw4W9vTCioOv2U=",
"owner": "nix-community",
"repo": "disko",
"rev": "568727a884ae7cd9f266bd19aea655def8cafd78",
"rev": "574400001b3ffe555c7a21e0ff846230759be2ed",
"type": "github"
},
"original": {
@ -224,6 +176,27 @@
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": [
"stylix",
"systems"
]
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"fromYaml": {
"flake": false,
"locked": {
@ -316,16 +289,15 @@
]
},
"locked": {
"lastModified": 1726989464,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
"lastModified": 1728041527,
"narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
"rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.05",
"repo": "home-manager",
"type": "github"
}
@ -359,11 +331,11 @@
]
},
"locked": {
"lastModified": 1714981474,
"narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=",
"lastModified": 1724435763,
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f",
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
"type": "github"
},
"original": {
@ -395,11 +367,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1727665282,
"narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=",
"lastModified": 1728056216,
"narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "11c43c830e533dad1be527ecce379fcf994fbbb5",
"rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28",
"type": "github"
},
"original": {
@ -409,22 +381,6 @@
}
},
"nixpkgs": {
"locked": {
"lastModified": 1727672256,
"narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1719f27dd95fd4206afb9cec9f415b539978827e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1727802920,
"narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
@ -440,13 +396,29 @@
"type": "github"
}
},
"nixpkgs_2": {
"nixpkgs-stable": {
"locked": {
"lastModified": 1714912032,
"narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
"lastModified": 1727907660,
"narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d",
"rev": "5966581aa04be7eff830b9e1457d56dc70a0b798",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1725194671,
"narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
"type": "github"
},
"original": {
@ -465,7 +437,7 @@
"home-manager": "home-manager_2",
"nix-darwin": "nix-darwin",
"nixpkgs": [
"nixpkgs-unstable"
"nixpkgs"
],
"nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix"
@ -512,7 +484,7 @@
"home-manager": "home-manager",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"nixpkgs-stable": "nixpkgs-stable",
"nixvim": "nixvim",
"stylix": "stylix",
"zen": "zen"
@ -522,27 +494,28 @@
"inputs": {
"base16": "base16",
"base16-fish": "base16-fish",
"base16-foot": "base16-foot",
"base16-helix": "base16-helix",
"base16-kitty": "base16-kitty",
"base16-tmux": "base16-tmux",
"base16-vim": "base16-vim",
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_2",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_3",
"nixpkgs": "nixpkgs_2"
"nixpkgs": "nixpkgs_2",
"systems": "systems_2",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty",
"tinted-tmux": "tinted-tmux"
},
"locked": {
"lastModified": 1718122552,
"narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=",
"lastModified": 1727723275,
"narHash": "sha256-k4HrG8TJQ0RqDS1tlDz71kvWFBNQ7qZI9T5Z0qLR85Y=",
"owner": "danth",
"repo": "stylix",
"rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7",
"rev": "e7e97059776da7e34b739415a7bc8f80f606b803",
"type": "github"
},
"original": {
"owner": "danth",
"ref": "release-24.05",
"repo": "stylix",
"type": "github"
}
@ -562,6 +535,69 @@
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tinted-foot": {
"flake": false,
"locked": {
"lastModified": 1696725948,
"narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-foot",
"type": "github"
}
},
"tinted-kitty": {
"flake": false,
"locked": {
"lastModified": 1665001328,
"narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=",
"owner": "tinted-theming",
"repo": "tinted-kitty",
"rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-kitty",
"type": "github"
}
},
"tinted-tmux": {
"flake": false,
"locked": {
"lastModified": 1696725902,
"narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
"rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-tmux",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
@ -586,7 +622,7 @@
"zen": {
"inputs": {
"nixpkgs": [
"nixpkgs-unstable"
"nixpkgs"
]
},
"locked": {

View file

@ -4,13 +4,13 @@
inputs = {
# NixOS official package source, using the nixos-23.11 branch here
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:nixos/nixos-hardware";
# Declarative dotfile management
home-manager = {
url = "github:nix-community/home-manager/release-24.05";
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
@ -20,16 +20,16 @@
inputs.nixpkgs.follows = "nixpkgs";
};
stylix.url = "github:danth/stylix/release-24.05";
stylix.url = "github:danth/stylix";
nixvim = {
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs-unstable";
inputs.nixpkgs.follows = "nixpkgs";
};
zen = {
url = "github:MarceColl/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs-unstable";
inputs.nixpkgs.follows = "nixpkgs";
};
# # Secrets management. See ./docs/secretsmgmt.md
@ -40,11 +40,11 @@
};
outputs = { nixpkgs, nixpkgs-unstable, stylix, nixvim, ... }@attrs:
outputs = { nixpkgs, nixpkgs-stable, ... }@attrs:
let
lib = nixpkgs.lib;
pkgs = import nixpkgs { system = "x86_64-linux"; config = { allowUnfree = true; }; };
pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; config = { allowUnfree = true; }; };
pkgs-stable = import nixpkgs-stable { system = "x86_64-linux"; config = { allowUnfree = true; }; };
in
{
nixosConfigurations = {
@ -58,7 +58,7 @@
hostname = "Lenni";
type = "desktop";
inherit pkgs;
inherit pkgs-unstable;
inherit pkgs-stable;
inherit attrs;
inherit system;
};
@ -70,8 +70,8 @@
home-manager.useUserPackages = true;
}
attrs.disko.nixosModules.disko
stylix.nixosModules.stylix
nixvim.nixosModules.nixvim
attrs.stylix.nixosModules.stylix
attrs.nixvim.nixosModules.nixvim
attrs.nixos-hardware.nixosModules.framework-12th-gen-intel
./hosts
./users/willifan
@ -88,7 +88,7 @@
hostname = "Puenktchen";
type = "desktop";
inherit pkgs;
inherit pkgs-unstable;
inherit pkgs-stable;
inherit system;
};
@ -99,8 +99,8 @@
home-manager.useUserPackages = true;
}
attrs.disko.nixosModules.disko
stylix.nixosModules.stylix
nixvim.nixosModules.nixvim
attrs.stylix.nixosModules.stylix
attrs.nixvim.nixosModules.nixvim
attrs.nixos-hardware.nixosModules.common-cpu-amd
attrs.nixos-hardware.nixosModules.common-cpu-amd-pstate
attrs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
@ -120,7 +120,7 @@
hostname = "Anton";
type = "server";
inherit pkgs;
inherit pkgs-unstable;
inherit pkgs-stable;
inherit system;
};
@ -131,8 +131,8 @@
home-manager.useUserPackages = true;
}
attrs.disko.nixosModules.disko
stylix.nixosModules.stylix
nixvim.nixosModules.nixvim
attrs.stylix.nixosModules.stylix
attrs.nixvim.nixosModules.nixvim
attrs.nixos-hardware.nixosModules.common-cpu-amd
attrs.nixos-hardware.nixosModules.common-cpu-amd-pstate
attrs.nixos-hardware.nixosModules.common-cpu-amd-zenpower

View file

@ -1,9 +1,8 @@
{ pkgs-unstable, ... }:
{ ... }:
{
services.gitea = {
enable = true;
package = pkgs-unstable.gitea;
stateDir = "/mnt/data/services/gitea";
appName = "My low quality unfinished Projects";

View file

@ -1,9 +1,8 @@
{ pkgs-unstable, ...}:
{ ...}:
{
services.minecraft-server = {
eula = true;
enable = true;
package = pkgs-unstable.minecraft-server;
jvmOpts = "-Xms4096M -Xmx8192M";
dataDir = "/mnt/data/services/minecraft";
openFirewall = true;

View file

@ -1,9 +1,8 @@
{ pkgs-unstable, ... }:
{ ... }:
{
programs.nixvim = {
enable = true;
package = pkgs-unstable.neovim-unwrapped;
defaultEditor = true;
};

View file

@ -1,10 +1,9 @@
{ pkgs-unstable, ... }:
{ ... }:
{
programs.nixvim.plugins = {
yazi = {
enable = true;
package = pkgs-unstable.vimPlugins.yazi-nvim;
};
};

View file

@ -1,4 +1,4 @@
{ pkgs-unstable, ... }:
{ ... }:
{
@ -6,10 +6,7 @@
services.avizo.enable = true;
programs.bat.enable = true;
programs.btop.enable = true;
programs.yazi = {
enable = true;
package = pkgs-unstable.yazi;
};
programs.yazi.enable = true;
programs.nushell.enable = true;
};
}

View file

@ -1,4 +1,4 @@
{ pkgs, pkgs-unstable, attrs, system, ... }:
{ pkgs, attrs, system, ... }:
{
environment.systemPackages =
@ -23,14 +23,9 @@
blender
gimp
inkscape
])
++
(with pkgs-unstable; [
prusa-slicer
])
++
[

View file

@ -1,4 +1,4 @@
{ pkgs, home-manager, ...}:
{ ...}:
{
home-manager.users.willifan = {
services.hypridle = {

View file

@ -1,4 +1,4 @@
{ pkgs, home-manager, ...}:
{ ...}:
{
security.pam.services.hyprlock = {};

View file

@ -1,4 +1,4 @@
{ pkgs, home-manager, ... }:
{ pkgs, ... }:
{
home-manager.users.willifan = {
services.kanshi = {

View file

@ -9,9 +9,6 @@
ipc = "off";
preload = "/home/willifan/.config/hypr/Oneshot.png";
wallpaper = ", /home/willifan/.config/hypr/Oneshot.png";
};
};
};