Compare commits

..

No commits in common. "f7fc1269611a33419254d743f5105d36eac008b4" and "69e23e56249c83f7243fb6f442d78b4965cfe1f5" have entirely different histories.

8 changed files with 21 additions and 110 deletions

View File

@ -141,16 +141,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716736833, "lastModified": 1716729592,
"narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", "narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", "rev": "2c78a57c544dd19b07442350727ced097e1aa6e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05", "ref": "release-23.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -315,16 +315,16 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1717090882, "lastModified": 1716633019,
"narHash": "sha256-Up5tvtY9YlVEyVn9hfZcxFQi5qVhQ5hdVNGPQOUchNw=", "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d24e7fdcfaecdca496ddd426cae98c9e2d12dfe8", "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.05", "ref": "nixos-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View File

@ -2,10 +2,10 @@
description = "My System flake"; description = "My System flake";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.url = "github:nix-community/home-manager/release-23.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
ozai.url = "git+https://git.pvv.ntnu.no/Projects/ozai.git"; ozai.url = "git+https://git.pvv.ntnu.no/Projects/ozai.git";

View File

@ -1,84 +0,0 @@
{ config, pkgs, lib, ... }:
{
imports =
[
];
environment.systemPackages = with pkgs; [
libsForQt5.qt5ct
qt6Packages.qt6ct
waybar
networkmanagerapplet
networkmanager
libsForQt5.networkmanager-qt
wdisplays
swaylock-effects
#swaylock-fancy #migth change to this default may look prettier.
foot
## possible other options
#kitty
#alacrity
wofi
wofi-emoji
bemoji
brightnessctl
pavucontrol
#screenshots
grim
slurp
swaybg
workstyle
#swayest-workstyle #migth switch to this.
autotiling-rs
wleave
pass-wayland
];
fonts.packages = with pkgs; [
noto-fonts
noto-fonts-cjk
noto-fonts-emoji
liberation_ttf
fira-code
fira-code-symbols
dina-font
proggyfonts
nerdfonts
ubuntu_font_family
zpix-pixel-font
font-awesome
font-awesome_5
font-awesome_4
];
services.xserver.displayManager.sddm.enable = true;
qt.platformTheme = "qt5c";
# Configure keymap in X11
services.xserver = {
layout = "no";
xkbVariant = "";
};
#TODO: add sway config with home manager to get proper dotfiles.
}

View File

@ -19,8 +19,8 @@
# The global useDHCP flag is deprecated, therefore explicitly set to false here. # The global useDHCP flag is deprecated, therefore explicitly set to false here.
# Per-interface useDHCP will be mandatory in the future, so this generated config # Per-interface useDHCP will be mandatory in the future, so this generated config
# replicates the default behaviour. # replicates the default behaviour.
networking.useDHCP = true; networking.useDHCP = false;
# networking.interfaces.ens3.useDHCP = true; # Interface is not constant. I really only want to use dhcp att all so could remove this in favor of the old way. networking.interfaces.ens3.useDHCP = true; # Interface is not constant. I really only want to use dhcp att all so could remove this in favor of the old way.
networking.hostName = "elrond"; # Define your hostname. networking.hostName = "elrond"; # Define your hostname.
boot.kernel.sysctl = { boot.kernel.sysctl = {

View File

@ -32,7 +32,6 @@
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = "galadriel"; # Define your hostname. networking.hostName = "galadriel"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
@ -93,7 +92,10 @@
#services.polaris.enable = true; #services.polaris.enable = true;
#services.navidrome.enable = true; #services.navidrome.enable = true;
#services.podgrab.enable = true;
#services.podgrab.port = 4242;
#services.calibre-web.enable = true; #services.calibre-web.enable = true;
#services.calibre-server.enable = true; #services.calibre-server.enable = true;

View File

@ -41,10 +41,9 @@
# Enable the CUDA toolkit # Enable the CUDA toolkit
#install packages #install packages
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
#cudaPackages.cudnn cudaPackages.cudnn
#cudaPackages.cudatoolkit cudaPackages.cudatoolkit
nvtop-nvidia
nvtopPackages.nvidia
#cudaPackages.tensorrt_8_6_0 #needs to be added manually, to the store and is a pain because of the license agreement and garbage collection #cudaPackages.tensorrt_8_6_0 #needs to be added manually, to the store and is a pain because of the license agreement and garbage collection
]; ];

View File

@ -9,7 +9,6 @@ imports =
../packages/vim.nix ../packages/vim.nix
#../home/home-full.nix #../home/home-full.nix
../home/sway.nix
../packages/steam.nix ../packages/steam.nix
]; ];
@ -22,9 +21,6 @@ imports =
prusa-slicer prusa-slicer
pdfslicer pdfslicer
libsForQt5.qt5ct
qt6Packages.qt6ct
]; ];
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
@ -39,7 +35,6 @@ imports =
proggyfonts proggyfonts
nerdfonts nerdfonts
ubuntu_font_family ubuntu_font_family
]; ];
# Enable CUPS to print documents. # Enable CUPS to print documents.
@ -48,8 +43,6 @@ imports =
services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.plasma5.enable = true;
qt.platformTheme = "qt5c";
# Configure keymap in X11 # Configure keymap in X11
services.xserver = { services.xserver = {
layout = "no"; layout = "no";

View File

@ -58,7 +58,8 @@ networking.firewall.allowPing = true;
#services.avahi.openfirewall = true; #services.avahi.openfirewall = true;
services.avahi = { services.avahi = {
enable = true; enable = true;
nssmdns4 = true; nssmdns = true;
#nssmdns4 = true;
publish = { publish = {
enable = true; enable = true;
addresses = true; addresses = true;