v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Actions Packages Projects Releases Activity

update laptop

Browse source
This commit is contained in:
Vivian 2022-09-07 14:25:42 +02:00
parent 8be9000dc1
commit c54dff4fb1
4 changed files with 135 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

145
flake.lock
View file

@ -27,7 +27,7 @@
"deploy-rs": {
"inputs": {
"flake-compat": "flake-compat_2",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_4",
"utils": "utils_4"
},
"locked": {
@ -43,6 +43,28 @@
"type": "indirect"
}
},
"fenix": {
"inputs": {
"nixpkgs": [
"riff",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1662186434,
"narHash": "sha256-N867s0Z20q9LNirVftWoKAmkEARmmHXZHyRTEmekf94=",
"owner": "nix-community",
"repo": "fenix",
"rev": "e228867146581fa5e4be25dafc0dd68fdd22f0ad",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
@ -206,11 +228,11 @@
"wlroots": "wlroots"
},
"locked": {
"lastModified": 1662487199,
"narHash": "sha256-U4M9TdcGU/YMMP4pCcTldxiecPb40X4hHvuyH6+oSiU=",
"lastModified": 1662548716,
"narHash": "sha256-HKkDvjqLn0652ovUk/8u7uFOF3CEq3F3D/EnewrlROY=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "789eedd115917bc0ae7e5ee7317af67295439fd8",
"rev": "6e195a6b8cb98e96d15c51003da4b17154c55ff3",
"type": "github"
},
"original": {
@ -279,11 +301,11 @@
"utils": "utils_3"
},
"locked": {
"lastModified": 1662169888,
"narHash": "sha256-vXcEbRINemb+ype/JQohaU8TyzUbclOFwiv+soYn6wI=",
"lastModified": 1662515805,
"narHash": "sha256-788jXPFYYYWI8CxHD3IkbjtWMJwcplQWkbdhn5q0qtY=",
"owner": "jyooru",
"repo": "nix-minecraft-servers",
"rev": "7921fbc0656f8e8c5a95f1142aaf07bf6253aa55",
"rev": "2673c4de1c961c433862ccdc64c2c39ea9112736",
"type": "github"
},
"original": {
@ -292,10 +314,31 @@
"type": "github"
}
},
"naersk": {
"inputs": {
"nixpkgs": [
"riff",
"nixpkgs"
]
},
"locked": {
"lastModified": 1662220400,
"narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=",
"owner": "nix-community",
"repo": "naersk",
"rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "naersk",
"type": "github"
}
},
"nix": {
"inputs": {
"lowdown-src": "lowdown-src",
"nixpkgs": "nixpkgs_4"
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1633098935,
@ -336,7 +379,7 @@
"nix_2": {
"inputs": {
"lowdown-src": "lowdown-src_2",
"nixpkgs": "nixpkgs_5"
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1633098935,
@ -384,6 +427,22 @@
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1662099760,
"narHash": "sha256-MdZLCTJPeHi/9fg6R9fiunyDwP3XHJqDd51zWWz9px0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "67e45078141102f45eff1589a831aeaa3182b41e",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1648219316,
"narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=",
@ -399,21 +458,6 @@
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1632864508,
"narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "82891b5e2c2359d7e58d08849e4c89511ab94234",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-21.05-small",
"type": "indirect"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1632864508,
@ -429,6 +473,41 @@
"type": "indirect"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1632864508,
"narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "82891b5e2c2359d7e58d08849e4c89511ab94234",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-21.05-small",
"type": "indirect"
}
},
"riff": {
"inputs": {
"fenix": "fenix",
"naersk": "naersk",
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1662511960,
"narHash": "sha256-YyDpkCmP4IslmGPLI5Npd9Y2PbW4J81o3McB7pnRxXU=",
"owner": "DeterminateSystems",
"repo": "riff",
"rev": "0dbdb5fca5a4c1bbe2a3a81938d9dad13cc4a9ae",
"type": "github"
},
"original": {
"owner": "DeterminateSystems",
"repo": "riff",
"type": "github"
}
},
"root": {
"inputs": {
"colmena": "colmena",
@ -437,10 +516,28 @@
"hyprpaper": "hyprpaper",
"minecraft-servers": "minecraft-servers",
"nixpkgs": "nixpkgs_2",
"riff": "riff",
"serokell-nix": "serokell-nix",
"vault-secrets": "vault-secrets"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1662066014,
"narHash": "sha256-DE4FsE2sxd9nFtG+8+lnv/IBbtf+6rAlKjIdfpWN488=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "93c52e41ec0d297c7512adf5936d8c464c820618",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"serokell-nix": {
"inputs": {
"deploy-rs": "deploy-rs",

4
flake.nix
View file

@ -26,10 +26,12 @@
hyprland.url = "github:hyprwm/Hyprland";
hyprpaper.url = "github:hyprwm/hyprpaper";
hyprpaper.inputs.nixpkgs.follows = "nixpkgs";
riff.url = "github:DeterminateSystems/riff";
};
outputs =
{ self, nixpkgs, vault-secrets, serokell-nix, minecraft-servers, colmena, home-manager, hyprpaper, hyprland, ... }@inputs:
{ self, nixpkgs, vault-secrets, serokell-nix, minecraft-servers, colmena, home-manager, hyprpaper, hyprland, riff, ... }@inputs:
let
inherit (nixpkgs) lib;
inherit (builtins) filter mapAttrs attrValues concatLists;

6
nixos/hosts/thalassa/null/configuration.nix
View file

@ -42,9 +42,9 @@ in
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.victor = import ./home;
home-manager.sharedModules = [
inputs.hyprland.homeManagerModules.default
];
home-manager.extraSpecialArgs = {
inherit inputs;
};
security.pam.services.swaylock = { };

10
nixos/hosts/thalassa/null/home/default.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, fetchFromGithub, ... }:
{ config, pkgs, lib, inputs, ... }:
{
programs.home-manager.enable = true;
home.username = "victor";
@ -6,6 +6,7 @@
home.stateVersion = "22.05";
imports = [
inputs.hyprland.homeManagerModules.default
./hyprland
./eww
./theme.nix
@ -42,11 +43,12 @@
wf-recorder # Screenrecorder
wl-clipboard # Clipboard manager
wofi # Wayland rofi
inputs.riff.packages.x86_64-linux.riff
];
programs.foot = {
enable = true;
};
programs.git = {
@ -95,6 +97,10 @@
};
};
programs.zsh.sessionVariables = {
DIRENV_LOG_FORMAT = "";
};
programs.zsh.enable = true;
gtk = {