nix
/
System
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: nix:17ed0ea6fde83fae95731a3508c2cc68ce37af99
Branches Tags
nix:trunk
..
compare: nix:4b05fafef7cf7e7f14c404557baeb878166abbbf
Branches Tags
nix:trunk

No commits in common. "17ed0ea6fde83fae95731a3508c2cc68ce37af99" and "4b05fafef7cf7e7f14c404557baeb878166abbbf" have entirely different histories.
17ed0ea6fd ... 4b05fafef7

17 changed files with 112 additions and 63 deletions
Show Stats Expand all files Collapse all files

109
flake.lock
View File

@ -41,6 +41,27 @@
"type": "github" "type": "github"
} }
}, },
"fenix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1685254813,
"narHash": "sha256-Pod+U90fDJJml5cwoOvx/KKBF4HmWtK9Cttql5sfwFQ=",
"owner": "nix-community",
"repo": "fenix",
"rev": "2804d7ee704057959d831b038dea0e6845b18658",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -157,19 +178,20 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1685189510, "lastModified": 1681092193,
"narHash": "sha256-Hq5WF7zIixojPgvhgcd6MBvywwycVZ9wpK/8ogOyoaA=", "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2d963854ae2499193c0c72fd67435fee34d3e4fd", "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.05", "ref": "release-22.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -199,11 +221,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1685432784, "lastModified": 1685309749,
"narHash": "sha256-Ap5cHy51L+r2G0Io6OJKMPolQQaFGyPGgKYpONn4p8E=", "narHash": "sha256-RcT9/GLpkMUp5P8tam16VsMbx+gKe5VYHXuL0/b3H90=",
"owner": "idris-lang", "owner": "idris-lang",
"repo": "idris2", "repo": "idris2",
"rev": "50c56eac8f2036f730224fe5eacb8c6e10345f76", "rev": "360136ce25f1f81ed0c6c0e129dd9a6a93ab3efd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -217,14 +239,14 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"utils": "utils" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1685440817, "lastModified": 1685268130,
"narHash": "sha256-Acryuxa+sxVYaNfC99xFuI2EO0jChcs2rdTJ1RtT7KI=", "narHash": "sha256-f/eYXYdUA394VQZpEO6KHJweDuaciC1T/qF8j0qUgU0=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "5c755ffb77e7eb1cf59d4723f413ed685d64bb44", "rev": "f91f4dacfef23969973aa4efaff03a17f90d667b",
"revCount": 39, "revCount": 38,
"type": "git", "type": "git",
"url": "https://git.stranger.systems/nix/java" "url": "https://git.stranger.systems/nix/java"
}, },
@ -239,7 +261,7 @@
"quilt-server", "quilt-server",
"nixpkgs" "nixpkgs"
], ],
"utils": "utils_2" "utils": "utils_3"
}, },
"locked": { "locked": {
"lastModified": 1656122108, "lastModified": 1656122108,
@ -327,11 +349,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1685446848, "lastModified": 1685000237,
"narHash": "sha256-vEU1jynjDXwOJESHeJyABqbY/Y+DoihZq9iDVtYgrMg=", "narHash": "sha256-pm+2xP9g9sh6wapk1ulg7/1DdENkTNDB7Kx+6lwGs/k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "b6114e214e5b546c4cceccd33ee6b72294a76b60", "rev": "05bef004794f352ea12475a89f3f55b4102c0728",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -405,11 +427,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1685383865, "lastModified": 1685168767,
"narHash": "sha256-3uQytfnotO6QJv3r04ajSXbEFMII0dUtw0uqYlZ4dbk=", "narHash": "sha256-wQgnxz0PdqbyKKpsWl/RU8T8QhJQcHfeC6lh1xRUTfk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce", "rev": "e10802309bf9ae351eb27002c85cfdeb1be3b262",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -421,16 +443,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1685356226, "lastModified": 1685215858,
"narHash": "sha256-f2clSOdqi0SvY1WSgbnl2YgCZmoCXOxeUjYeXp8p2zI=", "narHash": "sha256-IRMFoDXA6cYx3ifVw3B2JcC4JrjT5v7tRAx2vro2Ffs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0f7f5ca1cdec8dea85bb4fa60378258171d019ad", "rev": "ba6e4ddeb3e8ad3f3e3bec63dafbc9fe558729bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.05", "ref": "nixos-22.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -540,6 +562,7 @@
"inputs": { "inputs": {
"darwin": "darwin", "darwin": "darwin",
"emacs": "emacs", "emacs": "emacs",
"fenix": "fenix",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"home-manager": "home-manager", "home-manager": "home-manager",
"idris2": "idris2", "idris2": "idris2",
@ -555,6 +578,23 @@
"wsl": "wsl" "wsl": "wsl"
} }
}, },
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1685177170,
"narHash": "sha256-bRURsRZZmBZtQo8OHD/PRslGQC04wed6lWroQaAPSPg=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "f6e3a87bf9478574f8c64ac2efec125bc19b1c64",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"scripts": { "scripts": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_4",
@ -584,11 +624,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1685434555, "lastModified": 1685242617,
"narHash": "sha256-aZl0yeaYX3T2L3W3yXOd3S9OfpS+8YUOT2b1KwrSf6E=", "narHash": "sha256-UBPXGfGwGMJm2Wj9kDj8+TMMK2PTouSM/TpiXYtaqtQ=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "876846cde9762ae563f018c17993354875e2538e", "rev": "3e016341d4dca6ce7c62316f90e66341841a30f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -663,6 +703,21 @@
} }
}, },
"utils_2": { "utils_2": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_3": {
"locked": { "locked": {
"lastModified": 1653893745, "lastModified": 1653893745,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",

17
flake.nix
View File

@ -2,11 +2,11 @@
description = "Nathan's system configurations"; description = "Nathan's system configurations";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-hardware.url = "github:NixOS/nixos-hardware";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.05"; url = "github:nix-community/home-manager/release-22.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-on-droid = { nix-on-droid = {
@ -21,6 +21,10 @@
url = "github:lnl7/nix-darwin/master"; url = "github:lnl7/nix-darwin/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
fenix = {
url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs";
};
emacs = { emacs = {
url = url =
"github:nix-community/emacs-overlay/9b41f8296a3898bdb87b9d091f9df540a982b242"; "github:nix-community/emacs-overlay/9b41f8296a3898bdb87b9d091f9df540a982b242";
@ -183,15 +187,6 @@
./hardware/productivity-vm.nix ./hardware/productivity-vm.nix
]; ];
}; };
# Installer iso
iso_x86_64 = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix"
"${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
];
};
}; };
# Mac systems # Mac systems
darwinConfigurations = { darwinConfigurations = {

5
home-manager/common/programs/devel.nix
View File

@ -49,6 +49,8 @@ with nLib; {
home.packages = with pkgs; [ home.packages = with pkgs; [
# Rustup for having the compiler around # Rustup for having the compiler around
rustup rustup
# Install the latest rust analyzer
inputs.fenix.packages."${pkgs.system}".rust-analyzer
# Misc cargo utilites # Misc cargo utilites
cargo-binutils # Allow invoking the llvm tools included with the toolchain cargo-binutils # Allow invoking the llvm tools included with the toolchain
cargo-edit # Command line Cargo.toml manipulation cargo-edit # Command line Cargo.toml manipulation
@ -100,8 +102,7 @@ with nLib; {
(mkIf devel.haskell { (mkIf devel.haskell {
home.packages = with pkgs; [ home.packages = with pkgs; [
(haskellPackages.ghcWithPackages (haskellPackages.ghcWithPackages
# TODO: readd brittany when its not broken (p: with p; [ turtle cabal-install stack brittany hoogle ]))
(p: with p; [ turtle cabal-install stack hoogle ]))
haskell-language-server haskell-language-server
hlint hlint
]; ];

8
home-manager/common/programs/terminal.nix
View File

@ -18,10 +18,10 @@ in with lib; {
ALACRITTY = "1"; ALACRITTY = "1";
}; };
font = { font = {
normal.family = "Iosevka Nerd Font"; normal.family = "Iosevka Term";
bold.family = "Iosevka Nerd Font"; bold.family = "Iosevka Term";
italic.family = "Iosevka Nerd Font"; italic.family = "Iosevka Term";
bold_italic.family = "Iosevka Nerd Font"; bold_italic.family = "Iosevka Term";
# Bigger on darwin # Bigger on darwin
size = if pkgs.stdenv.isLinux then 10.0 else 12.0; size = if pkgs.stdenv.isLinux then 10.0 else 12.0;
}; };

2
home-manager/linux/programs/sway.nix
View File

@ -303,7 +303,7 @@ in with lib; {
######################### #########################
## Mako (notifications) ## Mako (notifications)
######################### #########################
services.mako = { programs.mako = {
enable = true; enable = true;
# Selenized color scheme # Selenized color scheme
borderColor = "#f275be"; borderColor = "#f275be";

6
machines/fusion/configuration.nix
View File

@ -57,6 +57,8 @@
# Setup gitea # Setup gitea
services.gitea = { services.gitea = {
enable = true; enable = true;
domain = "git.stranger.systems";
rootUrl = "https://git.stranger.systems";
appName = "Stranger Systems Git Mirror"; appName = "Stranger Systems Git Mirror";
lfs.enable = true; lfs.enable = true;
settings = { settings = {
@ -66,10 +68,6 @@
DISABLE_STARS = true; DISABLE_STARS = true;
ENABLE_PUSH_CREATE_ORG = true; ENABLE_PUSH_CREATE_ORG = true;
}; };
server = {
DOMAIN = "git.stranger.systems";
ROOT_URL = "https://git.stranger.systems";
};
}; };
}; };
services.nginx.virtualHosts."git.stranger.systems" = { services.nginx.virtualHosts."git.stranger.systems" = {

2
machines/levitation/home.nix
View File

@ -103,7 +103,7 @@
}; };
# Mako output configuration # Mako output configuration
services.mako = { programs.mako = {
# Lock mako notifs to main display # Lock mako notifs to main display
output = "DP-1"; output = "DP-1";
}; };

1
machines/matrix/configuration.nix
View File

@ -59,6 +59,7 @@
}; };
# Configure bootloader # Configure bootloader
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
boot.loader.grub.version = 2;
boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only
boot.loader.grub.forceInstall = true; boot.loader.grub.forceInstall = true;
boot.loader.timeout = 10; boot.loader.timeout = 10;

2
machines/perception/configuration.nix
View File

@ -62,7 +62,7 @@
extraPackages = with pkgs; [ libva vaapiIntel libvdpau-va-gl vaapiVdpau ]; extraPackages = with pkgs; [ libva vaapiIntel libvdpau-va-gl vaapiVdpau ];
}; };
# Newer kernel # Newer kernel
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_3; boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_2;
# Run plex and the like in containers, these applications get... a little fucky when run directly # Run plex and the like in containers, these applications get... a little fucky when run directly
# on nixos # on nixos
virtualisation.oci-containers.containers = { virtualisation.oci-containers.containers = {

2
machines/productivity-vm/home.nix
View File

@ -65,7 +65,7 @@
systemd.user.services = { }; systemd.user.services = { };
# Mako output configuration # Mako output configuration
services.mako = { programs.mako = {
# Lock mako notifs to main display # Lock mako notifs to main display
output = "Virtual-1"; output = "Virtual-1";
}; };

2
modules/linux/base.nix
View File

@ -14,7 +14,7 @@ with lib; {
(mkIf config.nathan.config.harden (mkIf config.nathan.config.harden
(import "${inputs.nixpkgs}/nixos/modules/profiles/hardened.nix" attrs)) (import "${inputs.nixpkgs}/nixos/modules/profiles/hardened.nix" attrs))
(mkIf config.nathan.config.harden { (mkIf config.nathan.config.harden {
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_1_hardened; boot.kernelPackages = pkgs.linuxPackages_5_18_hardened;
security = { security = {
allowSimultaneousMultithreading = true; allowSimultaneousMultithreading = true;
unprivilegedUsernsClone = true; unprivilegedUsernsClone = true;

1
modules/linux/desktop.nix
View File

@ -15,6 +15,7 @@ in with lib; {
boot.loader = { boot.loader = {
grub = { grub = {
enable = true; enable = true;
version = 2;
efiSupport = true; efiSupport = true;
# Go efi only # Go efi only
devices = [ "nodev" ]; devices = [ "nodev" ];

2
modules/linux/hardware.nix
View File

@ -36,7 +36,7 @@ in with lib; {
services.avahi = { services.avahi = {
enable = true; enable = true;
nssmdns = false; nssmdns = false;
allowInterfaces = [ "enp6s0" ]; interfaces = [ "enp6s0" ];
hostName = "levitation"; hostName = "levitation";
domainName = "local"; domainName = "local";
openFirewall = true; openFirewall = true;

6
modules/linux/services/ssh.nix
View File

@ -16,10 +16,8 @@ in with lib; {
addr = "0.0.0.0"; addr = "0.0.0.0";
port = 22; port = 22;
}]; }];
settings = { permitRootLogin = "no";
PasswordAuthentication = false; passwordAuthentication = false;
PermitRootLogin = "no";
};
}; };
# Enable mosh for connecting from phone or bad internet # Enable mosh for connecting from phone or bad internet

2
modules/linux/swaywm.nix
View File

@ -50,7 +50,7 @@ in with lib; {
}; };
}) })
]; ];
qt.platformTheme = "qt5ct"; qt5.platformTheme = "qt5ct";
# Enable and configure sway itself # Enable and configure sway itself
programs.sway = { programs.sway = {
enable = true; enable = true;

2
modules/linux/user.nix
View File

@ -17,7 +17,7 @@ in with lib; {
# }) # })
# ''; # '';
}; };
programs.fish.enable = true; environment.shells = [ pkgs.fish ];
users = { users = {
mutableUsers = !nc.installUser; mutableUsers = !nc.installUser;
# Configure our user, if enabled # Configure our user, if enabled

6
packages/discord/default.nix
View File

@ -5,7 +5,7 @@
, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss , libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss
, pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript , pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript
, common-updater-scripts, electron, nodePackages, gcc, glibc }: , common-updater-scripts, electron, nodePackages, libgcc, glibc }:
let inherit binaryName; let inherit binaryName;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
autoPatchelfHook autoPatchelfHook
]; ];
buildInputs = [ electron gcc.cc.libgcc glibc ]; buildInputs = [ electron libgcc glibc ];
dontWrapGApps = true; dontWrapGApps = true;
@ -75,7 +75,7 @@ in stdenv.mkDerivation rec {
libXScrnSaver libXScrnSaver
libappindicator-gtk3 libappindicator-gtk3
libdbusmenu libdbusmenu
gcc.cc.libgcc libgcc
]; ];
installPhase = let electron_exec = "${electron}/bin/electron"; installPhase = let electron_exec = "${electron}/bin/electron";