Kristian
/
home-manager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Flake 

* Replaced VSCode with VSCodium
* Added own Overlays
* Added PrismLauncher
This commit is contained in:
Kristian Krsnik 2024-02-06 13:23:36 +01:00
parent 2b7235f3e6
commit 489e53b3ca
Signed by: Kristian
GPG Key ID: FD1330AC9F909E85
4 changed files with 44 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
flake.lock
View File

@ -213,22 +213,6 @@
"type": "github"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1701623655,
"narHash": "sha256-hEdHNWZdpCyrFK1rcJtPEcDjffn+vdFAUk9dAF7XF6E=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9508909e156b6ecffd4d92ff7a1c5f8d167c15b0",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1673800717,
@ -245,22 +229,6 @@
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1701253981,
"narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1659526864,
@ -323,26 +291,6 @@
"type": "github"
}
},
"polymc": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1707167684,
"narHash": "sha256-9FJG9FxV0IUL7VzgHMGxpY6N5RRMNWeu1veK5NAJ4BE=",
"ref": "refs/heads/main",
"rev": "298c986d3e99ce408cc8fd8194b118e45b52e029",
"revCount": 2,
"type": "git",
"url": "https://git.krsnik.at/Kristian/polymc-flake.git"
},
"original": {
"type": "git",
"url": "https://git.krsnik.at/Kristian/polymc-flake.git"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat_3",
@ -376,10 +324,7 @@
"home-manager": "home-manager",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur",
"polymc": "polymc",
"scanned-image-extractor": "scanned-image-extractor",
"starc": "starc",
"vscode-extensions": "vscode-extensions",
@ -394,11 +339,11 @@
]
},
"locked": {
"lastModified": 1707062143,
"narHash": "sha256-mBBcq5hiojN3Kj3gPIC8hLBvCZd3h80Qm8yp/F8wivk=",
"lastModified": 1707220285,
"narHash": "sha256-JWXtWnw07xLTPeE51eiNS3MeMltP11DiS5cYsT1r1Tc=",
"ref": "refs/heads/main",
"rev": "8759413a66691de582761a89f31c87da9852e90f",
"revCount": 9,
"rev": "846a94c50f089cafe49903ce6e157fe714520a8a",
"revCount": 11,
"type": "git",
"url": "https://git.krsnik.at/Kristian/scanned-image-extractor.git"
},
@ -430,11 +375,11 @@
]
},
"locked": {
"lastModified": 1706203818,
"narHash": "sha256-zCJTu/6/iHiv33Ox+yx6mWXxHH1wXBKCd3pFwfTGY40=",
"lastModified": 1707220280,
"narHash": "sha256-VBgd9wOebW7RWym52434Mgz5w2k1csgw35JAe28Buvs=",
"ref": "refs/heads/main",
"rev": "044bcc975b24bf839a82d615c9ef69b0f52a724a",
"revCount": 16,
"rev": "5586cecb4f76dea16f38b2c0678904edbcfb191b",
"revCount": 18,
"type": "git",
"url": "https://git.krsnik.at/Kristian/starc-flake.git"
},
@ -465,11 +410,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1701566649,
"narHash": "sha256-SJfC9yIPv+79rdLV4sicF2RPAt6EwhH1zN1DRI3cRUI=",
"lastModified": 1707182119,
"narHash": "sha256-Egt1PmjNAbx2nS0h/iWpaTCcOzLPHpRXzTJBt3waEAs=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "e73cf100164d1527ae4db9ec8b2988d474acdedb",
"rev": "4e7767c214364217e0a7611dca3f3420555ceb20",
"type": "github"
},
"original": {

53
flake.nix
View File

@ -3,8 +3,8 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-master.url = "github:nixos/nixpkgs/master";
# nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# nixpkgs-master.url = "github:nixos/nixpkgs/master";
home-manager = {
url = "github:nix-community/home-manager/release-23.11";
@ -36,21 +36,13 @@
url = "git+https://git.krsnik.at/Kristian/scanned-image-extractor.git";
inputs.nixpkgs.follows = "nixpkgs";
};
# polymc = {
# url = "github:PolyMC/PolyMC";
# };
polymc = {
url = "git+https://git.krsnik.at/Kristian/polymc-flake.git";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = {
self,
nixpkgs,
nixpkgs-unstable,
nixpkgs-master,
# nixpkgs-unstable,
# nixpkgs-master,
home-manager,
nur,
wallpaper,
@ -58,7 +50,6 @@
vscode-extensions,
starc,
scanned-image-extractor,
polymc,
}: let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
@ -70,7 +61,6 @@
./systems/common
{
_module.args.wallpaper = wallpaper.packages.${system}.default;
_module.args.vscode-extensions = vscode-extensions.extensions.${system};
}
nur.nixosModules.nur
@ -82,26 +72,23 @@
{
nixpkgs.overlays = [
( # https://github.com/nix-community/home-manager/issues/1538#issuecomment-706627100
final: prev: {
unstable = import nixpkgs-unstable {
system = final.system;
config.allowUnfreePredicate = _: true;
};
master = import nixpkgs-master {
system = final.system;
config.allowUnfreePredicate = _: true;
};
# ( # https://github.com/nix-community/home-manager/issues/1538#issuecomment-706627100
# final: prev: {
# unstable = import nixpkgs-unstable {
# system = final.system;
# config.allowUnfreePredicate = _: true;
# };
# master = import nixpkgs-master {
# system = final.system;
# config.allowUnfreePredicate = _: true;
# };
# }
# )
# own programs
starc = starc.packages.${system}.default;
scanned-image-extractor = scanned-image-extractor.packages.${system}.default;
polymc = polymc.packages.${system}.default;
}
)
( # Overrides davinci-resolve with the unstable version because of https://github.com/NixOS/nixpkgs/pull/246074
final: prev: {davinci-resolve = final.master.davinci-resolve;}
)
vscode-extensions.overlays.default
starc.overlays.default
scanned-image-extractor.overlays.default
];
}
];

6
systems/common/packages.nix
View File

@ -8,9 +8,6 @@
allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
"vscode"
"vscode-extension-MS-python-vscode-pylance"
"vscode-extension-github-copilot"
"osu-lazer"
"spotify"
"linuxsampler"
@ -18,6 +15,7 @@
"obsidian"
"steam"
"steam-original"
"davinci-resolve"
];
};
@ -40,7 +38,7 @@
lutris
osu-lazer
r2modman
polymc
prismlauncher
# Communication
webcord

29
systems/common/vscode.nix
View File

@ -1,12 +1,14 @@
{
pkgs,
vscode-extensions,
...
}: {
programs.vscode = rec {
{pkgs, ...}: {
programs.bash = {
shellAliases = {
code = "codium"; # Alias VSCode with VSCodium
};
};
programs.vscode = {
enable = true;
package = pkgs.unstable.vscode; # To use the latest unstable vscode
package = pkgs.vscodium; # Replace VSCode with VSCodium
enableUpdateCheck = false;
enableExtensionUpdateCheck = false;
@ -20,14 +22,13 @@
];
# This will only yield extensions that are compatible with the installed version of vscode
extensions = with (vscode-extensions.forVSCodeVersion package.version).vscode-marketplace; [
extensions = with pkgs.vscode-marketplace; [
jnoortheen.nix-ide
mkhl.direnv
ms-python.python
ms-python.vscode-pylance
ms-python.autopep8
james-yu.latex-workshop
github.copilot
davidanson.vscode-markdownlint
tamasfe.even-better-toml
asciidoctor.asciidoctor-vscode
@ -44,7 +45,7 @@
userSettings = {
"git.enableCommitSigning" = true;
"window.menuBarVisibility" = "hidden";
"window.menuBarVisibility" = "toggle";
"editor.fontFamily" = "'FiraCode Nerd Font'";
"editor.fontLigatures" = true;
@ -134,14 +135,6 @@
];
"C_Cpp.clang_format_fallbackStyle" = "Microsoft";
"github.copilot.enable" = {
"*" = true;
plaintext = false;
markdown = false;
scminput = false;
cpp = false;
};
"redhat.telemetry.enabled" = false;
"java.jdt.ls.java.home" = "${pkgs.jdk21_headless}";
};