diff --git a/flake.lock b/flake.lock index a522426..f766386 100644 --- a/flake.lock +++ b/flake.lock @@ -432,6 +432,7 @@ ] }, "locked": { +<<<<<<< HEAD <<<<<<< HEAD "lastModified": 1741378606, "narHash": "sha256-ytDmwV93lZ1f6jswJkxEQz5cBlwje/2rH/yUZDADZNs=", @@ -445,6 +446,13 @@ "repo": "home-manager", "rev": "30cce6848a5aa41ceb5fb33185b84868cc3e9bef", >>>>>>> d31e6ee (updating flake, userChrome, and emacs.nix) +======= + "lastModified": 1741378606, + "narHash": "sha256-ytDmwV93lZ1f6jswJkxEQz5cBlwje/2rH/yUZDADZNs=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "95711f926676018d279ba09fe7530d03b5d5b3e2", +>>>>>>> b36d19f (adding ddclient to nix situation) "type": "github" }, "original": { @@ -526,6 +534,7 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { +<<<<<<< HEAD <<<<<<< HEAD "lastModified": 1741360124, "narHash": "sha256-x9eHurxh8AhCmVplugQiYTyfz+NNU4DGRRLq1UqQ8g0=", @@ -539,6 +548,13 @@ "repo": "nixos-cosmic", "rev": "24785e84d4b3844936caffe2c56994bdef9a9300", >>>>>>> d31e6ee (updating flake, userChrome, and emacs.nix) +======= + "lastModified": 1741360124, + "narHash": "sha256-x9eHurxh8AhCmVplugQiYTyfz+NNU4DGRRLq1UqQ8g0=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "5be89641d8b9190460af05d59f6dbe4cb8695399", +>>>>>>> b36d19f (adding ddclient to nix situation) "type": "github" }, "original": { @@ -628,6 +644,7 @@ }, "nixpkgs-stable_3": { "locked": { +<<<<<<< HEAD <<<<<<< HEAD "lastModified": 1741196730, "narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=", @@ -641,6 +658,13 @@ "repo": "nixpkgs", "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", >>>>>>> d31e6ee (updating flake, userChrome, and emacs.nix) +======= + "lastModified": 1741196730, + "narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3", +>>>>>>> b36d19f (adding ddclient to nix situation) "type": "github" }, "original": { @@ -688,6 +712,25 @@ "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", "owner": "NixOS", "repo": "nixpkgs", +<<<<<<< HEAD +======= + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1739357830, + "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", + "owner": "NixOS", + "repo": "nixpkgs", +>>>>>>> b36d19f (adding ddclient to nix situation) "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", "type": "github" }, diff --git a/flake.nix b/flake.nix index 79300fb..f90c4bb 100644 --- a/flake.nix +++ b/flake.nix @@ -39,8 +39,8 @@ emacs = { url = "github:nix-community/emacs-overlay/dd38645351b6f14cda47c81456131c86b11386db"; - #inputs.nixpkgs.follows = "nixpkgs"; - inputs.nixpkgs.follows = "nixos-unstable-small"; + inputs.nixpkgs.follows = "nixpkgs"; + #inputs.nixpkgs.follows = "nixos-unstable-small"; }; nix-bitcoin = { url = "github:fort-nix/nix-bitcoin/release"; }; simple-nixos-mailserver = { diff --git a/home/home.nix b/home/home.nix index 4f75db2..612c99c 100644 --- a/home/home.nix +++ b/home/home.nix @@ -46,11 +46,11 @@ in { config = { common = { default = [ pkgs.kdePackages.xdg-desktop-portal-kde pkgs.xdg-desktop-portal-cosmic ]; - "org.freedesktop.impl.portal.FileChooser" = [ "cosmic" ]; + "org.freedesktop.impl.portal.FileChooser" = [ "kde" ]; }; hyprland = { default = [ "hyprland" ]; - "org.freedesktop.impl.portal.FileChooser" = [ "cosmic" ]; + "org.freedesktop.impl.portal.FileChooser" = [ "kde" ]; }; }; extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde pkgs.xdg-desktop-portal-cosmic ]; diff --git a/pkgs/base-packages.nix b/pkgs/base-packages.nix index f6a7b0b..3d8b1a3 100644 --- a/pkgs/base-packages.nix +++ b/pkgs/base-packages.nix @@ -52,6 +52,7 @@ trash-cli htop btop + nvtop bc sysstat procs diff --git a/scripts/empv b/scripts/empv index d9af0ee..74c35e7 100755 --- a/scripts/empv +++ b/scripts/empv @@ -1,6 +1,6 @@ #!/usr/bin/env fish -set arg "(empv-enqueue \""$argv[1]"\")" +set arg "(chris/empv-yt-dlp \""$argv[1]"\")" echo $arg set title (yt-dlp --get-title $argv[1]) echo $title added diff --git a/systems/dalinar/configuration.nix b/systems/dalinar/configuration.nix index 7d57070..14fced1 100644 --- a/systems/dalinar/configuration.nix +++ b/systems/dalinar/configuration.nix @@ -186,35 +186,49 @@ # DDCLIENT services.ddclient = { enable = true; - configFile = /home/chris/ddclient.conf; - #domains = [ - # "nc.cochrun.xyz" - # "home.cochrun.xyz" - # "mail.cochrun.xyz" - # "jelly.cochrun.xyz" - #]; - # passwordFile = "/etc/nixos/ddclientp"; - # protocol = "namecheap"; - # use = "web, web=dynamicdns.park-your-domain.com/getip"; - # server = "dynamicdns.park-your-domain.com"; - # username = "cochrun.xyz"; - #extraConfig = '' - #use=web, web=dynamicdns.park-your-domain.com/getip - #protocol=namecheap - #server=dynamicdns.park-your-domain.com - #login=livingseedco.shop - #password=e157e42337fc4ccd850d0a3904733f46 - #@ + # configFile = /home/chris/ddclient.conf; + domains = [ + "@" + "nc.cochrun.xyz" + "home.cochrun.xyz" + "mail.cochrun.xyz" + "jelly.cochrun.xyz" + "rtl.cochrun.xyz" + "sonarr.cochrun.xyz" + "radarr.cochrun.xyz" + "prowlarr.cochrun.xyz" + "abs.cochrun.xyz" + "ombi.cochrun.xyz" + "photos.cochrun.xyz" + "vpn.cochrun.xyz" + "ai.cochrun.xyz" + "vpnui.cochrun.xyz" + "inv.cochrun.xyz" + "tubesync.cochrun.xyz" + ]; + passwordFile = "/home/chris/ddclientp"; + protocol = "namecheap"; + use = "cmd, cmd='${pkgs.curl}/bin/curl -s https://dynamicdns.park-your-domain.com/getip'"; + # use = "web, web=dynamicdns.park-your-domain.com/getip"; + server = "dynamicdns.park-your-domain.com"; + username = "cochrun.xyz"; + #extraConfig = '' + #use=web, web=dynamicdns.park-your-domain.com/getip + #protocol=namecheap + #server=dynamicdns.park-your-domain.com + #login=livingseedco.shop + #password=e157e42337fc4ccd850d0a3904733f46 + #@ - #use=web, web=dynamicdns.park-your-domain.com/getip - #protocol=namecheap - #server=dynamicdns.park-your-domain.com - #login=cochrun.xyz - #password=94602c373f9f4743838bf567def2eb72 - #@,nc.cochrun.xyz,home.cochrun.xyz,mail.cochrun.xyz,jelly.cochrun.xyz + #use=web, web=dynamicdns.park-your-domain.com/getip + #protocol=namecheap + #server=dynamicdns.park-your-domain.com + #login=cochrun.xyz + #password=94602c373f9f4743838bf567def2eb72 + #@,nc.cochrun.xyz,home.cochrun.xyz,mail.cochrun.xyz,jelly.cochrun.xyz - #''; + #''; }; services.nextcloud = {