noa/nixconf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge things

Browse source
This commit is contained in:
Noa Auto 2024-05-25 10:09:02 +02:00
commit 1aa2bacaec
8 changed files with 74 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

7
common/nvim/init.lua
View file

@ -52,8 +52,9 @@ vim.opt.list = true
vim.opt.listchars = { tab = "» ", trail = "·", nbsp = "␣" }
-- make tabs a reasonable width
vim.opt.tabstop = 4
vim.opt.softtabstop = 4
vim.opt.tabstop = 2
vim.opt.softtabstop = 2
vim.opt.shiftwidth = 2
-- Preview substitutions live, as you type!
vim.opt.inccommand = "split"
@ -157,7 +158,7 @@ require("lazy").setup({
"tpope/vim-fugitive",
-- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
"tpope/vim-sleuth", -- Detect tabstop and shiftwidth automatically
-- "tpope/vim-sleuth", -- Detect tabstop and shiftwidth automatically
-- NOTE: Plugins can also be added by using a table,
-- with the first argument being the link and the following

1
common/nvim/nvim.nix
View file

@ -7,7 +7,6 @@
# TODO: find how I can make this build dependencies only
gnumake
cargo
rustc
python3
];

52
flake.lock generated
View file

@ -65,11 +65,11 @@
]
},
"locked": {
"lastModified": 1716168343,
"narHash": "sha256-82oT27w9smpItZ+PyN2C0PjIwZYbIocwXSM4u1igXuc=",
"lastModified": 1716431128,
"narHash": "sha256-t3T8HlX3udO6f4ilLcN+j5eC3m2gqsouzSGiriKK6vk=",
"owner": "nix-community",
"repo": "disko",
"rev": "6f01b9710bc4d3bf006eb8df928b4b15e0430901",
"rev": "7ffc4354dfeb37c8c725ae1465f04a9b45ec8606",
"type": "github"
},
"original": {
@ -216,11 +216,11 @@
]
},
"locked": {
"lastModified": 1715930644,
"narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
"lastModified": 1716457508,
"narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
"rev": "850cb322046ef1a268449cf1ceda5fd24d930b05",
"type": "github"
},
"original": {
@ -266,11 +266,11 @@
]
},
"locked": {
"lastModified": 1715791817,
"narHash": "sha256-J069Uhv/gCMFLX1dSh2f+9ZTM09r1Nv3oUfocCnWKow=",
"lastModified": 1716327911,
"narHash": "sha256-PI+wygItS/TKzi4gEAROvKTUzTx9GT+PGBttS/IOA/Q=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "7c3aa03dffb53921e583ade3d4ae3f487e390e7e",
"rev": "27ca640abeef2d425b5dbecf804f5eb622cef56d",
"type": "github"
},
"original": {
@ -291,11 +291,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1716063601,
"narHash": "sha256-gAuCKupztnqai1tZ6TyCFCRbeFzbggL0Oe0vl0/cwK8=",
"lastModified": 1716462072,
"narHash": "sha256-MmwWogK4x+mVjTCnlUAIGKv9bTJ0NX41sScRtmusw+k=",
"ref": "refs/heads/main",
"rev": "f8857e6072bd85b95393499688872aaf7f088b5b",
"revCount": 4719,
"rev": "25b9446949bf12a2bfc1b9a38b4ccac78a06b32d",
"revCount": 4729,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@ -390,11 +390,11 @@
]
},
"locked": {
"lastModified": 1715879663,
"narHash": "sha256-/DwglRvj4XF4ECdNtrCIbthleszAZBwOiXG5A6r0K/c=",
"lastModified": 1716058375,
"narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "f5181a068c1b06f2db51f6222e50a0c665a2b0c3",
"rev": "3afed4364790aebe0426077631af1e164a9650cc",
"type": "github"
},
"original": {
@ -497,11 +497,11 @@
]
},
"locked": {
"lastModified": 1716168130,
"narHash": "sha256-Oyg6eNhZVsXeOE4iszntTskAuK3vJvHUj2XxXIR+xGc=",
"lastModified": 1716427297,
"narHash": "sha256-MkT6Mw0heLGt5TE9LjKAo+LLG9sSzhmpLj+U4cOyB2c=",
"owner": "Infinidoge",
"repo": "nix-minecraft",
"rev": "bd9c8fb22af7f74a63e36c426d16c3890cb2eb9b",
"rev": "b310a08404315f59a9f15eb01aa04dd006afc7ca",
"type": "github"
},
"original": {
@ -575,16 +575,16 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1716137900,
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
"lastModified": 1716462053,
"narHash": "sha256-l6n8UpcJrMryvAFsxOjCetXrgycm+WMfo/GBlWWrGfg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1",
"rev": "07f97058e9b299fabb746391fcdca73166acb516",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
@ -740,11 +740,11 @@
]
},
"locked": {
"lastModified": 1715788457,
"narHash": "sha256-32HOkjSIyANphV0p5gIwP4ONU/CcinhwOyVFB+tL/d0=",
"lastModified": 1716290197,
"narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "af7c87a32f5d67eb2ada908a6a700f4e74831943",
"rev": "91e48d6acd8a5a611d26f925e51559ab743bc438",
"type": "github"
},
"original": {

60
flake.nix
View file

@ -2,7 +2,8 @@
description = "Nixos config flake";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/master";
# nixpkgs.url = "github:NixOS/nixpkgs/d8e0944e6d2ce0f326040e654c07a410e2617d47";
@ -16,13 +17,13 @@
};
automapaper = {
url = "github:itepastra/automapaper";
inputs.nixpkgs.follows = "nixpkgs";
url = "github:itepastra/automapaper";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-minecraft = {
url = "github:Infinidoge/nix-minecraft";
inputs.nixpkgs.follows = "nixpkgs";
url = "github:Infinidoge/nix-minecraft";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland = {
@ -36,13 +37,13 @@
};
disko = {
url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs";
url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs";
};
lazy = {
url = "github:bobvanderlinden/nixos-config";
inputs.nixpkgs.follows = "nixpkgs";
url = "github:bobvanderlinden/nixos-config";
inputs.nixpkgs.follows = "nixpkgs";
};
};
@ -51,28 +52,27 @@
{
nixosConfigurations = {
lambdaOS = nixpkgs.lib.nixosSystem {
specialArgs = {
inherit inputs;
inherit nix-colors;
inherit automapaper;
};
modules = [
./hosts/default/configuration.nix
inputs.home-manager.nixosModules.default
];
};
specialArgs = {
inherit inputs;
inherit nix-colors;
inherit automapaper;
};
modules = [
./hosts/default/configuration.nix
inputs.home-manager.nixosModules.default
];
};
NoasServer = nixpkgs.lib.nixosSystem {
specialArgs = {
inherit inputs;
inherit nix-colors;
};
modules = [
disko.nixosModules.disko
./hosts/server/configuration.nix
inputs.home-manager.nixosModules.default
];
};
specialArgs = {
inherit inputs;
inherit nix-colors;
};
modules = [
disko.nixosModules.disko
./hosts/server/configuration.nix
inputs.home-manager.nixosModules.default
];
};
};
};
}

6
hosts/default/configuration.nix
View file

@ -224,6 +224,12 @@
settings.PasswordAuthentication = false;
settings.KbdInteractiveAuthentication = false;
};
syncthing = {
enable = true;
user = "noa";
dataDir = "/home/noa/Sync";
configDir = "/home/noa/Sync/.config/syncthing";
};
xserver = {
enable = true;
xkb = {

5
hosts/default/hardware-configuration.nix
View file

@ -23,6 +23,11 @@
fsType = "vfat";
};
fileSystems."/home/noa/Sync" =
{ device = "/dev/disk/by-uuid/93a74173-8719-4be2-86b3-dc80588b9cf8";
fsType = "ext4";
};
swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking

2
hosts/default/home.nix
View file

@ -66,6 +66,8 @@
nodejs
opam
stack
rustup
bend
localsend
];

1
modules/hyprland.nix
View file

@ -67,6 +67,7 @@ in
monitor = [
"DP-3,2560x1440@360,2560x0,1"
"DP-2,2560x1440@144,0x0,1"
"Unknown-1,disable" # NOTE: due to a driver bug a third monitor appears
];
windowrulev2 = [
"opacity 1.0 0.6,class:^(kitty)$"