add stuff

This commit is contained in:
Lukas Heiligenbrunner 2023-12-21 21:48:41 +01:00
parent 24676bfeea
commit a3aea9e734
8 changed files with 89 additions and 26 deletions

View File

@ -89,7 +89,7 @@
users.users.lukas = { users.users.lukas = {
isNormalUser = true; isNormalUser = true;
description = "Lukas Heiligenbrunner"; description = "Lukas Heiligenbrunner";
extraGroups = [ "networkmanager" "wheel" ]; extraGroups = [ "networkmanager" "wheel" "docker"];
}; };
# Allow unfree packages # Allow unfree packages

View File

@ -20,6 +20,7 @@
shellAliases = { shellAliases = {
ll = "ls -l"; ll = "ls -l";
up = "nix flake update && nixos-rebuild switch --flake .#laptop"; up = "nix flake update && nixos-rebuild switch --flake .#laptop";
inst = "nixos-rebuild switch --flake .#laptop";
gc = "nix-env --delete-generations +5 -p /nix/var/nix/profiles/system && nix store gc"; gc = "nix-env --delete-generations +5 -p /nix/var/nix/profiles/system && nix store gc";
listgen = "nix-env -p /nix/var/nix/profiles/system --list-generations"; listgen = "nix-env -p /nix/var/nix/profiles/system --list-generations";
}; };

View File

@ -79,10 +79,15 @@ in {
dconf.settings = { dconf.settings = {
"org/gnome/nautilus/preferences" = { "org/gnome/nautilus/preferences" = {
default-folder-viewer = "list-view"; default-folder-viewer = "list-view";
show-delete-permanently = true;
show-create-link = true;
}; };
"org/gnome/nautilus/list-view" = { "org/gnome/nautilus/list-view" = {
default-zoom-level = "small"; default-zoom-level = "small";
}; };
"org/gtk/gtk4/settings/file-chooser" = {
sort-directories-first = true;
};
}; };
# set git names # set git names

View File

@ -29,10 +29,14 @@
# cli util to upate hardware # cli util to upate hardware
services.fwupd.enable = true; services.fwupd.enable = true;
programs.steam.enable = true; programs.steam.enable = true;
virtualisation.docker.enable = true;
# use zsh shell # use zsh shell
programs.zsh.enable = true; programs.zsh.enable = true;
# enable virtualization support for eg. boxes
virtualisation.libvirtd.enable = true;
# packages in global env # packages in global env
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# system utilities # system utilities
@ -47,7 +51,8 @@
neofetch neofetch
dmidecode dmidecode
#(pkgs.callPackage ./resources.nix { }) (pkgs.callPackage ./resources.nix { })
bottles
# web # web
firefox firefox
@ -55,6 +60,7 @@
openscad openscad
vscode vscode
git git
ninja
flutter flutter
prusa-slicer prusa-slicer
@ -62,11 +68,18 @@
discord discord
rustup rustup
gcc
sqlite
sea-orm-cli
poetry
python3
## ides ## ides
jetbrains.idea-ultimate jetbrains.idea-ultimate
jetbrains.dataspell jetbrains.dataspell
jetbrains.rust-rover
gnome-builder gnome-builder
gnome.gnome-boxes
## R statistics stuff ## R statistics stuff
rstudio rstudio
@ -85,7 +98,15 @@
diebahn diebahn
appflowy appflowy
kicad kicad
authenticator
dialect
gnome-decoder
video-trimmer
pods
eyedropper
gaphor
] ++ ([ ] ++ ([
custompkgs.resources #custompkgs.resources
]); ]);
} }

View File

@ -13,23 +13,25 @@
, glib , glib
, gtk4 , gtk4
, libadwaita , libadwaita
, dmidecode
, util-linux
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "resources"; pname = "resources";
version = "1.2.1"; version = "1.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nokyan"; owner = "nokyan";
repo = pname; repo = "resources";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-OVz1vsmOtH/5sEuyl2BfDqG2/9D1HGtHA0FtPntKQT0="; hash = "sha256-OVz1vsmOtH/5sEuyl2BfDqG2/9D1HGtHA0FtPntKQT0=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit (finalAttrs) src;
name = "${pname}-v${version}"; name = "resources-${finalAttrs.version}";
hash = "sha256-JxcqHM7jccZ+YwU93AejXejZK1bj7IggO1QrE5cSPYU="; hash = "sha256-MNYKfvbLQPWm7MKS5zYGrc+aoC9WeU5FTftkCrogZg0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -50,15 +52,26 @@ stdenv.mkDerivation rec {
libadwaita libadwaita
]; ];
postPatch = ''
substituteInPlace src/utils/memory.rs \
--replace '"dmidecode"' '"${dmidecode}/bin/dmidecode"'
substituteInPlace src/utils/cpu.rs \
--replace '"lscpu"' '"${util-linux}/bin/lscpu"'
substituteInPlace src/utils/memory.rs \
--replace '"pkexec"' '"/run/wrappers/bin/pkexec"'
'';
mesonFlags = [ mesonFlags = [
"-Dprofile=default" (lib.mesonOption "profile" "default")
]; ];
meta = { meta = {
description = "Resources"; changelog = "https://github.com/nokyan/resources/releases/tag/${finalAttrs.version}";
description = "Monitor your system resources and processes";
homepage = "https://github.com/nokyan/resources"; homepage = "https://github.com/nokyan/resources";
license = lib.licenses.gpl3Only; license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ dotlambda foo-dogsquared ]; mainProgram = "resources";
platforms = lib.platforms.all; maintainers = with lib.maintainers; [ lukas-heiligenbrunner ewuuwe ];
platforms = lib.platforms.linux;
}; };
} })

View File

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"customnixpkgs": { "customnixpkgs": {
"locked": { "locked": {
"lastModified": 1701032485, "lastModified": 1701463092,
"narHash": "sha256-k7vaOoXSEge6cFAtLo9jqSwyfZsAMy5FcI7CoLZUO1k=", "narHash": "sha256-qMaqNsI+PjQ2q/16DsYiceODw6w6ZhMEzKLGgIVJz60=",
"owner": "lukas-heiligenbrunner", "owner": "lukas-heiligenbrunner",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "65fe93c4b879f64081e43539628ceb0b15078842", "rev": "ed03ef9581aec66515be7d57aa002dacac9bcd48",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -23,11 +23,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700900274, "lastModified": 1703147088,
"narHash": "sha256-KWoKDP5I1viHR4bG3ENnJ7H1DD16tXWH4ROvS0IfXw8=", "narHash": "sha256-6yBZjzzj4Flruh8zFilqx+OzDT8oFBliV3Fy1V2l/lA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a462e7315deaa8194b0821f726709bb7e51a850c", "rev": "b897544a798d487044d7356ff4cf6d4748ac231a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -38,11 +38,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1701020860, "lastModified": 1702453208,
"narHash": "sha256-NwnRn04C8s+hH+KdVtGmVB1FFNIG7DtPJmQSCBDaET4=", "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b006ec52fce23b1d57f6ab4a42d7400732e9a0a2", "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -54,11 +54,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1700794826, "lastModified": 1703013332,
"narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -49,6 +49,28 @@
} }
]; ];
}; };
exampleIso = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit custompkgs; };
modules = [
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix"
./common/configuration.nix
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.lukas = {
imports = [ ./common/home.nix ];
};
home-manager.users.root = {
imports = [ ./common/home-root.nix ];
};
}
];
};
}; };
}; };
} }

1
result Symbolic link
View File

@ -0,0 +1 @@
/nix/store/12ch8gwvwmqqmk4gfqw9ypzg08sp9av2-nixos-24.05.20231204.2c7f3c0-x86_64-linux.iso