illustris/desktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bump inputs, add netbird

Browse Source
This commit is contained in:
illustris 2024-07-25 06:52:06 +05:30
parent 4a249abf84
commit 0ff4e3ec02
Signed by: illustris
GPG Key ID: 56C8FC0B899FEFA3
6 changed files with 65 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configuration.nix
View File

@ -30,7 +30,10 @@
environment = { environment = {
enableDebugInfo = true; enableDebugInfo = true;
etc.nixpkgs.source = pkgs.path; etc = {
nixpkgs.source = pkgs.path;
hosts.mode = "0644";
};
systemPackages = with pkgs; [ systemPackages = with pkgs; [
asciinema asciinema
bcc bcc
@ -47,7 +50,7 @@
latencytop linuxPackages.perf lsof latencytop linuxPackages.perf lsof
mosh mosh
ncdu neofetch nethogs networkmanager nfs-utils ncdu neofetch nethogs networkmanager nfs-utils
nix-du nix-top nix-prefetch-git nix-tree nix-du nix-prefetch-git nix-tree
nnn nnn
openvpn openvpn
p7zip pciutils powertop pv p7zip pciutils powertop pv
@ -58,7 +61,7 @@
unzip usbutils unzip usbutils
valgrind valgrind
wget wget
youtube-dl yt-dlp
(pass.withExtensions (exts: [ exts.pass-otp ])) (pass.withExtensions (exts: [ exts.pass-otp ]))
] ++ (with illustris; [ ] ++ (with illustris; [
fzpass fzpass
@ -229,6 +232,7 @@
}; };
virtualisation = { virtualisation = {
# containers.cdi.dynamic.nvidia.enable = true;
docker = { docker = {
enable = false; enable = false;
enableNvidia = true; enableNvidia = true;
@ -237,10 +241,7 @@
daemon.settings.bip = "192.168.9.0/22"; daemon.settings.bip = "192.168.9.0/22";
}; };
libvirtd.enable = false; libvirtd.enable = false;
podman = { podman.enable = true;
enable = true;
enableNvidia = true;
};
}; };
xdg.portal.enable = true; xdg.portal.enable = true;
@ -251,7 +252,7 @@
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "21.05"; # Did you read the comment? system.stateVersion = "22.05"; # Did you read the comment?
} }

6
desktop-configuration.nix
View File

@ -32,7 +32,6 @@
}) })
# surf # surf
sxiv sxiv
teams-for-linux
tidal-hifi tidal-hifi
virt-manager virt-manager
vlc vlc
@ -91,7 +90,10 @@
# desktopManager.plasma5.enable = true; # desktopManager.plasma5.enable = true;
dpi = 100; dpi = 100;
# enable = true; # enable = true;
videoDrivers = [ "displaylink" "nvidia" ]; videoDrivers = [
# "displaylink"
"nvidia"
];
wacom.enable = true; wacom.enable = true;
windowManager.dwm.enable = true; windowManager.dwm.enable = true;
displayManager.lightdm.enable = true; displayManager.lightdm.enable = true;

53
flake.lock generated
View File

@ -9,11 +9,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1717316653, "lastModified": 1721463311,
"narHash": "sha256-91VBjCb9A5Sv1N7LpBg0OzTG0DKpvXVAnIT01Ba4lOw=", "narHash": "sha256-zmvqafJogm5DJ8+2v/kE9Oj8AGzK7IBOdMSIPZyKuNk=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "29a3b4c8d5f21dcb359a91d88fd94ae4aa3e6a47", "rev": "863eb5594f8c375d1ddaa2cea84a819c5197dd76",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -45,11 +45,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717316182, "lastModified": 1721534365,
"narHash": "sha256-Xi0EpZcu39N0eW7apLjFfUOR9y80toyjYizez7J1wMI=", "narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9b53a10f4c91892f5af87cf55d08fba59ca086af", "rev": "635563f245309ef5320f80c7ebcb89b2398d2949",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -71,11 +71,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717286932, "lastModified": 1721520570,
"narHash": "sha256-B2nBs+OsNZBdedyYfioifC9LFyg0rWFUrb8JljhCK6I=", "narHash": "sha256-kGrNorYY9G9Twu3dSPpQZNWU3uMYBGlcmk50Qvq5VAg=",
"owner": "illustris", "owner": "illustris",
"repo": "flake", "repo": "flake",
"rev": "611ff0824a1fdeb7503054501025ef4d01d2985e", "rev": "15192cc24d00be4b31df37f4f304a4811fc78d44",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -91,11 +91,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1704021921, "lastModified": 1720662977,
"narHash": "sha256-Z9wRCtt/ufn6oKwycBrAaw5mQD1Y6fswWR7HtOQ1XQ0=", "narHash": "sha256-rk/7zcDafaHT8nUadWOZfY+5RrJUeZo05kvXUZdg/Es=",
"owner": "illustris", "owner": "illustris",
"repo": "nixfs", "repo": "nixfs",
"rev": "c1072f211fb37f4c91bc57f4da5523a79463eefd", "rev": "13b1d7a09825b8dc5e83351224630793ce35020a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -106,11 +106,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716948383, "lastModified": 1721379653,
"narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -120,13 +120,34 @@
"type": "github" "type": "github"
} }
}, },
"nixtop": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1719550824,
"narHash": "sha256-EvRUK9J+E7uzQEJH2EdjVszq38IxxnWHyAu6N0yD2e0=",
"owner": "illustris",
"repo": "nixtop",
"rev": "ab33b604fd369efe76c64cee1bd836aa598ac847",
"type": "github"
},
"original": {
"owner": "illustris",
"repo": "nixtop",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"firefox-addons": "firefox-addons", "firefox-addons": "firefox-addons",
"home-manager": "home-manager", "home-manager": "home-manager",
"illustris": "illustris", "illustris": "illustris",
"nixfs": "nixfs", "nixfs": "nixfs",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"nixtop": "nixtop"
} }
} }
}, },

8
flake.nix
View File

@ -19,13 +19,17 @@
url = "github:illustris/nixfs"; url = "github:illustris/nixfs";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixtop = {
url = "github:illustris/nixtop";
inputs.nixpkgs.follows = "nixpkgs";
};
firefox-addons = { firefox-addons = {
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = { self, nixpkgs, home-manager, illustris, nixfs, ... }@inputs: { outputs = { self, nixpkgs, home-manager, illustris, nixfs, nixtop, ... }@inputs: {
nixosConfigurations = { nixosConfigurations = {
desktop = nixpkgs.lib.nixosSystem { desktop = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
@ -44,6 +48,7 @@
{ {
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
backupFileExtension = "hm-bak";
users.illustris = {...}: { users.illustris = {...}: {
imports = [ imports = [
(import ( (import (
@ -56,6 +61,7 @@
nixfs.nixosModules.nixfs nixfs.nixosModules.nixfs
{services.nixfs.enable = true;} {services.nixfs.enable = true;}
illustris.nixosModules.plasmonad illustris.nixosModules.plasmonad
{environment.systemPackages = [ nixtop.packages.x86_64-linux.nixtop ];}
]; ];
}; };
}; };

1
hardware-configuration.nix
View File

@ -75,6 +75,7 @@
bluetooth.enable = true; bluetooth.enable = true;
# needed by hyperland # needed by hyperland
nvidia.modesetting.enable = true; nvidia.modesetting.enable = true;
nvidia-container-toolkit.enable = true;
opengl.enable = true; opengl.enable = true;
}; };
} }

9
networking-configuration.nix
View File

@ -1,16 +1,21 @@
{ ... }: { pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [
netbird-ui
iftop
];
networking = { networking = {
firewall.enable = false; firewall.enable = false;
hostName = "desktop"; hostName = "desktop";
networkmanager.enable = true; networkmanager.enable = true;
}; };
services = { services = {
netbird.enable = true;
resolved = { resolved = {
enable = true; enable = true;
# git.sr.ht fails to resolve with dnssec # git.sr.ht fails to resolve with dnssec
dnssec = "false"; dnssec = "false";
}; };
zerotierone.enable = true; # zerotierone.enable = true;
}; };
} }