Compare commits

...

56 Commits

Author SHA1 Message Date
2358de9037 Update Makefile 2026-03-04 09:38:06 -07:00
10778b2d85 Renamed rebuild to build 2026-03-04 09:36:17 -07:00
1f596f832f Added supersonic 2026-03-02 17:49:45 -07:00
b23ad485c9 1772314653 2026-02-28 14:37:33 -07:00
1914dcd527 1772314503 2026-02-28 14:35:03 -07:00
50d19660d6 1772314204 2026-02-28 14:30:04 -07:00
2ca3bb5277 1772313622 2026-02-28 14:20:22 -07:00
14af2478e7 1772313404 2026-02-28 14:16:44 -07:00
eb21f28aec 1772312646 2026-02-28 14:04:06 -07:00
ffca94ea16 1772312556 2026-02-28 14:02:36 -07:00
d11a98e0e4 1771993415 2026-02-24 21:23:35 -07:00
9167ad2b6d 1771993253 2026-02-24 21:20:53 -07:00
8438ba2934 1771993195 2026-02-24 21:19:55 -07:00
9ad1b9e275 1771992662 2026-02-24 21:11:02 -07:00
39b664ed33 1771992612 2026-02-24 21:10:12 -07:00
78a2e5bac8 Fix audio 2026-02-24 21:03:25 -07:00
58d759f6fc 1771964017 2026-02-24 13:13:37 -07:00
4dac10e2a1 1771963691 2026-02-24 13:08:11 -07:00
0ea327729a Remove syncthing 2026-02-24 00:12:44 -07:00
7d7d4bc9e6 Update librewolf.nix 2026-02-23 15:00:37 -07:00
9a2e2f8e5f Updated lockfile 2026-02-23 14:50:44 -07:00
0e305c226b Add fastmail + search engine config 2026-02-23 14:50:09 -07:00
432d5df195 Cleanup with LSP guidance 2026-02-17 15:21:54 -07:00
8ef20405ba Update librewolf.nix 2026-02-16 23:33:39 -07:00
4d584b351a Update README.md 2026-02-16 23:31:34 -07:00
2c7f4e5de6 Update modules/home/librewolf.nix 2026-02-16 16:20:00 -07:00
bd65374258 Update modules/home/librewolf.nix 2026-02-16 16:08:15 -07:00
9f5fdfff1a Update modules/home/librewolf.nix 2026-02-16 15:44:17 -07:00
d248862921 1771220302 2026-02-15 22:38:22 -07:00
eb69a1f4e6 1771220158 2026-02-15 22:35:58 -07:00
676a7c1151 1771219793 2026-02-15 22:29:53 -07:00
4c8579a5c0 1770871383 2026-02-11 21:43:03 -07:00
01e412a41b 1770869959 2026-02-11 21:19:19 -07:00
bc2dacc391 1770869734 2026-02-11 21:15:34 -07:00
c03cd11a12 Update flake.lock 2026-02-10 17:57:56 -07:00
d0fec282af Fix some warnings 2026-02-10 17:57:25 -07:00
bde0172955 oof 2026-02-10 17:55:07 -07:00
fa4023731a Back to DEs 2026-02-10 17:52:16 -07:00
d7ce4f69cc CLI section 2026-02-08 00:59:41 -07:00
c6dd3ccfb8 1770523227 2026-02-07 21:00:27 -07:00
480fe8173f 1770523020 2026-02-07 20:57:00 -07:00
960a63e48c 1770522968 2026-02-07 20:56:08 -07:00
4dfee51548 1770518345 2026-02-07 19:39:05 -07:00
ff3e9ef40d 1770510070 2026-02-07 17:21:10 -07:00
f1c4902466 1770344115 2026-02-05 19:15:15 -07:00
2a922d572e 1770343091 2026-02-05 18:58:11 -07:00
b899ae7f20 1770342677 2026-02-05 18:51:17 -07:00
a3607a87a3 1770247128 2026-02-04 16:18:48 -07:00
3a83ffaaa2 1770246762 2026-02-04 16:12:42 -07:00
b482da2727 1770245979 2026-02-04 15:59:39 -07:00
86e81e89d3 1770245881 2026-02-04 15:58:01 -07:00
938b320009 1770245770 2026-02-04 15:56:10 -07:00
c3ff2decad 1770245610 2026-02-04 15:53:30 -07:00
40343553ee Merge pull request 'Move to flakes ❄️' (#1) from flake into main
Reviewed-on: #1
2026-02-04 22:49:39 +00:00
e58683ffce 1770244892 2026-02-04 15:41:32 -07:00
d80a9be891 Flake Experiment 2026-02-04 14:58:17 -07:00
27 changed files with 436 additions and 119 deletions

1
.gitignore vendored
View File

@@ -1,3 +1,2 @@
# User-specific configuration (generated by make init) # User-specific configuration (generated by make init)
hardware-configuration.nix
.DS_Store .DS_Store

View File

@@ -1,8 +1,9 @@
.PHONY: init install link unlink rebuild update purge edit hw help .PHONY: init install link unlink build update purge edit hw help
NIXOS_DIR := /etc/nixos NIXOS_DIR := /etc/nixos
REPO_DIR := $(shell pwd) REPO_DIR := $(shell pwd)
SETTINGS := settings.nix SETTINGS := settings.nix
HOSTNAME := $(shell grep 'hostname =' $(SETTINGS) | cut -d '"' -f 2)
# Colors for output # Colors for output
GREEN := \033[0;32m GREEN := \033[0;32m
@@ -11,12 +12,12 @@ RED := \033[0;31m
NC := \033[0m # No Color NC := \033[0m # No Color
help: help:
@echo "NixOS Config" @echo "NixOS Config (Flake)"
@echo "" @echo ""
@echo " make init - first time setup" @echo " make init - first time setup"
@echo " make hw - generate hardware-configuration.nix" @echo " make hw - generate hardware-configuration.nix"
@echo " make rebuild - rebuild nixos" @echo " make build - build nixos configuration"
@echo " make update - upgrade + rebuild" @echo " make update - update flake inputs and rebuild"
@echo " make purge - garbage collect" @echo " make purge - garbage collect"
@echo " make link - symlink to /etc/nixos" @echo " make link - symlink to /etc/nixos"
@echo " make unlink - remove symlink" @echo " make unlink - remove symlink"
@@ -47,18 +48,24 @@ unlink:
echo "/etc/nixos is not a symlink"; \ echo "/etc/nixos is not a symlink"; \
fi fi
rebuild: build:
sudo nixos-rebuild switch @if [ -f hardware-configuration.nix ]; then \
git add -f -N hardware-configuration.nix; \
fi
@echo "Rebuilding system for $(HOSTNAME)..."
sudo nixos-rebuild switch --flake .#$(HOSTNAME)
update: update:
sudo nixos-rebuild switch --upgrade @echo "Updating flake inputs..."
nix flake update
@$(MAKE) --no-print-directory rebuild
purge: purge:
sudo nix-collect-garbage -d sudo nix-collect-garbage -d
sudo /run/current-system/bin/switch-to-configuration boot sudo /run/current-system/bin/switch-to-configuration boot
check: check:
nix-instantiate '<nixpkgs/nixos>' -A system --dry-run nix flake check
hw: hw:
sudo nixos-generate-config --show-hardware-config > hardware-configuration.nix sudo nixos-generate-config --show-hardware-config > hardware-configuration.nix

View File

@@ -1,4 +1,4 @@
# Lavitz - My personal NixOS config named after Lavitz from the PS1 classic The Legend of Dragoon # Lavitz - My NixOS desktop configuration named after Lavitz from the PS1 classic The Legend of Dragoon
- Nix Version: 25.11 - Nix Version: 25.11
- DE: Gnome - DE: Gnome

Binary file not shown.

Before

Width:  |  Height:  |  Size: 229 KiB

22
common.nix Normal file
View File

@@ -0,0 +1,22 @@
{ config, pkgs, ... }:
{
imports = [
# Import Modules
./modules/boot.nix
./modules/networking.nix
./modules/locale.nix
./modules/desktop.nix
./modules/audio.nix
./modules/users.nix
./modules/programs.nix
./modules/hardware.nix
./modules/services.nix
./modules/home.nix
];
nix.settings.experimental-features = [ "nix-command" "flakes" ];
# xdg.portal.config.common.default = [ "cosmic" ];
system.stateVersion = "25.11";
}

View File

@@ -1,4 +1,4 @@
{ config, pkgs, ... }: { ... }:
{ {
imports = [ imports = [
@@ -17,8 +17,10 @@
./modules/home.nix ./modules/home.nix
]; ];
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [
# xdg.portal.config.common.default = [ "gnome" ]; "nix-command"
"flakes"
];
system.stateVersion = "25.11"; system.stateVersion = "25.11";
} }

112
flake.lock generated Normal file
View File

@@ -0,0 +1,112 @@
{
"nodes": {
"cosmic-manager": {
"inputs": {
"flake-parts": "flake-parts",
"home-manager": [
"home-manager"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1765831383,
"narHash": "sha256-P5F/VPjjGw7s0AOTPb3z3gxqtH0YkAnd/c9P6QdWrEU=",
"owner": "HeitorAugustoLN",
"repo": "cosmic-manager",
"rev": "819d4d21fb90460dd11416d81d2cff65a53b8a59",
"type": "github"
},
"original": {
"owner": "HeitorAugustoLN",
"repo": "cosmic-manager",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"cosmic-manager",
"nixpkgs"
]
},
"locked": {
"lastModified": 1759362264,
"narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1772302941,
"narHash": "sha256-TL3+ckbOTILXrR0qSK3dJj2BJ0S5yz/YSsUF1oEgd9g=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "9b9142b5fe214c2adabe86257c33e022372b7c96",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-25.11",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1772047000,
"narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1267bb4920d0fc06ea916734c11b0bf004bbe17e",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1771848320,
"narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2fc6539b481e1d2569f25f8799236694180c0993",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"cosmic-manager": "cosmic-manager",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable"
}
}
},
"root": "root",
"version": 7
}

42
flake.nix Normal file
View File

@@ -0,0 +1,42 @@
{
description = "Lavitz Configuration";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = {
url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs";
};
cosmic-manager = {
url = "github:HeitorAugustoLN/cosmic-manager";
inputs = {
nixpkgs.follows = "nixpkgs";
home-manager.follows = "home-manager";
};
};
};
outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }@inputs:
let
settings = import ./settings.nix;
system = "x86_64-linux";
overlay-unstable = final: prev: {
unstable = import nixpkgs-unstable {
inherit system;
config.allowUnfree = true;
};
};
in {
nixosConfigurations."${settings.hostname}" = nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = { inherit inputs; };
modules = [
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
./configuration.nix
home-manager.nixosModules.home-manager
];
};
};
}

View File

@@ -0,0 +1,33 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/1d9c0c94-23d1-4acf-8e68-39cec48dc75a";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/AE5D-3C23";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/59acaf1c-702d-4547-a118-d8b5b16009a8"; }
];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View File

@@ -1,4 +1,4 @@
{ config, pkgs, ... }: { pkgs, ... }:
{ {
security.rtkit.enable = true; security.rtkit.enable = true;
@@ -12,22 +12,23 @@
wireplumber.enable = true; wireplumber.enable = true;
}; };
# Main Pipewire graph configuration # Elgato makes shit products and they should feel bad :c
services.pipewire.extraConfig.pipewire."92-low-latency" = { services.pipewire.wireplumber.extraConfig."51-wave3" = {
"context.properties" = { "monitor.alsa.rules" = [
"default.clock.rate" = 48000; {
"default.clock.quantum" = 1024; matches = [
"default.clock.min-quantum" = 32; {
"default.clock.max-quantum" = 8192; "node.name" = "~alsa_input.usb-Elgato_Systems_Elgato_Wave_3.*";
}; }
}; ];
actions = {
# PulseAudio protocol specific tweaks (Crucial for Steam/Proton) update-props = {
services.pipewire.extraConfig.pipewire-pulse."92-pulse-tweaks" = { "session.suspend-timeout-seconds" = 0;
"pulse.properties" = { "node.pause-on-idle" = false;
"pulse.min.req" = "1024/48000"; };
"pulse.min.quantum" = "1024/48000"; };
}; }
];
}; };
# DeepFilterNet noise reduction filter chain # DeepFilterNet noise reduction filter chain

View File

@@ -1,4 +1,4 @@
{ config, pkgs, ... }: { pkgs, ... }:
{ {
boot.loader.systemd-boot = { boot.loader.systemd-boot = {
@@ -8,10 +8,15 @@
}; };
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.consoleLogLevel = 3;
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
boot.kernelModules = [ "tcp_bbr" ]; boot.kernelModules = [ "tcp_bbr" ];
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = [ "amdgpu" ];
boot.kernelParams = [ "preempt=full" ]; boot.kernelParams = [
"preempt=full"
"quiet"
"udev.log_priority=3"
];
boot.tmp.useTmpfs = true; boot.tmp.useTmpfs = true;
boot.tmp.tmpfsSize = "4G"; boot.tmp.tmpfsSize = "4G";

View File

@@ -1,10 +1,14 @@
{ config, pkgs, ... }: { pkgs, ... }:
{ {
services.displayManager.gdm.enable = true; services.xserver.enable = true;
services.desktopManager.gnome.enable = true;
environment.gnome.excludePackages = with pkgs; [ gnome-tour gnome-user-docs gnome-console epiphany ]; services.desktopManager.gnome.enable = true;
services.displayManager.gdm.enable = true;
services.printing.enable = true; services.printing.enable = true;
environment.gnome.excludePackages = with pkgs; [
epiphany
];
} }

View File

@@ -1,4 +1,4 @@
{ config, pkgs, ... }: { ... }:
{ {
hardware.graphics = { hardware.graphics = {

View File

@@ -1,9 +1,9 @@
{ config, pkgs, ... }: { inputs, ... }:
let let
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-25.11.tar.gz";
settings = import ../settings.nix; settings = import ../settings.nix;
homeModules = [ homeModules = [
inputs.cosmic-manager.homeManagerModules.cosmic-manager
./home/session.nix ./home/session.nix
./home/packages.nix ./home/packages.nix
./home/git.nix ./home/git.nix
@@ -12,14 +12,10 @@ let
./home/librewolf.nix ./home/librewolf.nix
./home/zed.nix ./home/zed.nix
./home/ghostty.nix ./home/ghostty.nix
./home/syncthing.nix ./home/ssh.nix
]; ];
in in
{ {
imports = [
(import "${home-manager}/nixos")
];
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
@@ -29,8 +25,13 @@ in
inherit settings; inherit settings;
}; };
home-manager.users.${settings.username} = { ... }: { home-manager.users.${settings.username} =
imports = homeModules; { config, ... }:
home.stateVersion = "25.11"; {
}; imports = homeModules;
home.stateVersion = "25.11";
home.sessionVariables = {
SSH_AUTH_SOCK = "${config.home.homeDirectory}/.bitwarden-ssh-agent.sock";
};
};
} }

View File

@@ -1,15 +1,17 @@
{ pkgs, ... }: { ... }:
{ {
home.shellAliases = { home.shellAliases = {
# Nix Commands # Nix Commands
"nix:rebuild" = "sudo nixos-rebuild switch"; "nix:build" = "sudo nixos-rebuild switch --flake /etc/nixos";
"nix:update" = "sudo nixos-rebuild switch --upgrade"; "nix:update" = "cd /etc/nixos && nix flake update && sudo nixos-rebuild switch --flake .";
"nix:purge" = "sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot"; "nix:purge" =
"sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot";
"nix:edit" = "$EDITOR /etc/nixos"; "nix:edit" = "$EDITOR /etc/nixos";
"nix:push" = "cd /etc/nixos && git add -A && git commit -m \"$(date -u +%s)\" && git push"; "nix:push" = "cd /etc/nixos && git add -A && git commit -m \"$(date -u +%s)\" && git push";
"nix:pull" = "cd /etc/nixos && git pull"; "nix:pull" = "cd /etc/nixos && git pull";
"nix:hw" = "sudo nixos-generate-config --show-hardware-config > /etc/nixos/hardware-configuration.nix"; "nix:hw" =
"sudo nixos-generate-config --show-hardware-config > /etc/nixos/hardware-configuration.nix";
# Utilities # Utilities
"fixaudio" = "systemctl --user restart pipewire pipewire-pulse wireplumber"; "fixaudio" = "systemctl --user restart pipewire pipewire-pulse wireplumber";

View File

@@ -6,6 +6,8 @@
color-scheme = "prefer-dark"; color-scheme = "prefer-dark";
accent-color = "pink"; accent-color = "pink";
clock-show-weekday = true; clock-show-weekday = true;
clock-show-date = true;
clock-format = "12h";
}; };
"org/gnome/system/location" = { "org/gnome/system/location" = {

View File

@@ -10,6 +10,8 @@
DisableFirefoxStudies = true; DisableFirefoxStudies = true;
DisablePocket = true; DisablePocket = true;
DisableFirefoxAccounts = true; DisableFirefoxAccounts = true;
OfferToSaveLogins = false;
EnableTrackingProtection = true;
FirefoxHome = { FirefoxHome = {
Search = true; Search = true;
@@ -23,12 +25,41 @@
SanitizeOnShutdown = { SanitizeOnShutdown = {
Cache = true; Cache = true;
Cookies = false; Cookies = false;
History = true; History = false;
Sessions = true; Sessions = true;
SiteSettings = false; SiteSettings = false;
OfflineApps = true; OfflineApps = true;
}; };
SearchEngines = {
Default = "Searx Search";
Remove = [
"Google"
"Bing"
"Perplexity"
"Wikipedia (en)"
];
Add = [
{
Name = "Searx Search";
URLTemplate = "https://search.atri.dad/search?q={searchTerms}";
Method = "GET";
IconURL = "https://search.atri.dad/favicon.ico";
Alias = "searx";
Description = "Searx (search.atri.dad)";
}
{
Name = "DuckDuckGo";
URLTemplate = "https://duckduckgo.com/?q={searchTerms}";
SuggestURLTemplate = "https://duckduckgo.com/ac/?q={searchTerms}&type=list";
Method = "GET";
IconURL = "https://duckduckgo.com/favicon.ico";
Alias = "ddg";
Description = "DuckDuckGo";
}
];
};
ExtensionSettings = { ExtensionSettings = {
# Bitwarden # Bitwarden
"{446900e4-71c2-419f-a6a7-df9c091e268b}" = { "{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
@@ -47,28 +78,46 @@
install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
installation_mode = "force_installed"; installation_mode = "force_installed";
}; };
# Catppuccin Theme
"{15cb5e64-94bd-41aa-91cf-751bb1a84972}" = {
install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-macchiato-lavender2/latest.xpi";
installation_mode = "force_installed";
};
}; };
Preferences = { Preferences = {
"browser.startup.homepage" = "about:home"; "browser.startup.homepage" = "about:home";
"extensions.autoDisableScopes" = 0; "extensions.autoDisableScopes" = 0;
"browser.toolbars.bookmarks.visibility" = "always"; "browser.toolbars.bookmarks.visibility" = "always";
"network.cookie.cookieBehavior" = 1; "network.cookie.cookieBehavior" = 1;
"privacy.clearOnShutdown.cookies" = false; "browser.safebrowsing.malware.enabled" = false;
"privacy.clearOnShutdown.history" = false; "browser.safebrowsing.phishing.enabled" = false;
"browser.safebrowsing.blockedURIs.enabled" = false;
"browser.safebrowsing.downloads.enabled" = false;
"browser.safebrowsing.provider.google4.gethashURL" = "";
"browser.safebrowsing.provider.google4.updateURL" = "";
"browser.safebrowsing.provider.google.gethashURL" = "";
"browser.safebrowsing.provider.google.updateURL" = "";
"browser.newtabpage.activity-stream.newtabWallpapers.wallpaper" = "dark-mountain";
"extensions.activeThemeID" = {
Value = "firefox-alpenglow@mozilla.org";
Status = "locked";
};
"privacy.resistFingerprinting" = {
Value = true;
Status = "locked";
};
"browser.ml.chat.enabled" = {
Value = false;
Status = "locked";
};
"browser.ml.chat.sidebar" = {
Value = false;
Status = "locked";
};
"browser.tabs.groups.smart.userEnabled" = {
Value = false;
Status = "locked";
};
"sidebar.revamp" = true;
"sidebar.verticalTabs" = true;
"sidebar.main.tools" = "bookmarks,history,tabs";
"sidebar.visibility" = "always";
}; };
}; };
}; };

View File

@@ -2,10 +2,6 @@
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
# Browsers and comms
discord
signal-desktop
# Development tools # Development tools
gnumake gnumake
openssh openssh
@@ -17,6 +13,12 @@
pavucontrol pavucontrol
texliveFull texliveFull
texlab texlab
nil
nixd
# CLI
bitwarden-cli
tea
# Desktop applications # Desktop applications
bitwarden-desktop bitwarden-desktop
@@ -24,16 +26,17 @@
streamrip streamrip
cider-2 cider-2
zotero zotero
prismlauncher
lrcget lrcget
impression impression
streamcontroller streamcontroller
onlyoffice-desktopeditors onlyoffice-desktopeditors
gnome-keyring
pinta pinta
discord
# GNOME Extensions signal-desktop
gnomeExtensions.appindicator element-desktop
gnomeExtensions.gamemode-shell-extension unstable.fastmail-desktop
supersonic
]; ];
programs.obs-studio.enable = true; programs.obs-studio.enable = true;

View File

@@ -1,4 +1,4 @@
{ config, ... }: { ... }:
{ {
home.file."Assets" = { home.file."Assets" = {
@@ -6,8 +6,7 @@
force = true; force = true;
}; };
home.sessionVariables = { systemd.user.sessionVariables = {
BROWSER = "librewolf"; BROWSER = "librewolf";
SSH_AUTH_SOCK = "${config.home.homeDirectory}/.bitwarden-ssh-agent.sock";
}; };
} }

34
modules/home/ssh.nix Normal file
View File

@@ -0,0 +1,34 @@
{ ... }:
{
programs.ssh = {
enable = true;
enableDefaultConfig = false;
matchBlocks = {
"*" = {
identityAgent = "~/.bitwarden-ssh-agent.sock";
};
"localhost" = {
extraOptions.UserKnownHostsFile = "/dev/null";
};
"tux" = {
hostname = "tuxworld.usask.ca";
user = "atl175";
};
"haschel" = {
hostname = "haschel";
user = "fedora";
};
"lloyd" = {
hostname = "lloyd";
user = "truenas_admin";
};
};
};
xdg.configFile."autostart/gnome-keyring-ssh.desktop".text = ''
[Desktop Entry]
Type=Application
Hidden=true
'';
}

View File

@@ -1,7 +0,0 @@
{ config, pkgs, ... }:
{
services.syncthing = {
enable = true;
};
}

View File

@@ -1,4 +1,4 @@
{ pkgs, ... }: { ... }:
{ {
programs.zed-editor = { programs.zed-editor = {
@@ -44,7 +44,10 @@
languages = { languages = {
"Nix" = { "Nix" = {
language_servers = [ "nil" "nixd" ]; language_servers = [
"nil"
"nixd"
];
format_on_save = "on"; format_on_save = "on";
}; };
}; };

View File

@@ -1,4 +1,4 @@
{ config, pkgs, ... }: { ... }:
let let
settings = import ../settings.nix; settings = import ../settings.nix;

View File

@@ -1,4 +1,4 @@
{ config, pkgs, ... }: { ... }:
let let
settings = import ../settings.nix; settings = import ../settings.nix;
@@ -17,19 +17,27 @@ in
# Allowed ports # Allowed ports
allowedTCPPorts = [ allowedTCPPorts = [
# SyncThing # SyncThing
8384 22000 8384
22000
]; ];
allowedUDPPorts = [ allowedUDPPorts = [
# SyncThing # SyncThing
22000 21027 22000
21027
]; ];
}; };
networking.nameservers = [ "1.1.1.1" "9.9.9.9" ]; networking.nameservers = [
"1.1.1.1"
"9.9.9.9"
];
services.resolved = { services.resolved = {
enable = true; enable = true;
dnsovertls = "opportunistic"; dnsovertls = "opportunistic";
fallbackDns = [ "1.0.0.1" "149.112.112.112" ]; fallbackDns = [
"1.0.0.1"
"149.112.112.112"
];
}; };
} }

View File

@@ -1,4 +1,4 @@
{ config, pkgs, ... }: { pkgs, ... }:
{ {
# Enable unfree globally # Enable unfree globally

View File

@@ -1,10 +1,6 @@
{ config, pkgs, ... }: { pkgs, ... }:
let
settings = import ../settings.nix;
in
{ {
# Hardened OpenSSH
services.openssh = { services.openssh = {
enable = true; enable = true;
ports = [ 22 ]; ports = [ 22 ];
@@ -38,22 +34,22 @@ in
# Sunshine # Sunshine
services.sunshine = { services.sunshine = {
enable = true; enable = true;
autoStart = true; autoStart = true;
capSysAdmin = true; capSysAdmin = true;
openFirewall = true; openFirewall = true;
applications = { applications = {
apps = [ apps = [
{ {
name = "Steam Big Picture"; name = "Steam Big Picture";
cmd = "${pkgs.steam}/bin/steam -gamepadui"; cmd = "${pkgs.steam}/bin/steam -gamepadui";
} }
{ {
name = "Desktop"; name = "Desktop";
cmd = "${pkgs.coreutils}/bin/true"; cmd = "${pkgs.coreutils}/bin/true";
} }
]; ];
}; };
}; };
services.avahi.publish.enable = true; services.avahi.publish.enable = true;

View File

@@ -1,4 +1,4 @@
{ config, pkgs, ... }: { ... }:
let let
settings = import ../settings.nix; settings = import ../settings.nix;