voronind/nix
0
0
Fork 0
Code Issues 40 Pull requests Packages Projects Releases Wiki Activity

Lock : Update & fix Office license issues.

Browse source
This commit is contained in:
Dmitry Voronin 2024-06-26 09:28:51 +03:00
parent dac6ccf5ef
commit 0da8df18fa
Signed by: voronind
SSH key fingerprint: SHA256:3kBb4iV2ahufEBNq+vFbUe4QYfHt98DHQjN7QaptY9k
6 changed files with 79 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
container/Office.nix
View file

@ -41,6 +41,13 @@ in {
}; };
config = { pkgs, ... }: container.mkContainerConfig cfg { config = { pkgs, ... }: container.mkContainerConfig cfg {
# HACK: For whatever reason it does not detect my global allowUnfree (I pass pkgs from host system in mkContainerConfig).
nixpkgs.overlays = [ (final: prev: {
corefonts = prev.corefonts.overrideAttrs (old: {
meta.license = mkForce licenses.mit;
});
})];
services.onlyoffice = let services.onlyoffice = let
dbName = "onlyoffice"; dbName = "onlyoffice";
in { in {

130
flake.lock
View file

@ -101,15 +101,15 @@
"base16-vim": { "base16-vim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1663659192, "lastModified": 1716150083,
"narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
"owner": "chriskempson", "owner": "tinted-theming",
"repo": "base16-vim", "repo": "base16-vim",
"rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "chriskempson", "owner": "tinted-theming",
"repo": "base16-vim", "repo": "base16-vim",
"type": "github" "type": "github"
} }
@ -188,11 +188,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717931644, "lastModified": 1719180626,
"narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=", "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3d65009effd77cb0d6e7520b68b039836a7606cf", "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -209,11 +209,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714981474, "lastModified": 1715930644,
"narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -232,11 +232,11 @@
"nmt": "nmt" "nmt": "nmt"
}, },
"locked": { "locked": {
"lastModified": 1666720474, "lastModified": 1705252799,
"narHash": "sha256-iWojjDS1D19zpeZXbBdjWb9MiKmVVFQCqtJmtTXgPx8=", "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=",
"owner": "Gerschtli", "owner": "Gerschtli",
"repo": "nix-formatter-pack", "repo": "nix-formatter-pack",
"rev": "14876cc8fe94a3d329964ecb073b4c988c7b61f5", "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -296,11 +296,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1717786204, "lastModified": 1719254875,
"narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "051f920625ab5aabe37c920346e3e69d7d34400e", "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -360,11 +360,11 @@
}, },
"nixpkgsMaster": { "nixpkgsMaster": {
"locked": { "locked": {
"lastModified": 1718911369, "lastModified": 1719381159,
"narHash": "sha256-6hQfF7h56BB7FEM1amkFklmldw52C8Zt2YJ7TsYQVBQ=", "narHash": "sha256-Kp7O8zV0dFNinR9bAwRQ0XG0cmJ3L5/Md4E/uat5aXc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a8e819d72379c40c713d4583f7bd83267ba69065", "rev": "c4f0f788123973aedb7a88d78109909d9f223ca6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -376,11 +376,11 @@
}, },
"nixpkgsStable": { "nixpkgsStable": {
"locked": { "locked": {
"lastModified": 1718835956, "lastModified": 1719253556,
"narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=", "narHash": "sha256-A/76RFUVxZ/7Y8+OMVL1Lc8LRhBxZ8ZE2bpMnvZ1VpY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309", "rev": "fc07dc3bdf2956ddd64f24612ea7fc894933eb2e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -479,11 +479,11 @@
"nvimAlign": { "nvimAlign": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1716646028, "lastModified": 1719149706,
"narHash": "sha256-aHpRIhkrv4FQ64d0NJm0yId48bNdZ9uwvus95WxnbrU=", "narHash": "sha256-Kxuo1ChgrI4Va04/07+dQeEyC8oAK5JEKXkwxSIRn+A=",
"owner": "echasnovski", "owner": "echasnovski",
"repo": "mini.align", "repo": "mini.align",
"rev": "68a8d3205f0e7ce1bded057f4a851f42ef8fc584", "rev": "5020e5dc473707b293aeec5b05e7e88444246885",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -511,11 +511,11 @@
"nvimBufferline": { "nvimBufferline": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1716555412, "lastModified": 1719300612,
"narHash": "sha256-8PCkY1zrlMrPGnQOb7MjqDXNlkeX46jrT4ScIL+MOwM=", "narHash": "sha256-/HpRU+TQjrPratReMyvwaYZ5wPqnrTg79iocaF8hkfw=",
"owner": "akinsho", "owner": "akinsho",
"repo": "bufferline.nvim", "repo": "bufferline.nvim",
"rev": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe", "rev": "81820cac7c85e51e4cf179f8a66d13dbf7b032d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -543,11 +543,11 @@
"nvimColorizer": { "nvimColorizer": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1717581101, "lastModified": 1719173190,
"narHash": "sha256-daxsQ+/Ss1J7np0jq1YOpJW6rbwGg+8QiuHfXqoq1X4=", "narHash": "sha256-0T1vHEZCkQNg701wsvOld66sAY72knlBkxu4/rIq8eM=",
"owner": "brenoprata10", "owner": "brenoprata10",
"repo": "nvim-highlight-colors", "repo": "nvim-highlight-colors",
"rev": "30f305d57d658615cd827146f5e56db8b6833475", "rev": "ed03bc006a22aa58aeeb06059a0a41acbd5e5b44",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -575,11 +575,11 @@
"nvimGitsigns": { "nvimGitsigns": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1717763051, "lastModified": 1719313209,
"narHash": "sha256-FWcjFwprIeDRMKhurJtGqCfI4mP4fQNQY8szjnjuOCc=", "narHash": "sha256-z90mzcqYWW3qgHWTC/YH+Heo5rgIvB0ojEj74ja6IgM=",
"owner": "lewis6991", "owner": "lewis6991",
"repo": "gitsigns.nvim", "repo": "gitsigns.nvim",
"rev": "4a143f13e122ab91abdc88f89eefbe70a4858a56", "rev": "fa42613096ebfa5fee1ea87d70f8625ab9685d01",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -591,11 +591,11 @@
"nvimGruvboxMaterial": { "nvimGruvboxMaterial": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1717400612, "lastModified": 1718997242,
"narHash": "sha256-uFCZjRPwBX633SAflxAuAPwtOOjSXCrvmFysWOPJFJQ=", "narHash": "sha256-fZInzV3cTAu94/j7hkeWxQhJbtFeuvAjeWrSG0UVv1A=",
"owner": "sainnhe", "owner": "sainnhe",
"repo": "gruvbox-material", "repo": "gruvbox-material",
"rev": "905a41c86dbfed42f89c13c36f0e3407e9318910", "rev": "607fac66a5a4418dd9fe1c8fe7d1368099f5bf96",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -623,11 +623,11 @@
"nvimLspconfig": { "nvimLspconfig": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1717681643, "lastModified": 1719132401,
"narHash": "sha256-QlgLZx9Dp5ijSOxeicNcqm4G8YcF5aOZFJSiBclWuIY=", "narHash": "sha256-dM4FtrfZC8smqman/3rbu+jTG6qY5X8HunE9JADoZGY=",
"owner": "neovim", "owner": "neovim",
"repo": "nvim-lspconfig", "repo": "nvim-lspconfig",
"rev": "92166b89ab4b3d60f24e58170cac53b7141fd032", "rev": "9c9eb07fecc578e25e28db8dc9002b43fff2ed79",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -687,11 +687,11 @@
"nvimTelescope": { "nvimTelescope": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1717942246, "lastModified": 1719325833,
"narHash": "sha256-wiKpQZJfZ/kkZAid9PiER4RSJLHnTrZfYrfqzjPWKYs=", "narHash": "sha256-5ECEep47SSEpO405C1mw59i0X+QpIcoU9dqzDmqZ59A=",
"owner": "nvim-telescope", "owner": "nvim-telescope",
"repo": "telescope.nvim", "repo": "telescope.nvim",
"rev": "f12b15e1b3a33524eb06a1ae7bc852fb1fd92197", "rev": "61a4a615366c470a4e9ca8f8b45718b6b92af73f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -703,11 +703,11 @@
"nvimTodo": { "nvimTodo": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1717324408, "lastModified": 1718172727,
"narHash": "sha256-6yKWVUOaM7SWdoDRhk4xVxPaeRtioyhFAgrQAQoHc0o=", "narHash": "sha256-CcQjhccjUG5mEsPaNRR/doYKHw+HiVT/nhbk1kT5axo=",
"owner": "folke", "owner": "folke",
"repo": "todo-comments.nvim", "repo": "todo-comments.nvim",
"rev": "70a93ce66083699571adc361166504b03cc39c2b", "rev": "51e10f838e84b4756c16311d0b1ef0972c6482d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -719,11 +719,11 @@
"nvimTokyonight": { "nvimTokyonight": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1717937533, "lastModified": 1719204810,
"narHash": "sha256-C0/5pSqRM5JOson+VebNoAe+uwPVSWCpL25IUzEGzRA=", "narHash": "sha256-wD1NKr6KYejErp3oK1u/aJW1L8cIKuEL8v9OUpEdvN8=",
"owner": "folke", "owner": "folke",
"repo": "tokyonight.nvim", "repo": "tokyonight.nvim",
"rev": "e4df5bb11d5dd419994c87e81e667847f0389c7e", "rev": "30d7be361a7fbf187a881f17e574e9213d5108ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -735,11 +735,11 @@
"nvimTree": { "nvimTree": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1717900986, "lastModified": 1719107085,
"narHash": "sha256-7KO3wPW65IH4m0jEoyFScNiAVwrlNHU+p0H55AuwlWk=", "narHash": "sha256-RfrbxYD7RYBEy/grSYnKKkWd4BHxGYEFeLiDB5OYGpg=",
"owner": "nvim-tree", "owner": "nvim-tree",
"repo": "nvim-tree.lua", "repo": "nvim-tree.lua",
"rev": "2086e564c4d23fea714e8a6d63b881e551af2f41", "rev": "8b2c5c678be4b49dff6a2df794877000113fd77b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -751,11 +751,11 @@
"nvimTreesitter": { "nvimTreesitter": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1717920583, "lastModified": 1719302372,
"narHash": "sha256-szwUCITOgyhT6fogpruHyvYMcDRsA3kS1YDGMstszbM=", "narHash": "sha256-Ch4HIKd8PlE5L07MM9z2bSlyLaZx19RhMx4JYjrgGuE=",
"owner": "nvim-treesitter", "owner": "nvim-treesitter",
"repo": "nvim-treesitter", "repo": "nvim-treesitter",
"rev": "9ebc589329083522f9594f408fc2652090b41139", "rev": "09700b88b41ed96391de3d2010d74dc54fd5c210",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -767,11 +767,11 @@
"nvimTrouble": { "nvimTrouble": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1717957203, "lastModified": 1719209487,
"narHash": "sha256-+6+eZT0lzFv7Xga4YnRhkhdVRqgYlH9GTONe7aOXU3o=", "narHash": "sha256-3qFfGffA7JCgrdRxnu1RpJrJQ+kFXczDwIvEvoIg7DI=",
"owner": "folke", "owner": "folke",
"repo": "trouble.nvim", "repo": "trouble.nvim",
"rev": "75fad301e4a2b9c5d2a3f4befe997d36a8fc8361", "rev": "88c3be40c061ce053ab326ce4fdcb973a1f785ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -854,11 +854,11 @@
"scss-reset": { "scss-reset": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1683906868, "lastModified": 1631450058,
"narHash": "sha256-cif5Sx8Ca5vxdw/mNAgpulLH15TwmzyJFNM7JURpoaE=", "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=",
"owner": "andreymatin", "owner": "andreymatin",
"repo": "scss-reset", "repo": "scss-reset",
"rev": "5a7bd491ac82441e6283fb0d5d54644b913b30c7", "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -882,11 +882,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1717866166, "lastModified": 1719235398,
"narHash": "sha256-iOeRZXIhFpQJdxzNJ3nUAANyDfLqCslRhjGhLD2RstM=", "narHash": "sha256-yccyHeuMUdbG/89Yi1ZSqx0XlpIKb0WQI+mAnTf/GJw=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "ca3247ed8cfbf369f3fe1b7a421579812a95c101", "rev": "7cdbd128172d7c4ec63f5073d49da5d0e7d6396c",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
host/home/Container.nix
View file

@ -14,7 +14,7 @@
iot.enable = true; iot.enable = true;
jobber.enable = true; jobber.enable = true;
mail.enable = true; mail.enable = true;
# ISSUE: office.enable = true; office.enable = true;
paper.enable = true; paper.enable = true;
pass.enable = true; pass.enable = true;
paste.enable = true; paste.enable = true;

2
module/AmdCompute.nix
View file

@ -10,7 +10,7 @@ in {
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
]; ];
hardware.opengl.extraPackages = with pkgs; [ hardware.graphics.extraPackages = with pkgs; [
rocmPackages.clr.icd rocmPackages.clr.icd
]; ];
}; };

6
module/AmdGpu.nix
View file

@ -8,8 +8,10 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = [ "amdgpu" ];
services.xserver.videoDrivers = [ "amdgpu" ]; services.xserver.videoDrivers = [ "amdgpu" ];
hardware.opengl.driSupport = true; hardware.graphics = {
hardware.opengl.driSupport32Bit = true; enable = true;
enable32Bit = true;
};
environment.variables.AMD_VULKAN_ICD = "RADV"; environment.variables.AMD_VULKAN_ICD = "RADV";
# AMDVLK was broken for me (huge stuttering). So keep it disabled, at least for now. # AMDVLK was broken for me (huge stuttering). So keep it disabled, at least for now.

2
module/desktop/App.nix
View file

@ -19,7 +19,7 @@ in {
"video/*" = "mpv.desktop"; "video/*" = "mpv.desktop";
}; };
hardware.opengl = let hardware.graphics = let
packages = with pkgs; [ packages = with pkgs; [
dxvk dxvk
gamescope gamescope