steph/os
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

broke everything :)

Browse Source
This commit is contained in:
Steph 2024-07-01 22:40:58 +02:00
parent d67002cf3b
commit 809104eda3
5 changed files with 79 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
configuration.nix
View File

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, ... }: { config, pkgs, inputs, ... }:
{ {
imports = imports =
@ -29,8 +29,6 @@
# Enable networking # Enable networking
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
boot.supportedFilesystems = [ "ntfs" ];
# Set your time zone. # Set your time zone.
time.timeZone = "Europe/Amsterdam"; time.timeZone = "Europe/Amsterdam";
@ -61,8 +59,8 @@
# Configure keymap in X11 # Configure keymap in X11
services.xserver = { services.xserver = {
layout = "us"; xkb.layout = "us";
xkbVariant = "euro"; xkb.variant = "euro";
}; };
# Enable CUPS to print documents. # Enable CUPS to print documents.
@ -108,14 +106,13 @@
description = "Steph"; description = "Steph";
extraGroups = [ "networkmanager" "wheel" "dialout" "podman" "docker" ]; extraGroups = [ "networkmanager" "wheel" "dialout" "podman" "docker" ];
packages = with pkgs; [ packages = with pkgs; [
librewolf-wayland
tdesktop tdesktop
vscodium vscodium
ungoogled-chromium ungoogled-chromium
widevine-cdm widevine-cdm
libreoffice libreoffice
nextcloud-client nextcloud-client
tootle tuba
dino dino
minetest minetest
mumble mumble
@ -126,7 +123,7 @@
endeavour endeavour
zotero zotero
prismlauncher prismlauncher
schildichat-desktop element-desktop
stack stack
sqlite sqlite
sqlite.dev sqlite.dev
@ -150,7 +147,7 @@
# Allow unfree packages # Allow unfree packages
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
fonts.fonts = with pkgs; [ fonts.packages = with pkgs; [
(nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; }) (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; })
noto-fonts noto-fonts
noto-fonts-cjk noto-fonts-cjk
@ -178,7 +175,7 @@
ripgrep ripgrep
bottom bottom
skim skim
exa eza
bat bat
lf lf
fd fd
@ -198,8 +195,8 @@
gnome.gnome-tweaks gnome.gnome-tweaks
gnomeExtensions.tray-icons-reloaded gnomeExtensions.tray-icons-reloaded
gnomeExtensions.emoji-selector #gnomeExtensions.emoji-selector
gnomeExtensions.noannoyance-2 #gnomeExtensions.noannoyance-2
gnomeExtensions.clipboard-history gnomeExtensions.clipboard-history
gnomeExtensions.alphabetical-app-grid gnomeExtensions.alphabetical-app-grid
@ -264,7 +261,29 @@
system.stateVersion = "22.05"; # Did you read the comment? system.stateVersion = "22.05"; # Did you read the comment?
home-manager.users.steph = { home-manager.users.steph = {
home.file.".mozilla/firefox/default/chrome/firefox-gnome-theme".source = inputs.firefox-gnome-theme;
programs.firefox.enable = true;
programs.firefox.package = pkgs.librewolf-wayland;
home.file.".librewolf".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.mozilla" ;
programs.firefox.profiles.default = {
userChrome = ''
@import "firefox-gnome-theme/userChrome.css";
'';
userContent = ''
@import "firefox-gnome-theme/userContent.css";
'';
settings = {
# Firefox gnome theme ## - https://github.com/rafaelmardojai/firefox-gnome-theme/blob/7cba78f5216403c4d2babb278ff9cc58bcb3ea66/configuration/user.js
# (copied into here because home-manager already writes to user.js)
"toolkit.legacyUserProfileCustomizations.stylesheets" = true; # Enable customChrome.cs
"browser.uidensity" = 0; # Set UI density to normal
"svg.context-properties.content.enabled" = true; # Enable SVG context-propertes
"browser.theme.dark-private-windows" = false; # Disable private window dark theme
};
};
home.stateVersion = "22.05"; home.stateVersion = "22.05";
home.packages = [ pkgs.fortune ]; home.packages = [ pkgs.fortune ];

51
flake.lock
View File

@ -1,63 +1,64 @@
{ {
"nodes": { "nodes": {
"firefox-gnome-theme": {
"flake": false,
"locked": {
"lastModified": 1719758591,
"narHash": "sha256-3DE/UnxJxRWjtWPZuuiT3TIG7HrHf+srpmiCTFkrAQs=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"rev": "8fb5267c5b3434f76983e29749aba7cd636e03ca",
"type": "github"
},
"original": {
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"type": "github"
}
},
"home": { "home": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ]
"utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1676257154, "lastModified": 1719827385,
"narHash": "sha256-eW3jymNLpdxS5fkp9NWKyNtgL0Gqtgg1vCTofKXDF1g=", "narHash": "sha256-qs+nU20Sm8czHg3bhGCqiH+8e13BJyRrKONW34g3i50=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2cb27c79117a2a75ff3416c3199a2dc57af6a527", "rev": "391ca6e950c2525b4f853cbe29922452c14eda82",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-22.11", "ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1676895851, "lastModified": 1719707984,
"narHash": "sha256-xdhBKw2el790G+88tZYpRWlP9VjQC9OLR5Jx84VPe08=", "narHash": "sha256-RoxIr/fbndtuKqulGvNCcuzC6KdAib85Q8gXnjzA1dw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e19f25b587f15871d26442cfa1abe4418a815d7d", "rev": "7dca15289a1c2990efbe4680f0923ce14139b042",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-22.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"root": { "root": {
"inputs": { "inputs": {
"firefox-gnome-theme": "firefox-gnome-theme",
"home": "home", "home": "home",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
},
"utils": {
"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"
}
} }
}, },
"root": "root", "root": "root",

10
flake.nix
View File

@ -2,13 +2,15 @@
description = "A very basic flake"; description = "A very basic flake";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
home.url = "github:nix-community/home-manager/release-22.11"; home.url = "github:nix-community/home-manager/release-24.05";
home.inputs.nixpkgs.follows = "nixpkgs"; home.inputs.nixpkgs.follows = "nixpkgs";
firefox-gnome-theme = { url = "github:rafaelmardojai/firefox-gnome-theme"; flake = false; };
}; };
outputs = { self, nixpkgs, home }: { outputs = { self, nixpkgs, home, firefox-gnome-theme }@inputs: {
nixosConfigurations.iota = nixpkgs.lib.nixosSystem { nixosConfigurations.iota = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
@ -18,6 +20,7 @@
imports = [ imports = [
./configuration.nix ./configuration.nix
./hardware-configuration/iota.nix ./hardware-configuration/iota.nix
{_module.args = {inherit inputs;};}
]; ];
}]; }];
}; };
@ -29,6 +32,7 @@
imports = [ imports = [
./configuration.nix ./configuration.nix
./hardware-configuration/tau.nix ./hardware-configuration/tau.nix
{_module.args = {inherit inputs;};}
]; ];
}]; }];
}; };

22
hardware-configuration/tau.nix
View File

@ -8,23 +8,26 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/36d680ca-bdd7-47d2-8975-b1382688fc8e"; { device = "/dev/disk/by-uuid/59bdfb89-0394-4a11-b8d3-939c1f543aa3";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot/efi" = boot.initrd.luks.devices."luks-5ae87f71-0b71-4a1c-90e7-e41dad41965c".device = "/dev/disk/by-uuid/5ae87f71-0b71-4a1c-90e7-e41dad41965c";
{ device = "/dev/disk/by-uuid/C1EF-2008";
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/6CDA-4F23";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
}; };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/492b45b0-24e1-451e-b90f-a2741f1e5e86"; } [ { device = "/dev/disk/by-uuid/b436250d-3a24-4e9e-bf79-b638eb083119"; }
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@ -35,13 +38,14 @@
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;
# networking.interfaces.wwp0s20f0u6i12.useDHCP = lib.mkDefault true; # networking.interfaces.wwp0s20f0u6i12.useDHCP = lib.mkDefault true;
networking.hostName = "tau"; # Define your hostname.
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
# Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.loader.efi.efiSysMountPoint = "/boot/efi";
boot.initrd.luks.devices."luks-d86d9bcd-df3d-4fbe-b0c0-66297852fc46".device = "/dev/disk/by-uuid/d86d9bcd-df3d-4fbe-b0c0-66297852fc46";
networking.hostName = "tau"; # Define your hostname.
} }

2
kakoune.nix
View File

@ -160,7 +160,7 @@ let
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
paths = with kakounePlugins; [ paths = with kakounePlugins; [
kak-lsp kakoune-lsp
lsp-config lsp-config
]; ];