Compare commits
27 commits
v2025.02.4
...
consensus
| Author | SHA1 | Date | |
|---|---|---|---|
4db8c4dff8
|
|||
|
fea5a38301
|
|||
|
29ac04c3cc
|
|||
|
40f4fd6bcf
|
|||
|
6275e0cebc
|
|||
|
ef2da18b89
|
|||
|
2aa3c6d73b
|
|||
|
de62f4b5c1
|
|||
|
0df62cf144
|
|||
|
bba3e78d26
|
|||
|
1b3204e6fc
|
|||
|
24020f8958
|
|||
|
fa658feff8
|
|||
|
61a7d36f73
|
|||
|
57c9a81fff
|
|||
|
9ff082da33
|
|||
|
b96cb32522
|
|||
|
371cca1d7d
|
|||
|
e52012029d
|
|||
|
4abb16c3f1
|
|||
|
d664b153e4
|
|||
|
ca7845d431
|
|||
|
a8a88205a4
|
|||
|
e9eb17c396
|
|||
|
3edc63064a
|
|||
|
1a3c9eae2e
|
|||
|
38d3772d46
|
8 changed files with 356 additions and 53 deletions
56
flake.lock
generated
56
flake.lock
generated
|
|
@ -922,14 +922,15 @@
|
|||
"nixpkgs": [
|
||||
"nixpkgsUnstable"
|
||||
],
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739756353,
|
||||
"narHash": "sha256-UMRlUlCXyIG9jVgDQtKCyDpgjTIHkadVo0DIOayDH6U=",
|
||||
"lastModified": 1747566515,
|
||||
"narHash": "sha256-mBT3EypUn1HZ5iRGDmZQPtVNYxQxnkIsasggSCndYjw=",
|
||||
"owner": "lilyinstarlight",
|
||||
"repo": "nixos-cosmic",
|
||||
"rev": "0d64f87dff6778231ae0288cca71e78e2ab30752",
|
||||
"rev": "93f3add95306179d15f8a6b1cfc87bfdc1702a33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1560,11 +1561,11 @@
|
|||
"flake-compat_13": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1717312683,
|
||||
"narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
|
||||
"lastModified": 1746162366,
|
||||
"narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "flake-compat",
|
||||
"rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
|
||||
"rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -4761,11 +4762,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1739624908,
|
||||
"narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=",
|
||||
"lastModified": 1747335874,
|
||||
"narHash": "sha256-IKKIXTSYJMmUtE+Kav5Rob8SgLPnfnq4Qu8LyT4gdqQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a60651b217d2e529729cbc7d989c19f3941b9250",
|
||||
"rev": "ba8b70ee098bc5654c459d6a95dfc498b91ff858",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -4873,11 +4874,11 @@
|
|||
},
|
||||
"nixpkgsUnstable": {
|
||||
"locked": {
|
||||
"lastModified": 1739797909,
|
||||
"narHash": "sha256-Tawcc3tnPRyqq6cgkhrAeL30ujgpfRObfX9Ffo0G4xc=",
|
||||
"lastModified": 1747014196,
|
||||
"narHash": "sha256-1ICBOfxX31H2MEf/ku/4WYjc38mgBEKp7ZZ9rlR7EDw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6d0e5aea88d0f8fa0d0e1258c65c4f799c46717e",
|
||||
"rev": "cf47c7d239f5e9082a36d9b59644ce7e5f7874f9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -5277,11 +5278,11 @@
|
|||
},
|
||||
"nixpkgs_33": {
|
||||
"locked": {
|
||||
"lastModified": 1740162160,
|
||||
"narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=",
|
||||
"lastModified": 1747485343,
|
||||
"narHash": "sha256-YbsZyuRE1tobO9sv0PUwg81QryYo3L1F3R3rF9bcG38=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9",
|
||||
"rev": "9b5ac7ad45298d58640540d0323ca217f32a6762",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -5758,7 +5759,7 @@
|
|||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-overlay": "rust-overlay"
|
||||
"rust-overlay": "rust-overlay_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726755133,
|
||||
|
|
@ -5789,6 +5790,27 @@
|
|||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"cosmicDesktop",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747535902,
|
||||
"narHash": "sha256-rKWBtLcqQeu8PpfKIBn1ORXS2udSH/MwnQFwfSpFOLg=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "b7a99615d26b82c39b73ccc9026545c3f3403b71",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"rust-overlay_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"ragenix",
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
imports = [
|
||||
../../hardware/lenovo_yoga7i.nix
|
||||
../../profiles/desktopFiona.nix
|
||||
../../profiles/desktop_common.nix
|
||||
];
|
||||
|
||||
# Use the UEFI boot loader.
|
||||
|
|
|
|||
|
|
@ -1,31 +1,16 @@
|
|||
"$schema" = 'https://starship.rs/config-schema.json'
|
||||
|
||||
# Use the color palette
|
||||
palette = "dracula"
|
||||
palette = 'one_dark'
|
||||
|
||||
[aws]
|
||||
style = "bold orange"
|
||||
|
||||
[character]
|
||||
error_symbol = "[λ:](bold red)"
|
||||
success_symbol = "[λ:](bold green)"
|
||||
style = "color_orange"
|
||||
|
||||
[cmd_duration]
|
||||
style = "bold yellow"
|
||||
|
||||
[directory]
|
||||
style = "bold green"
|
||||
|
||||
[git_branch]
|
||||
style = "bold pink"
|
||||
|
||||
[git_status]
|
||||
style = "bold red"
|
||||
style = "color_yellow"
|
||||
|
||||
[hostname]
|
||||
style = "bold purple"
|
||||
|
||||
[username]
|
||||
format = "[$user]($style) on "
|
||||
style_user = "bold cyan"
|
||||
style = "color_purple"
|
||||
|
||||
# Define Dracula color palette
|
||||
[palettes.dracula]
|
||||
|
|
@ -40,3 +25,239 @@ pink = "#ff79c6"
|
|||
purple = "#bd93f9"
|
||||
red = "#ff5555"
|
||||
yellow = "#f1fa8c"
|
||||
|
||||
# Sets the colors of the "one_dark" palette.
|
||||
[palettes.one_dark]
|
||||
mono0 = '#d7dae0' # terminal white, from the One Dark Pro VSCode theme.
|
||||
mono1 = '#abb2bf' # syntax_fg.
|
||||
mono2 = '#828997'
|
||||
mono3 = '#5c6370'
|
||||
mono4 = '#3f4451' # terminal black, from the One Dark Pro VSCode theme.
|
||||
color_red0 = '#e06c75'
|
||||
color_red1 = '#be5046'
|
||||
color_green = '#98c379'
|
||||
color_yellow = '#e5c07b'
|
||||
color_blue = '#61afef'
|
||||
color_purple = '#c678dd'
|
||||
color_cyan = '#56b6c2'
|
||||
color_orange = '#d19a66'
|
||||
syntax_fg = '#abb2bf'
|
||||
syntax_bg = '#282c34'
|
||||
color_bg2 = '#665c54'
|
||||
syntax_gutter = '#647382'
|
||||
syntax_accent = '#528cff'
|
||||
|
||||
# Module that displays the current OS.
|
||||
#[os]
|
||||
#disabled = false # Disabled by default
|
||||
#style = "color_blue"
|
||||
#format = '[ $symbol ]($style)'
|
||||
|
||||
# Sets custom symbols for each OS.
|
||||
#[os.symbols]
|
||||
#NixOS = ""
|
||||
|
||||
# Module that displays the current username.
|
||||
[username]
|
||||
show_always = false
|
||||
style_user = "bold fg:color_red0"
|
||||
style_root = "bold italic bg:color_red0 fg:syntax_bg"
|
||||
format = '[ $user ]($style)'
|
||||
|
||||
# Module that displays the current directory.
|
||||
[directory]
|
||||
style = "fg:color_orange"
|
||||
format = "[ $path ]($style)"
|
||||
truncation_length = 3
|
||||
truncation_symbol = "…/"
|
||||
|
||||
# Sets the custom symbols for directories.
|
||||
[directory.substitutions]
|
||||
"Documents" = " "
|
||||
"Downloads" = " "
|
||||
"Music" = " "
|
||||
"Pictures" = " "
|
||||
"Developer" = " "
|
||||
|
||||
# Module that displays the current git branch.
|
||||
[git_branch]
|
||||
symbol = ""
|
||||
style = "fg:color_yellow"
|
||||
format = '[[ $symbol $branch ](fg:color_yellow)]($style)'
|
||||
|
||||
# Module that displays the current git status.
|
||||
[git_status]
|
||||
style = "bg:color_green"
|
||||
format = '[[($all_status$ahead_behind )](fg:color_yellow)]($style)'
|
||||
|
||||
# Language specific modules
|
||||
[nodejs]
|
||||
symbol = ""
|
||||
style = "bg:color_green"
|
||||
format = '[[ $symbol( $version) ](fg:syntax_bg bg:color_green)]($style)'
|
||||
|
||||
[c]
|
||||
symbol = " "
|
||||
style = "bg:color_green"
|
||||
format = '[[ $symbol( $version) ](fg:syntax_bg bg:color_green)]($style)'
|
||||
|
||||
[dotnet]
|
||||
symbol = ""
|
||||
style = "bg:color_green"
|
||||
format = '[[ $symbol( $version) ](fg:syntax_bg bg:color_green)]($style)'
|
||||
|
||||
[rust]
|
||||
symbol = ""
|
||||
style = "bg:color_green"
|
||||
format = '[[ $symbol( $version) ](fg:syntax_bg bg:color_green)]($style)'
|
||||
|
||||
[golang]
|
||||
symbol = ""
|
||||
style = "bg:color_green"
|
||||
format = '[[ $symbol( $version) ](fg:syntax_bg bg:color_green)]($style)'
|
||||
|
||||
[php]
|
||||
symbol = " "
|
||||
style = "bg:color_green"
|
||||
format = '[[ $symbol( $version) ](fg:syntax_bg bg:color_green)]($style)'
|
||||
|
||||
[java]
|
||||
symbol = " "
|
||||
style = "bg:color_green"
|
||||
format = '[[ $symbol( $version) ](fg:syntax_bg bg:color_green)]($style)'
|
||||
|
||||
[kotlin]
|
||||
symbol = " "
|
||||
style = "bg:color_green"
|
||||
format = '[[ $symbol( $version) ](fg:syntax_bg bg:color_green)]($style)'
|
||||
|
||||
[haskell]
|
||||
symbol = " "
|
||||
style = "bg:color_green"
|
||||
format = '[[ $symbol( $version) ](fg:syntax_bg bg:color_green)]($style)'
|
||||
|
||||
[python]
|
||||
symbol = " "
|
||||
style = "bg:color_green"
|
||||
format = '[[ $symbol( $version) ](fg:syntax_bg bg:color_green)]($style)'
|
||||
|
||||
[elixir]
|
||||
symbol = " "
|
||||
style = "bg:color_green"
|
||||
format = '[[ $symbol ($version) ](fg:syntax_bg bg:color_green)]($style)'
|
||||
|
||||
[elm]
|
||||
symbol = " "
|
||||
style = "bg:color_green"
|
||||
format = '[[ $symbol ($version) ](fg:syntax_bg bg:color_green)]($style)'
|
||||
|
||||
[gradle]
|
||||
symbol = " "
|
||||
style = "bg:color_green"
|
||||
format = '[[ $symbol ($version) ](fg:syntax_bg bg:color_green)]($style)'
|
||||
|
||||
[julia]
|
||||
symbol = " "
|
||||
style = "bg:color_green"
|
||||
format = '[[ $symbol ($version) ](fg:syntax_bg bg:color_green)]($style)'
|
||||
|
||||
[nim]
|
||||
symbol = " "
|
||||
style = "bg:color_green"
|
||||
format = '[[ $symbol ($version) ](fg:syntax_bg bg:color_green)]($style)'
|
||||
|
||||
[scala]
|
||||
symbol = " "
|
||||
style = "bg:color_green"
|
||||
format = '[[ $symbol ($version) ](fg:syntax_bg bg:color_green)]($style)'
|
||||
|
||||
# Module that displays the docker context.
|
||||
[docker_context]
|
||||
symbol = " "
|
||||
style = "bg:mono3"
|
||||
format = '[[ $symbol( $context) ](fg:syntax_fg bg:mono3)]($style)'
|
||||
|
||||
# Module that fills the space between the left and right segments.
|
||||
[fill]
|
||||
symbol = " "
|
||||
|
||||
# Module that displays the time.
|
||||
#[time]
|
||||
#disabled = false # Disabled by default
|
||||
#use_12hr = true # Disable for 24h format without seconds
|
||||
#style = "bg:mono4"
|
||||
#format = '[[ $time ](fg:syntax_fg bg:mono4)]($style)'
|
||||
|
||||
# Module that displays the battery level and status.
|
||||
[battery]
|
||||
format = '[$symbol $percentage ]($style)'
|
||||
|
||||
# Battery symbols and colors for each threshold.
|
||||
[[battery.display]]
|
||||
threshold = 10
|
||||
style = "bold bg:mono4 fg:color_red1"
|
||||
discharging_symbol = ""
|
||||
charging_symbol = ""
|
||||
|
||||
[[battery.display]]
|
||||
threshold = 20
|
||||
style = "bold bg:mono4 fg:color_red0"
|
||||
discharging_symbol = ""
|
||||
charging_symbol = ""
|
||||
|
||||
[[battery.display]]
|
||||
threshold = 30
|
||||
style = "bold bg:mono4 fg:color_yellow"
|
||||
discharging_symbol = ""
|
||||
charging_symbol = ""
|
||||
|
||||
[[battery.display]]
|
||||
threshold = 40
|
||||
style = "bold bg:mono4 fg:color_yellow"
|
||||
discharging_symbol = ""
|
||||
charging_symbol = ""
|
||||
|
||||
[[battery.display]]
|
||||
threshold = 50
|
||||
style = "bold bg:mono4 fg:color_yellow"
|
||||
discharging_symbol = ""
|
||||
charging_symbol = ""
|
||||
|
||||
[[battery.display]]
|
||||
threshold = 60
|
||||
style = "bold bg:mono4 fg:color_green"
|
||||
discharging_symbol = ""
|
||||
charging_symbol = ""
|
||||
|
||||
[[battery.display]]
|
||||
threshold = 70
|
||||
style = "bold bg:mono4 fg:color_green"
|
||||
discharging_symbol = ""
|
||||
charging_symbol = ""
|
||||
|
||||
[[battery.display]]
|
||||
threshold = 80
|
||||
style = "bold bg:mono4 fg:color_green"
|
||||
discharging_symbol = ""
|
||||
charging_symbol = ""
|
||||
|
||||
[[battery.display]]
|
||||
threshold = 90
|
||||
style = "bold bg:mono4 fg:color_green"
|
||||
discharging_symbol = ""
|
||||
charging_symbol = ""
|
||||
|
||||
[[battery.display]]
|
||||
style = "bold bg:mono4 fg:color_green"
|
||||
discharging_symbol = ""
|
||||
charging_symbol = ""
|
||||
threshold = 100
|
||||
|
||||
# New line character
|
||||
[character]
|
||||
success_symbol = "[λ:](bold fg:color_green)"
|
||||
error_symbol = "[λ:](bold fg:color_red1)"
|
||||
vimcmd_symbol = '[](bold fg:syntax_accent)'
|
||||
vimcmd_replace_one_symbol = '[](bold fg:color_purple)'
|
||||
vimcmd_replace_symbol = '[](bold fg:color_purple)'
|
||||
vimcmd_visual_symbol = '[](bold fg:color_yellow)'
|
||||
|
|
|
|||
|
|
@ -21,11 +21,9 @@ in {
|
|||
chromium
|
||||
element-desktop # A feature-rich client for Matrix.org
|
||||
evince # document viewer
|
||||
firefox # A web browser built from Firefox source tree
|
||||
gnome-tweaks # A tool to customize advanced GNOME 3 options
|
||||
krita # A free and open source painting application
|
||||
libreoffice-fresh # Comprehensive, professional-quality productivity suite
|
||||
librewolf # Firefox fork, focused on privacy, security and freedom
|
||||
mplayer # A movie player that supports many video formats
|
||||
nextcloud-client # Nextcloud desktop client
|
||||
pavucontrol # PulseAudio Volume Control
|
||||
|
|
@ -37,6 +35,8 @@ in {
|
|||
xorg.libxcb # X C binding
|
||||
];
|
||||
fonts.packages = with pkgs; [
|
||||
atkinson-hyperlegible # Typeface designed to offer greater legibility
|
||||
atkinson-monolegible # Mono variant of the Atkinson Hyperlegible typeface
|
||||
nerdfonts # Iconic font aggregator, collection, & patcher
|
||||
];
|
||||
networking = {
|
||||
|
|
@ -104,6 +104,56 @@ in {
|
|||
enable = true;
|
||||
homepageLocation = "https://start.duckduckgo.com/";
|
||||
};
|
||||
firefox = {
|
||||
enable = true;
|
||||
package = pkgs.librewolf;
|
||||
policies = {
|
||||
DisableTelemetry = true;
|
||||
DisableFirefoxStudies = true;
|
||||
Preferences = {
|
||||
"cookiebanners.service.mode" = 2; # Block cookie banners
|
||||
"cookiebanners.service.mode.privateBrowsing" = 2; # Block cookie banners in private browsing
|
||||
"privacy.donottrackheader.enabled" = true;
|
||||
"privacy.fingerprintingProtection" = true;
|
||||
"privacy.resistFingerprinting" = true;
|
||||
"privacy.trackingprotection.emailtracking.enabled" = true;
|
||||
"privacy.trackingprotection.enabled" = true;
|
||||
"privacy.trackingprotection.fingerprinting.enabled" = true;
|
||||
"privacy.trackingprotection.socialtracking.enabled" = true;
|
||||
"webgl.disabled" = false;
|
||||
};
|
||||
ExtensionSettings = {
|
||||
"CanvasBlocker@kkapsner.de" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/canvasblocker/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
}; # prevents fingerprinting when webgl is enabled
|
||||
"CookieAutoDelete@kennydo.com" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/cookie-autodelete/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
}; # cookie deletion
|
||||
"floccus@handmadeideas.org" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/floccus/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
}; # bookmark sync
|
||||
"jid1-MnnxcxisBPnSXQ@jetpack" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
}; # privacy
|
||||
"jid1-ZAdIEUB7XOzOJw@jetpack" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/duckduckgo-for-firefox/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
}; # private search
|
||||
"uBlock0@raymondhill.net" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
}; # add blocking
|
||||
"{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
}; # password management
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# Groups to add
|
||||
|
|
|
|||
|
|
@ -16,11 +16,13 @@ in {
|
|||
ffmpeg-full # record, convert and stream audio and video
|
||||
gimp # The GNU Image Manipulation Program
|
||||
kdePackages.kasts # Kirigami-based podcast player
|
||||
kitty # The fast, feature-rich, GPU based terminal emulator
|
||||
mpd # A flexible, powerful daemon for playing music
|
||||
ncmpcpp # A featureful ncurses based MPD client inspired by ncmpc
|
||||
nvme-cli # NVM-Express user space tooling for Linux
|
||||
pandoc # Conversion between documentation formats
|
||||
pavucontrol # PulseAudio Volume Control
|
||||
radio-cli # Simple radio CLI written in rust
|
||||
siji # An iconic bitmap font based on Stlarch with additional glyphs
|
||||
shared-mime-info # A database of common MIME types
|
||||
shotwell # Photo organizer
|
||||
|
|
@ -29,11 +31,22 @@ in {
|
|||
termonad # Terminal emulator configurable in Haskell
|
||||
texliveFull # TeX Live environment
|
||||
tmate # Instant Terminal Sharing
|
||||
toot # Mastodon CLI interface
|
||||
tor-browser-bundle-bin # Tor Browser Bundle built by torproject.org
|
||||
tuba # Fediverse client
|
||||
unzip # An extraction utility for archives compressed in .zip format
|
||||
vcsh # Version Control System for $HOME
|
||||
yt-dlp # Command-line tool to download videos
|
||||
];
|
||||
programs.firefox.policies.ExtensionSettings = {
|
||||
"{eceab40b-230a-4560-98ed-185ad010633f}" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/nixos-packages-search-engine/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
}; # package search
|
||||
"{530f7c6c-6077-4703-8f71-cb368c663e35}" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/yoroi/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
}; # package search
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
12
outputs.nix
12
outputs.nix
|
|
@ -70,8 +70,9 @@ in {
|
|||
];
|
||||
deployment = {
|
||||
tags = ["active"];
|
||||
targetHost = "10.42.0.124";
|
||||
targetHost = "10.69.0.122";
|
||||
};
|
||||
roles.desktop.enable = true;
|
||||
};
|
||||
ceilidh = {
|
||||
imports = [
|
||||
|
|
@ -112,7 +113,7 @@ in {
|
|||
];
|
||||
deployment = {
|
||||
tags = ["active" "rPi"];
|
||||
targetHost = "10.42.0.204";
|
||||
targetHost = "10.69.0.204";
|
||||
};
|
||||
};
|
||||
eamhair = {
|
||||
|
|
@ -122,7 +123,7 @@ in {
|
|||
];
|
||||
deployment = {
|
||||
tags = ["active" "rPi"];
|
||||
targetHost = "10.42.0.205";
|
||||
targetHost = "10.69.0.205";
|
||||
};
|
||||
services.toxvpn.localip = "10.37.0.205";
|
||||
};
|
||||
|
|
@ -157,7 +158,10 @@ in {
|
|||
hosts/sercanto
|
||||
ragenix.nixosModules.default
|
||||
];
|
||||
deployment.targetHost = "10.42.0.180";
|
||||
deployment = {
|
||||
targetHost = "10.69.0.149";
|
||||
tags = ["active"];
|
||||
};
|
||||
roles.desktop.enable = true;
|
||||
roles.desktopCraige.enable = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
};
|
||||
package = pkgs.nextcloud30;
|
||||
extraApps = with config.services.nextcloud.package.packages.apps; {
|
||||
inherit calendar contacts deck gpoddersync news notes tasks twofactor_webauthn;
|
||||
inherit bookmarks calendar contacts deck gpoddersync news notes tasks twofactor_webauthn;
|
||||
};
|
||||
extraAppsEnable = true;
|
||||
settings = {
|
||||
|
|
|
|||
|
|
@ -4,12 +4,7 @@
|
|||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
#let
|
||||
# sources = import ../nix/sources.nix;
|
||||
# unstable = import sources.nixpkgsUnstable {};
|
||||
#in
|
||||
{
|
||||
}: {
|
||||
nixpkgs = {config = {allowUnfree = true;};};
|
||||
|
||||
environment = {
|
||||
|
|
@ -24,7 +19,6 @@
|
|||
nox # Tools to make Nix nicer
|
||||
sqlite # To query the nixpkgs sqlite database
|
||||
tig # Text-mode interface for git
|
||||
#unstable.statix # Lints and suggestions for the nix programming language
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue