rachel/nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

24.05

Browse Source
This commit is contained in:
Rachel Lambda Samuelsson 2024-06-04 00:26:34 +02:00
parent 7f19d4efe9
commit 9467e4cb8a
6 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
computational/configuration.nix
View File

@ -48,5 +48,5 @@
networking.hostName = "computational"; networking.hostName = "computational";
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
system.stateVersion = "23.11"; system.stateVersion = "24.05";
} }

16
flake.lock
View File

@ -100,32 +100,32 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712386041, "lastModified": 1716736833,
"narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=", "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff", "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11", "ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1712588820, "lastModified": 1717144377,
"narHash": "sha256-y31s5idk3jMJMAVE4Ud9AdI7HT3CgTAeMTJ0StqKN7Y=", "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
"owner": "NixOs", "owner": "NixOs",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d272ca50d1f7424fbfcd1e6f1c9e01d92f6da167", "rev": "805a384895c696f802a9bf5bf4720f37385df547",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOs", "owner": "NixOs",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

4
flake.nix
View File

@ -3,9 +3,9 @@
description = "My various NixOs configurations"; description = "My various NixOs configurations";
inputs = { inputs = {
nixpkgs.url = "github:NixOs/nixpkgs/nixos-23.11"; nixpkgs.url = "github:NixOs/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:NixOs/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOs/nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.url = "github:nix-community/home-manager/release-24.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
agda.url = "github:agda/agda/v2.6.4.1"; agda.url = "github:agda/agda/v2.6.4.1";
agda.inputs.nixpkgs.follows = "nixpkgs"; agda.inputs.nixpkgs.follows = "nixpkgs";

17
home/rachel.nix
View File

@ -7,7 +7,6 @@ let username = "rachel";
export PATH="${hpkgs.haskell-language-server}/bin:$PATH" export PATH="${hpkgs.haskell-language-server}/bin:$PATH"
exec ${hpkgs.haskell-language-server}/bin/haskell-language-server-wrapper "$@" exec ${hpkgs.haskell-language-server}/bin/haskell-language-server-wrapper "$@"
''; '';
rzk = hpkgs.rzk;
in in
{ {
home = { home = {
@ -81,7 +80,6 @@ in
idris2 idris2
prismlauncher prismlauncher
vimv vimv
rzk
whalebird whalebird
lean4 lean4
slippi-netplay slippi-netplay
@ -90,7 +88,7 @@ in
unstable.renoise unstable.renoise
git-crypt git-crypt
]; ];
stateVersion = "23.11"; stateVersion = "24.05";
}; };
xdg.userDirs = { xdg.userDirs = {
@ -273,17 +271,6 @@ in
vim.diagnostic.enable(args.buf) vim.diagnostic.enable(args.buf)
end end
}) })
vim.api.nvim_create_autocmd({"BufRead", "BufNewFile"}, {
pattern = { "*.rzk" },
callback = function(arg)
vim.lsp.start({
name = 'rzk-lsp',
cmd = { "${rzk}/bin/rzk", "lsp" },
root_dir = vim.fs.dirname(vim.fs.find('rzk.yaml', { upward = true })[1]),
})
end
})
''; '';
extraConfig = '' extraConfig = ''
set rnu nu set rnu nu
@ -526,7 +513,7 @@ in
services = { services = {
gpg-agent = { gpg-agent = {
enable = true; enable = true;
pinentryFlavor = "qt"; pinentryPackage = pkgs.pinentry-qt;
}; };
}; };
} }

2
lambda/configuration.nix
View File

@ -61,5 +61,5 @@
wifi.macAddress = "random"; wifi.macAddress = "random";
}; };
system.stateVersion = "23.11"; system.stateVersion = "24.05";
} }

16
shared/desktop.nix
View File

@ -60,6 +60,14 @@
]; ];
# [DESKTOP / XORG / WAYLAND] # [DESKTOP / XORG / WAYLAND]
services.libinput = {
enable = true;
touchpad = {
naturalScrolling = true;
accelProfile = "flat" ;
tapping = false;
};
};
services.xserver = { services.xserver = {
enable = true; enable = true;
desktopManager.plasma5.enable = true; desktopManager.plasma5.enable = true;
@ -78,14 +86,6 @@
symbolsFile = ../shared/fox.xkb; symbolsFile = ../shared/fox.xkb;
}; };
}; };
libinput = {
enable = true;
touchpad = {
naturalScrolling = true;
accelProfile = "flat" ;
tapping = false;
};
};
}; };
# [TTY] # [TTY]