materus
/
nixos-config
mirror of https://github.com/materusPL/nixos-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: materus:fecfdec551ac17e999b53328f0444f998d92ac2d
Branches Tags
materus:master
materus:experimental
materus:inputs
...
compare: materus:8327d4cfd30e77cf6a072dcb09e4eac5332554ab
Branches Tags
materus:experimental
materus:master
materus:inputs

4 Commits
fecfdec551 ... 8327d4cfd3

Author SHA1 Message Date
Mateusz Słodkowicz 8327d4cfd3
materusPC: java settings 2024-09-26 00:04:39 +02:00
Mateusz Słodkowicz 710108fd6f
profile: mpv 2024-09-25 23:54:01 +02:00
Mateusz Słodkowicz 59aaa7f319
waffentrager: updates 2024-09-25 23:53:39 +02:00
Mateusz Słodkowicz cba573ed94
flake: update lock 2024-09-25 23:53:21 +02:00
9 changed files with 81 additions and 59 deletions
Show Stats Expand all files Collapse all files

2
configurations/host/materusPC/default.nix
View File

@ -7,6 +7,7 @@
./vm
./secrets
./containers
./other
./scripts.nix
./tmp.nix
@ -15,7 +16,6 @@
./kde.nix
./audio.nix
./apps.nix
];

6
configurations/host/materusPC/home/materus/default.nix
View File

@ -71,7 +71,7 @@
freetype.dev
fpc
openjdk21
gradle
bison
flex
@ -109,6 +109,10 @@
];
};
home.file.".gradle/gradle.properties".text = ''
org.gradle.java.installations.fromEnv=JAVA_8_HOME,JAVA_17_HOME,JAVA_21_HOME
org.gradle.home=${pkgs.jdk21}
'';
xdg.desktopEntries.brave-browser =
let

0
configurations/host/materusPC/apps.nix → configurations/host/materusPC/other/apps.nix
View File

8
configurations/host/materusPC/other/default.nix Normal file
View File

@ -0,0 +1,8 @@
{ ... }:
{
imports = [
./apps.nix
./java.nix
];
}

14
configurations/host/materusPC/other/java.nix Normal file
View File

@ -0,0 +1,14 @@
{ pkgs, ... }:
{
programs = {
java.enable = true;
java.package = pkgs.jdk;
java.binfmt = true;
};
environment.variables = {
JAVA_8_HOME = pkgs.jdk8;
JAVA_17_HOME = pkgs.jdk17;
JAVA_21_HOME = pkgs.jdk21;
};
}

3
configurations/host/materusPC/tmp.nix
View File

@ -166,9 +166,6 @@
environment.shells = with pkgs; [ zsh bashInteractive fish ];
programs = {
fish.enable = true;
java.enable = true;
java.package = pkgs.graalvm-ce;
java.binfmt = true;
command-not-found.enable = false;
dconf.enable = true;
};

1
configurations/host/waffentrager/services/storage/samba.nix
View File

@ -36,6 +36,7 @@
mangled names = no
dos charset = CP850
unix charset = UTF-8
display charset = UTF-8
catia:mappings = 0x22:0xa8,0x2a:0xa4,0x2f:0xf8,0x3a:0xf7,0x3c:0xab,0x3e:0xbb,0x3f:0xbf,0x5c:0xff,0x7c:0xa6
'';
shares = {

2
configurations/profile/home/default.nix
View File

@ -30,8 +30,6 @@ in
programs.mpv = lib.mkIf cfg.enableDesktop {
enable = true;
config = {
vo = "gpu-next";
profile="gpu-hq";
ytdl-format = "bestvideo+bestaudio";
slang="pl,pol,Polish,Polski,en,eng,English";
alang="ja,jp,jpn,Japanese,pl,pol,Polski,en,eng,English";

104
flake.lock
View File

@ -159,11 +159,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1726305199,
"narHash": "sha256-TuLybRSsT1+AKuX0wgqaZg8LVrjDphQhWRxL0Cyt3ug=",
"lastModified": 1726822766,
"narHash": "sha256-3SC6yL7vqLymqHCU6BCWzcpt5tgS7qGtj12aO1AKNyQ=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "c8644c5d59fee9a24a1be146bb6ce5b41d23592e",
"rev": "c64436a2941e042e63c5efb5eab94a11a12ca5de",
"type": "github"
},
"original": {
@ -186,11 +186,11 @@
"nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
"lastModified": 1726305199,
"narHash": "sha256-TuLybRSsT1+AKuX0wgqaZg8LVrjDphQhWRxL0Cyt3ug=",
"lastModified": 1726822766,
"narHash": "sha256-3SC6yL7vqLymqHCU6BCWzcpt5tgS7qGtj12aO1AKNyQ=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "c8644c5d59fee9a24a1be146bb6ce5b41d23592e",
"rev": "c64436a2941e042e63c5efb5eab94a11a12ca5de",
"type": "github"
},
"original": {
@ -205,11 +205,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
@ -224,11 +224,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
@ -329,11 +329,11 @@
]
},
"locked": {
"lastModified": 1725703823,
"narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=",
"lastModified": 1726818100,
"narHash": "sha256-z2V74f5vXqkN5Q+goFlhbFXY/dNaBAyeLpr2bxu4Eic=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba",
"rev": "1bbc1a5a1f4de7401c92db85b2119ed21bb4139d",
"type": "github"
},
"original": {
@ -351,11 +351,11 @@
]
},
"locked": {
"lastModified": 1726308872,
"narHash": "sha256-d4vwO5N4RsLnCY7k5tY9xbdYDWQsY3RDMeUoIa4ms2A=",
"lastModified": 1726818292,
"narHash": "sha256-sFI+LTeRTPOAZe9ewhQpIq5CkIr4IpzfzuyIFCz6ugY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "6c1a461a444e6ccb3f3e42bb627b510c3a722a57",
"rev": "8d7e352a4b25ac2d88a881ffa3472680af916ddc",
"type": "github"
},
"original": {
@ -437,11 +437,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1725885300,
"narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=",
"lastModified": 1726724509,
"narHash": "sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e",
"rev": "10d5e0ecc32984c1bf1a9a46586be3451c42fd94",
"type": "github"
},
"original": {
@ -453,11 +453,11 @@
},
"nixos-hardware_2": {
"locked": {
"lastModified": 1725885300,
"narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=",
"lastModified": 1726724509,
"narHash": "sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e",
"rev": "10d5e0ecc32984c1bf1a9a46586be3451c42fd94",
"type": "github"
},
"original": {
@ -485,11 +485,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1725930920,
"narHash": "sha256-RVhD9hnlTT2nJzPHlAqrWqCkA7T6CYrP41IoVRkciZM=",
"lastModified": 1726447378,
"narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "44a71ff39c182edaf25a7ace5c9454e7cba2c658",
"rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
"type": "github"
},
"original": {
@ -517,11 +517,11 @@
},
"nixpkgs-stable_3": {
"locked": {
"lastModified": 1725930920,
"narHash": "sha256-RVhD9hnlTT2nJzPHlAqrWqCkA7T6CYrP41IoVRkciZM=",
"lastModified": 1726447378,
"narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "44a71ff39c182edaf25a7ace5c9454e7cba2c658",
"rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
"type": "github"
},
"original": {
@ -549,11 +549,11 @@
},
"nixpkgs-stable_5": {
"locked": {
"lastModified": 1726062281,
"narHash": "sha256-PyFVySdGj3enKqm8RQuo4v1KLJLmNLOq2yYOHsI6e2Q=",
"lastModified": 1726447378,
"narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e65aa8301ba4f0ab8cb98f944c14aa9da07394f8",
"rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
"type": "github"
},
"original": {
@ -565,11 +565,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1726062873,
"narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
"lastModified": 1726463316,
"narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
"rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
"type": "github"
},
"original": {
@ -594,11 +594,11 @@
},
"nur_2": {
"locked": {
"lastModified": 1726311124,
"narHash": "sha256-jzlUpw8li3BbKlpAcqyue5VYMKtjKiXZXyyaju/nnSo=",
"lastModified": 1726822046,
"narHash": "sha256-DcQA6LhSUozXsFtXjvis5BOU9Y6f/C7ewhxlMsHJMH4=",
"owner": "nix-community",
"repo": "NUR",
"rev": "c3d547e38fbf32808f94f58e2b2852f1ad2bccf5",
"rev": "1a6b64958b310d5418afa0e8ddddb2e3ac1cb529",
"type": "github"
},
"original": {
@ -623,11 +623,11 @@
},
"nur_4": {
"locked": {
"lastModified": 1726311124,
"narHash": "sha256-jzlUpw8li3BbKlpAcqyue5VYMKtjKiXZXyyaju/nnSo=",
"lastModified": 1726822046,
"narHash": "sha256-DcQA6LhSUozXsFtXjvis5BOU9Y6f/C7ewhxlMsHJMH4=",
"owner": "nix-community",
"repo": "NUR",
"rev": "c3d547e38fbf32808f94f58e2b2852f1ad2bccf5",
"rev": "1a6b64958b310d5418afa0e8ddddb2e3ac1cb529",
"type": "github"
},
"original": {
@ -639,10 +639,10 @@
},
"nur_5": {
"locked": {
"lastModified": 1726130808,
"narHash": "sha256-RVunrPgmrED3m43ZwLdZuM0+zKtJIMyxr6j7yPwpwHg=",
"path": "/nix/store/ymkmj47x7cb2kb286zy98xzmqm5nrl0v-source",
"rev": "d286b1c8121d3f150815181a4b6b72f5353ab2db",
"lastModified": 1726311124,
"narHash": "sha256-jzlUpw8li3BbKlpAcqyue5VYMKtjKiXZXyyaju/nnSo=",
"path": "/nix/store/dnaaw3xw44spw32fs83p5p7mnzzs1s5k-source",
"rev": "c3d547e38fbf32808f94f58e2b2852f1ad2bccf5",
"type": "path"
},
"original": {
@ -687,11 +687,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1726218807,
"narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=",
"lastModified": 1726524647,
"narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e",
"rev": "e2d404a7ea599a013189aa42947f66cede0645c8",
"type": "github"
},
"original": {
@ -710,11 +710,11 @@
"nixpkgs-stable": "nixpkgs-stable_4"
},
"locked": {
"lastModified": 1726218807,
"narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=",
"lastModified": 1726524647,
"narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e",
"rev": "e2d404a7ea599a013189aa42947f66cede0645c8",
"type": "github"
},
"original": {