mbeno/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lol

Browse Source
This commit is contained in:
Martin Benonisen 2024-11-15 11:24:09 +01:00
parent 16921788ea
commit fdd2fbd07c
Signed by: mbeno
SSH Key Fingerprint: SHA256:iAzOA1WUAxocdh/WRWXcSg5nw2dJ1aDCvPuT+3ZjkwI
7 changed files with 227 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
flake.lock
View File

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1730837930,
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
"lastModified": 1731604581,
"narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
"rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
"type": "github"
},
"original": {
@ -23,11 +23,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1730785428,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
"lastModified": 1731319897,
"narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
"rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"type": "github"
},
"original": {
@ -52,11 +52,11 @@
},
"locked": {
"dir": "packaging/nix",
"lastModified": 1730836236,
"narHash": "sha256-8jrg1DQrgYVaO4hpPRxRTAVluo8cE1Lcuvyv2EXuXpA=",
"lastModified": 1731556042,
"narHash": "sha256-eUFmLbf06Dph//IbB9KsJio3dJNADt+EhcfNFXjiJjU=",
"ref": "refs/heads/main",
"rev": "90352466d502c40e147cfd11a428dde6c2899ab3",
"revCount": 833,
"rev": "66a1088194bb13c2d86d2c0af316b280a7235640",
"revCount": 839,
"submodules": true,
"type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"

179
lol Normal file
View File

@ -0,0 +1,179 @@
diff --git a/flake.lock b/flake.lock
index 9168b95..d54afc2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
]
},
"locked": {
- "lastModified": 1730837930,
- "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
+ "lastModified": 1731604581,
+ "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
+ "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
"type": "github"
},
"original": {
@@ -23,11 +23,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1730785428,
- "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
+ "lastModified": 1731319897,
+ "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
+ "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"type": "github"
},
"original": {
@@ -52,11 +52,11 @@
},
"locked": {
"dir": "packaging/nix",
- "lastModified": 1730836236,
- "narHash": "sha256-8jrg1DQrgYVaO4hpPRxRTAVluo8cE1Lcuvyv2EXuXpA=",
+ "lastModified": 1731556042,
+ "narHash": "sha256-eUFmLbf06Dph//IbB9KsJio3dJNADt+EhcfNFXjiJjU=",
"ref": "refs/heads/main",
- "rev": "90352466d502c40e147cfd11a428dde6c2899ab3",
- "revCount": 833,
+ "rev": "66a1088194bb13c2d86d2c0af316b280a7235640",
+ "revCount": 839,
"submodules": true,
"type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
diff --git a/system/hardware.nix b/system/hardware.nix
index bd9dc17..9bd9fe3 100644
--- a/system/hardware.nix
+++ b/system/hardware.nix
@@ -8,10 +8,11 @@
};
};
};
+ environment.sessionVariables = { LIBVA_DRIVER_NAME = "nvidia"; };
- # nixpkgs.config.packageOverrides = pkgs: {
- # intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
- #};
+ nixpkgs.config.packageOverrides = pkgs: {
+ intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
+ };
hardware = {
enableRedistributableFirmware = true;
cpu.intel.updateMicrocode = true;
@@ -20,13 +21,15 @@
enable = true;
enable32Bit = true;
extraPackages = with pkgs; [
- # intel-media-driver
- # intel-vaapi-driver
- # libvdpau-va-gl
+ vaapiVdpau
+ nvidia-vaapi-driver
+ intel-media-driver
+ intel-vaapi-driver
+ libvdpau-va-gl
];
extraPackages32 = with pkgs.pkgsi686Linux; [
- # intel-media-driver
- # intel-vaapi-driver
+ intel-media-driver
+ intel-vaapi-driver
];
};
diff --git a/system/services.nix b/system/services.nix
index 55b38af..23bd736 100644
--- a/system/services.nix
+++ b/system/services.nix
@@ -2,7 +2,11 @@
security.rtkit.enable = true;
services.fwupd.enable = true;
- networking.firewall.enable = false;
+ networking.firewall = {
+ enable = true;
+ allowedTCPPorts = [ 22 ];
+ };
+ networking.nftables.enable = true;
programs.dconf.enable = true;
services.gnome.gnome-keyring.enable = true;
security.pam.services.i3.enableGnomeKeyring = true;
@@ -10,6 +14,7 @@
xset s off -dpms
'';
security.polkit.enable = true;
+
services = {
# prometheus = {
# scrapeConfigs = [
@@ -120,5 +125,4 @@
enable = true;
settings.PasswordAuthentication = true;
};
- networking.firewall.allowedTCPPorts = [ 22 ];
}
diff --git a/user/programs/neovim/plugins.lua b/user/programs/neovim/plugins.lua
index dfc88b4..73112fb 100644
--- a/user/programs/neovim/plugins.lua
+++ b/user/programs/neovim/plugins.lua
@@ -54,6 +54,21 @@ vim.api.nvim_create_autocmd("BufWritePre", {
end
})
+-- LSP: expect
+if executable('expect-language-server')
+ augroup lsp
+ autocmd!
+ autocmd User lsp_setup call lsp#register_server({
+ \ 'name': 'expect',
+ \ 'cmd': {server_info->['expect-language-server']},
+ \ 'whitelist': ['expect'],
+ \ 'initialization_options': {
+ \ 'method': 'builtin',
+ \ },
+ \ })
+ augroup END
+endif
+
-- LSP: nix
lspconfig.nil_ls.setup({
autostart = true,
diff --git a/user/programs/vscode/default.nix b/user/programs/vscode/default.nix
index cb3a321..cf2ae9a 100644
--- a/user/programs/vscode/default.nix
+++ b/user/programs/vscode/default.nix
@@ -2,7 +2,6 @@
programs.vscode = {
enable = true;
enableUpdateCheck = true;
- package = pkgs.vscode.fhs;
enableExtensionUpdateCheck = true;
mutableExtensionsDir = true;
extensions = with pkgs.vscode-extensions; [
diff --git a/user/zsh/default.nix b/user/zsh/default.nix
index 8649fd0..a02d58b 100644
--- a/user/zsh/default.nix
+++ b/user/zsh/default.nix
@@ -26,9 +26,14 @@
read;
done
'';
- dresden = "/home/mbeno/.ssh/dresden.sh";
+ dresden = "/home/mbeno/.ssh/dresden.sh dresden";
+ father = "/home/mbeno/.ssh/dresden.sh father";
+ father-old = "/home/mbeno/.ssh/dresden.sh father-old";
d = "dresden";
+
+ view-tsd = "vmware-view --serverURL=view.tsd.usit.no --userName=p01-mbeno --passcode=\"$(rbw get -f 'TOTP' p01-mbeno)\" --password=\"$(rbw get p01-mbeno)\" --tokenUserName=p01-mbeno --domainName=tsd.usit.no --nonInteractive --kbdLayout=en-us";
alien = "nix run --impure github:guibou/nixGL --override-input nixpkgs nixpkgs/nixos-unstable -- nix run github:thiagokokada/nix-alien --";
+ win = "sudo bootctl set-oneshot auto-windows && reboot";
};
initExtra = ''

19
system/hardware.nix
View File

@ -8,10 +8,11 @@
};
};
};
environment.sessionVariables = { LIBVA_DRIVER_NAME = "nvidia"; };
# nixpkgs.config.packageOverrides = pkgs: {
# intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
#};
nixpkgs.config.packageOverrides = pkgs: {
intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
};
hardware = {
enableRedistributableFirmware = true;
cpu.intel.updateMicrocode = true;
@ -20,13 +21,15 @@
enable = true;
enable32Bit = true;
extraPackages = with pkgs; [
# intel-media-driver
# intel-vaapi-driver
# libvdpau-va-gl
vaapiVdpau
nvidia-vaapi-driver
intel-media-driver
intel-vaapi-driver
libvdpau-va-gl
];
extraPackages32 = with pkgs.pkgsi686Linux; [
# intel-media-driver
# intel-vaapi-driver
intel-media-driver
intel-vaapi-driver
];
};

8
system/services.nix
View File

@ -2,7 +2,11 @@
security.rtkit.enable = true;
services.fwupd.enable = true;
networking.firewall.enable = false;
networking.firewall = {
enable = true;
allowedTCPPorts = [ 22 ];
};
networking.nftables.enable = true;
programs.dconf.enable = true;
services.gnome.gnome-keyring.enable = true;
security.pam.services.i3.enableGnomeKeyring = true;
@ -10,6 +14,7 @@
xset s off -dpms
'';
security.polkit.enable = true;
services = {
# prometheus = {
# scrapeConfigs = [
@ -120,5 +125,4 @@
enable = true;
settings.PasswordAuthentication = true;
};
networking.firewall.allowedTCPPorts = [ 22 ];
}

15
user/programs/neovim/plugins.lua
View File

@ -54,6 +54,21 @@ vim.api.nvim_create_autocmd("BufWritePre", {
end
})
-- LSP: expect
if executable('expect-language-server')
augroup lsp
autocmd!
autocmd User lsp_setup call lsp#register_server({
\ 'name': 'expect',
\ 'cmd': {server_info->['expect-language-server']},
\ 'whitelist': ['expect'],
\ 'initialization_options': {
\ 'method': 'builtin',
\ },
\ })
augroup END
endif
-- LSP: nix
lspconfig.nil_ls.setup({
autostart = true,

1
user/programs/vscode/default.nix
View File

@ -2,7 +2,6 @@
programs.vscode = {
enable = true;
enableUpdateCheck = true;
package = pkgs.vscode.fhs;
enableExtensionUpdateCheck = true;
mutableExtensionsDir = true;
extensions = with pkgs.vscode-extensions; [

7
user/zsh/default.nix
View File

@ -26,9 +26,14 @@
read;
done
'';
dresden = "/home/mbeno/.ssh/dresden.sh";
dresden = "/home/mbeno/.ssh/dresden.sh dresden";
father = "/home/mbeno/.ssh/dresden.sh father";
father-old = "/home/mbeno/.ssh/dresden.sh father-old";
d = "dresden";
view-tsd = "vmware-view --serverURL=view.tsd.usit.no --userName=p01-mbeno --passcode=\"$(rbw get -f 'TOTP' p01-mbeno)\" --password=\"$(rbw get p01-mbeno)\" --tokenUserName=p01-mbeno --domainName=tsd.usit.no --nonInteractive --kbdLayout=en-us";
alien = "nix run --impure github:guibou/nixGL --override-input nixpkgs nixpkgs/nixos-unstable -- nix run github:thiagokokada/nix-alien --";
win = "sudo bootctl set-oneshot auto-windows && reboot";
};
initExtra = ''